SPECS: atk.spec, pango.spec, glib2.spec - standardise static_libs ...

[djurban]

Author: djurban                      Date: Mon Sep 19 18:27:46 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- standardise static_libs and s/doc/apidocs/ to properly get rid of gtk-doc if compiled without it

---- Files affected:
SPECS:
   atk.spec (1.89 -> 1.90) , pango.spec (1.126 -> 1.127) , glib2.spec (1.112 -> 1.113) 

---- Diffs:

================================================================
Index: SPECS/atk.spec
diff -u SPECS/atk.spec:1.89 SPECS/atk.spec:1.90
--- SPECS/atk.spec:1.89	Tue Sep  6 13:10:18 2005
+++ SPECS/atk.spec	Mon Sep 19 20:27:40 2005
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+%bcond_without apidocs
+%bcond_without static_libs
 Summary:	ATK - Accessibility Toolkit
 Summary(pl):	ATK - biblioteka ułatwiająca niepełnosprawnym korzystanie z komputerów
 Summary(pt_BR):	Interfaces para suporte a acessibilidade
@@ -16,7 +18,7 @@
 BuildRequires:	diffutils
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 1:2.8.1
-BuildRequires:	gtk-doc >= 1.4
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.4}
 BuildRequires:	libtool >= 2:1.5.16
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
@@ -93,10 +95,11 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--enable-gtk-doc \
-	--enable-shared \
-	--enable-static \
-	--with-html-dir=%{_gtkdocdir}
+	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
+	%{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
+	--%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \
+	--enable-shared
+
 %{__make}
 
 %install
@@ -123,15 +126,19 @@
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog
+%if %{with apidocs}
 %{_gtkdocdir}/atk
+%endif
 %{_includedir}/atk*
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_pkgconfigdir}/atk*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -139,6 +146,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.90  2005/09/19 18:27:40  djurban
+- standardise static_libs and s/doc/apidocs/ to properly get rid of gtk-doc if compiled without it
+
 Revision 1.89  2005/09/06 11:10:18  paladine
 - updated to 1.10.3
 

================================================================
Index: SPECS/pango.spec
diff -u SPECS/pango.spec:1.126 SPECS/pango.spec:1.127
--- SPECS/pango.spec:1.126	Tue Aug 30 20:16:47 2005
+++ SPECS/pango.spec	Mon Sep 19 20:27:40 2005
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_with	xlibs	# use pkgconfig to find libX11 CFLAGS
+%bcond_without	apidocs
 #
 Summary:	System for layout and rendering of internationalized text
 Summary(pl):	System renderowania międzynarodowego tekstu
@@ -26,7 +27,7 @@
 BuildRequires:	fontconfig-devel >= 1.0.1
 BuildRequires:	freetype-devel >= 2.1.7
 BuildRequires:	glib2-devel >= 1:2.8.0
-BuildRequires:	gtk-doc >= 1.0
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
 %{?with_xlibs:BuildRequires:	libX11-devel}
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	perl-base
@@ -130,9 +131,9 @@
 %{__automake}
 %configure \
 	--with-fribidi \
-	--enable-gtk-doc \
-	--with-html-dir=%{_gtkdocdir} \
-	--enable-static \
+	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
+	%{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
+	--%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \
 	--enable-debug=%{?debug:yes}%{!?debug:minimum} \
 	--enable-man
 %{__make}
@@ -208,6 +209,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.127  2005/09/19 18:27:40  djurban
+- standardise static_libs and s/doc/apidocs/ to properly get rid of gtk-doc if compiled without it
+
 Revision 1.126  2005/08/30 18:16:47  arekm
 - merged from DEVEL
 

================================================================
Index: SPECS/glib2.spec
diff -u SPECS/glib2.spec:1.112 SPECS/glib2.spec:1.113
--- SPECS/glib2.spec:1.112	Tue Aug 30 20:02:53 2005
+++ SPECS/glib2.spec	Mon Sep 19 20:27:40 2005
@@ -1,6 +1,6 @@
 # $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
 #
 Summary:	Useful routines for 'C' programming
@@ -30,7 +30,7 @@
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-style-xsl
-BuildRequires:	gtk-doc >= 1.0
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	pkgconfig >= 1:0.14.0
 BuildRequires:	gettext-devel
@@ -151,13 +151,13 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
+	%{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
+	--%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \
 	--enable-debug=%{?debug:yes} \
-	%{?with_doc:--enable-gtk-doc} \
 	--enable-man \
-	--enable-static \
-	--enable-threads \
-	--with-html-dir=%{_gtkdocdir} \
-	%{!?with_static_libs:--disable-static}
+	--enable-threads
+
 %{__make}
 
 %install
@@ -196,7 +196,7 @@
 %{_pkgconfigdir}/*
 %{_libdir}/glib-2.0
 %{_includedir}/*
-%{?with_doc:%{_gtkdocdir}/*}
+%{?with_apidocs:%{_gtkdocdir}/*}
 %{_aclocaldir}/*
 %{_mandir}/man?/*
 
@@ -212,6 +212,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.113  2005/09/19 18:27:40  djurban
+- standardise static_libs and s/doc/apidocs/ to properly get rid of gtk-doc if compiled without it
+
 Revision 1.112  2005/08/30 18:02:53  arekm
 - merged from DEVEL
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/atk.spec?r1=1.89&r2=1.90&f=u
    http://cvs.pld-linux.org/SPECS/pango.spec?r1=1.126&r2=1.127&f=u
    http://cvs.pld-linux.org/SPECS/glib2.spec?r1=1.112&r2=1.113&f=u