SPECS: glib2.spec - fixed build without apidocs, also removes deve...

[sparky]

Author: sparky                       Date: Sun Nov  5 16:16:23 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed build without apidocs, also removes devel manpages

---- Files affected:
SPECS:
   glib2.spec (1.136 -> 1.137) 

---- Diffs:

================================================================
Index: SPECS/glib2.spec
diff -u SPECS/glib2.spec:1.136 SPECS/glib2.spec:1.137
--- SPECS/glib2.spec:1.136	Mon Oct  2 22:39:25 2006
+++ SPECS/glib2.spec	Sun Nov  5 17:16:18 2006
@@ -31,13 +31,14 @@
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-style-xsl
+BuildRequires:	gettext-devel
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.7}
 %{?with_apidocs:BuildRequires:	gtk-doc-automake >= 1.7}
 BuildRequires:	libtool >= 1:1.4.2-9
-BuildRequires:	pkgconfig >= 1:0.14.0
-BuildRequires:	gettext-devel
 BuildRequires:	perl-base
+BuildRequires:	pkgconfig >= 1:0.14.0
 BuildRequires:	rpmbuild(macros) >= 1.197
+%{!?with_apidocs:BuildRequires:	sed >= 4.0}
 Requires:	iconv
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -155,6 +156,11 @@
 %setup -q -n glib-%{version}
 %patch0 -p1
 %patch1 -p1
+%if !%{with apidocs}
+sed -e '/SUBDIRS/s/docs//' -i Makefile.am
+sed -e '/^docs.*Makefile$/d' -i configure.in
+echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
+%endif
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -181,7 +187,7 @@
 	m4datadir=%{_aclocaldir} \
 	pkgconfigdir=%{_pkgconfigdir}
 
-%find_lang glib --with-gnome --all-name
+%find_lang glib20 --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -189,7 +195,7 @@
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files -f glib.lang
+%files -f glib20.lang
 %defattr(644,root,root,755)
 %doc AUTHORS README NEWS
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
@@ -208,7 +214,7 @@
 %{_libdir}/glib-2.0
 %{_includedir}/*
 %{_aclocaldir}/*
-%{_mandir}/man?/*
+%{?with_apidocs:%{_mandir}/man?/*}
 
 %if %{with static_libs}
 %files static
@@ -228,6 +234,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.137  2006/11/05 16:16:18  sparky
+- fixed build without apidocs, also removes devel manpages
+
 Revision 1.136  2006/10/02 20:39:25  grzegol
 - 2.12.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glib2.spec?r1=1.136&r2=1.137&f=u