Author: djurban Date: Fri Sep 23 11:28:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - bcond corrections
---- Files affected: SPECS: gtk+2.spec (1.184 -> 1.185) ---- Diffs: ================================================================ Index: SPECS/gtk+2.spec diff -u SPECS/gtk+2.spec:1.184 SPECS/gtk+2.spec:1.185 --- SPECS/gtk+2.spec:1.184 Tue Sep 13 18:22:20 2005 +++ SPECS/gtk+2.spec Fri Sep 23 13:28:38 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_without doc # disable gtk-doc +%bcond_without apidocs # disable gtk-doc %bcond_without static_libs # don't build static library %bcond_with xlibs # use pkgconfig to find libX11 # @@ -35,7 +35,7 @@ BuildRequires: docbook-style-xsl BuildRequires: gettext-devel BuildRequires: glib2-devel >= 1:2.8.1 -%{?with_doc:BuildRequires: gtk-doc >= 1.0} +%{?with_apidocs:BuildRequires: gtk-doc >= 1.0} %{?with_xlibs:BuildRequires: libXfixes-devel} %{?with_xlibs:BuildRequires: libXi-devel} BuildRequires: libjpeg-devel @@ -157,14 +157,13 @@ %{__automake} %configure \ %{?debug:--enable-debug=yes} \ - %{?with_doc:--enable-gtk-doc} \ + --%{?with_apidocs:en}%{!?with_apidocs:dis}nable-gtk-doc \ --enable-man \ --enable-shm \ - --enable-static \ + --%{?with_static:en}%{!?with_static:dis}able-static \ --with-gdktarget=x11 \ - --with-html-dir=%{_gtkdocdir} \ - --with-xinput=yes \ - %{!?with_static_libs:--disable-static} + %{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \ + --with-xinput=yes %{__make} %install @@ -262,7 +261,7 @@ %{_libdir}/gtk-*/include %{_pkgconfigdir}/*.pc %{_mandir}/man1/* -%{?with_doc:%{_gtkdocdir}/*} +%{?with_apidocs:%{_gtkdocdir}/*} %{_examplesdir}/%{name}-%{version} %if %{with static_libs} @@ -277,6 +276,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.185 2005/09/23 11:28:38 djurban +- bcond corrections + Revision 1.184 2005/09/13 16:22:20 qboosh - Conflicts: libgdiplus < 1.1.9 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.184&r2=1.185&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit