SPECS (DEVEL): libgnomeui.spec - added apidocs bcond - updated dep...

[megabajt]

Author: megabajt                     Date: Tue Jan 15 21:26:03 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- added apidocs bcond
- updated deps
- more verbose files

---- Files affected:
SPECS:
   libgnomeui.spec (1.108.2.1 -> 1.108.2.2) 

---- Diffs:

================================================================
Index: SPECS/libgnomeui.spec
diff -u SPECS/libgnomeui.spec:1.108.2.1 SPECS/libgnomeui.spec:1.108.2.2
--- SPECS/libgnomeui.spec:1.108.2.1	Tue Jan 15 11:34:01 2008
+++ SPECS/libgnomeui.spec	Tue Jan 15 22:25:57 2008
@@ -1,23 +1,27 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	apidocs		# disable gtk-doc
+#
 Summary:	GNOME base GUI library
 Summary(pl.UTF-8):	Podstawowa biblioteka GUI GNOME
 Name:		libgnomeui
 Version:	2.21.5
 Release:	1
-License:	LGPL
+License:	LGPL v2+
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.21/%{name}-%{version}.tar.bz2
 # Source0-md5:	63e36f083a865d92039b665593d793da
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.20.0
 BuildRequires:	autoconf >= 2.54
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	gnome-common >= 2.20.0
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 2.15.2
+BuildRequires:	glib2-devel >= 1:2.15.2
 BuildRequires:	gnome-keyring-devel >= 2.20.0
 BuildRequires:	gnome-vfs2-devel >= 2.20.0
-BuildRequires:	gtk-doc >= 1.8
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
 BuildRequires:	gtk+2-devel >= 2:2.12.0
 BuildRequires:	intltool >= 0.36.2
 BuildRequires:	libbonoboui-devel >= 2.20.0
@@ -25,9 +29,8 @@
 BuildRequires:	libgnome-devel >= 2.20.0
 BuildRequires:	libgnomecanvas-devel >= 2.20.0
 BuildRequires:	libjpeg-devel
-BuildRequires:	libxml2-devel >= 2.6.30
+BuildRequires:	libxml2-devel >= 1:2.6.30
 BuildRequires:	libtool
-BuildRequires:	pango-devel >= 1:1.18.2
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel >= 1.5
@@ -37,7 +40,6 @@
 Requires:	gnome-keyring-libs >= 2.20.0
 Requires:	gnome-vfs2-libs >= 2.20.0
 Requires:	libbonoboui >= 2.20.0
-Requires:	pango >= 1:1.18.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -121,7 +123,7 @@
 %setup -q
 
 %build
-%{__gtkdocize}
+%{?with_apidocs:%{__gtkdocize}}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
@@ -129,7 +131,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--enable-gtk-doc \
+	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -148,6 +150,10 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.*/filesystems/libgnome-vfs.{la,a}
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.*/filesystems/libgio.{la,a}
 
+%if %{without apidocs}
+rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/libgnomeui
+%endif
+
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -161,24 +167,27 @@
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README
 %attr(755,root,root) %{_libdir}/gtk-2.0/2.*/filesystems/libgnome-vfs.so
 %attr(755,root,root) %{_libdir}/gtk-2.0/2.*/filesystems/libgio.so
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(755,root,root) %{_libdir}/libglade/2.0/*.so
-%{_pixmapsdir}/*
+%attr(755,root,root) %{_libdir}/libgnomeui-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnomeui-2.so.0
+%attr(755,root,root) %{_libdir}/libglade/2.0/libgnome.so
+%{_pixmapsdir}/gnome-about-logo.png
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/libgnomeui-2.0
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_pkgconfigdir}/*.pc
+%attr(755,root,root) %{_libdir}/libgnomeui-2.so
+%{_libdir}/libgnomeui-2.la
+%{_pkgconfigdir}/libgnomeui-2.0.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgnomeui-2.a
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/%{name}
+%endif
 
 %files examples
 %defattr(644,root,root,755)
@@ -190,6 +199,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108.2.2  2008-01-15 21:25:57  megabajt
+- added apidocs bcond
+- updated deps
+- more verbose files
+
 Revision 1.108.2.1  2008-01-15 10:34:01  patrys
 - 2.21.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libgnomeui.spec?r1=1.108.2.1&r2=1.108.2.2&f=u