SPECS: libgnomeui.spec - 2.22.0 - merged from DEVEL

patrys patrys at pld-linux.org
Tue Mar 11 15:37:07 CET 2008 

Author: patrys                       Date: Tue Mar 11 14:37:07 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.22.0
- merged from DEVEL

---- Files affected:
SPECS:
   libgnomeui.spec (1.109 -> 1.110) 

---- Diffs:

================================================================
Index: SPECS/libgnomeui.spec
diff -u SPECS/libgnomeui.spec:1.109 SPECS/libgnomeui.spec:1.110
--- SPECS/libgnomeui.spec:1.109	Sat Jan 26 16:43:19 2008
+++ SPECS/libgnomeui.spec	Tue Mar 11 15:37:01 2008
@@ -1,42 +1,45 @@
 # $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.20.1.1
+Version:	2.22.0
 Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	d1f500c5d33ce93159b4952bb476fcf3
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	b55a741f2fb132655df906679e9a5bf4
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.20.0
+BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf >= 2.54
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	gnome-common >= 2.20.0
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-keyring-devel >= 2.20.0
-BuildRequires:	gnome-vfs2-devel >= 2.20.0
-BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	gtk+2-devel >= 2:2.12.0
-BuildRequires:	intltool >= 0.36.2
+BuildRequires:	glib2-devel >= 1:2.15.5
+BuildRequires:	gnome-keyring-devel >= 2.22.0
+BuildRequires:	gnome-vfs2-devel >= 2.22.0
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
+BuildRequires:	gtk+2-devel >= 2:2.12.5
+BuildRequires:	intltool >= 0.37.0
 BuildRequires:	libbonoboui-devel >= 2.20.0
 BuildRequires:	libglade2-devel >= 1:2.6.2
 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.31
 BuildRequires:	libtool
-BuildRequires:	pango-devel >= 1:1.18.2
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel >= 1.5
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	xorg-lib-libSM-devel
-Requires:	gtk+2 >= 2:2.12.0
-Requires:	gnome-keyring-libs >= 2.20.0
-Requires:	gnome-vfs2-libs >= 2.20.0
+Requires:	gtk+2 >= 2:2.12.5
+Requires:	gnome-keyring-libs >= 2.22.0
+Requires:	gnome-vfs2-libs >= 2.22.0
 Requires:	libbonoboui >= 2.20.0
-Requires:	pango >= 1:1.18.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -60,10 +63,10 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe libgnomeui
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	GConf2-devel >= 2.20.0
-Requires:	gnome-keyring-devel >= 2.20.0
-Requires:	gnome-vfs2-devel >= 2.20.0
-Requires:	gtk+2-devel >= 2:2.12.0
+Requires:	GConf2-devel >= 2.22.0
+Requires:	gnome-keyring-devel >= 2.22.0
+Requires:	gnome-vfs2-devel >= 2.22.0
+Requires:	gtk+2-devel >= 2:2.12.5
 Requires:	libbonoboui-devel >= 2.20.0
 Requires:	libglade2-devel >= 1:2.6.2
 Requires:	libjpeg-devel
@@ -120,7 +123,7 @@
 %setup -q
 
 %build
-%{__gtkdocize}
+%{?with_apidocs:%{__gtkdocize}}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
@@ -128,7 +131,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--enable-gtk-doc \
+	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -140,13 +143,21 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir}
 
+# not supported by glibc
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/ps
+
 cp demos/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 # no static modules and *.la for libglade or vfs modules
 rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.{la,a}
 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
+%find_lang %{name}-2.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -154,12 +165,13 @@
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files -f %{name}-2.0.lang
 %defattr(644,root,root,755)
 %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}/libgnomeui-2.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgnomeui-2.so.0
-%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/filesystems/libgnome-vfs.so
 %attr(755,root,root) %{_libdir}/libglade/2.0/libgnome.so
 %{_pixmapsdir}/gnome-about-logo.png
 
@@ -174,9 +186,11 @@
 %defattr(644,root,root,755)
 %{_libdir}/libgnomeui-2.a
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/%{name}
+%endif
 
 %files examples
 %defattr(644,root,root,755)
@@ -188,10 +202,37 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.110  2008-03-11 14:37:01  patrys
+- 2.22.0
+- merged from DEVEL
+
+Revision 1.108.2.7  2008-03-11 14:31:09  patrys
+- 2.22.0
+
+Revision 1.108.2.6  2008-02-29 14:34:43  megabajt
+- updated to 2.21.92
+
+Revision 1.108.2.5  2008-02-12 10:20:17  megabajt
+- ps locale is not supported
+
+Revision 1.108.2.4  2008-02-12 09:29:11  megabajt
+- updated to 2.21.91
+
+Revision 1.108.2.3  2008-01-28 16:43:57  megabajt
+- updated to 2.21.90
+
 Revision 1.109  2008-01-26 15:43:19  qboosh
 - more verbose files, ghost soname symlink
 - LGPL v2+
 
+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
+
 Revision 1.108  2007-10-18 16:29:11  megabajt
 - updated to 2.20.1.1
 
================================================================

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

More information about the pld-cvs-commit mailing list