packages: gtk+3/gtk+3.spec - updated to 2.90.2 - removed -arch_confdir.patc...

megabajt megabajt at pld-linux.org
Sun Jun 13 13:13:51 CEST 2010 

Author: megabajt                     Date: Sun Jun 13 11:13:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.90.2
- removed -arch_confdir.patch (gdk-pixbuf.loaders and gtk.immodules
  have been moved to %{_libdir}/gtk-3.0/%{abivers})

---- Files affected:
packages/gtk+3:
   gtk+3.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/gtk+3/gtk+3.spec
diff -u packages/gtk+3/gtk+3.spec:1.1 packages/gtk+3/gtk+3.spec:1.2
--- packages/gtk+3/gtk+3.spec:1.1	Tue May 11 22:08:13 2010
+++ packages/gtk+3/gtk+3.spec	Sun Jun 13 13:13:46 2010
@@ -20,13 +20,12 @@
 Summary(pl.UTF-8):	GIMP Toolkit
 Summary(tr.UTF-8):	GIMP ToolKit arayüz kitaplığı
 Name:		gtk+3
-Version:	2.90.0
+Version:	2.90.2
 Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.90/gtk+-%{version}.tar.bz2
-# Source0-md5:	fd30684a0f7ced548add1bd5e23ff439
-Patch0:		%{name}-arch_confdir.patch
+# Source0-md5:	bb6905bc56d88afc3fd399423c0888fb
 URL:		http://www.gtk.org/
 BuildRequires:	atk-devel >= 1:1.30.0
 BuildRequires:	autoconf >= 2.62
@@ -36,8 +35,8 @@
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-style-xsl
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.24.0
-BuildRequires:	gobject-introspection-devel >= 0.6.7
+BuildRequires:	glib2-devel >= 1:2.25.8
+BuildRequires:	gobject-introspection-devel >= 0.6.14
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.11}
 BuildRequires:	gtk-doc-automake >= 1.11
 BuildRequires:	jasper-devel
@@ -65,7 +64,7 @@
 BuildRequires:	xorg-lib-libXrender-devel
 Requires:	atk >= 1:1.30.0
 Requires:	cairo >= 1.6.0
-Requires:	glib2 >= 1:2.24.0
+Requires:	glib2 >= 1:2.25.8
 Requires:	pango >= 1:1.26.0
 Requires:	xorg-lib-libXrandr >= 1.3.0
 %if %{with cups}
@@ -78,10 +77,8 @@
 
 %if "%{_lib}" != "lib"
 %define		libext		%(lib="%{_lib}"; echo ${lib#lib})
-%define		_sysconfdir	/etc/gtk%{libext}-3.0
 %define		pqext		-%{libext}
 %else
-%define		_sysconfdir	/etc/gtk-3.0
 %define		pqext		%{nil}
 %endif
 
@@ -140,7 +137,7 @@
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	atk-devel >= 1:1.30.0
-Requires:	glib2-devel >= 1:2.24.0
+Requires:	glib2-devel >= 1:2.25.8
 Requires:	pango-devel >= 1:1.26.0
 Requires:	shared-mime-info
 Requires:	xorg-lib-libX11-devel
@@ -211,7 +208,6 @@
 
 %prep
 %setup -q -n gtk+-%{version}
-%patch0 -p1
 
 %build
 rm m4/introspection.m4
@@ -241,8 +237,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gdk-pixbuf.loaders
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk.immodules
+touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{abivers}/gdk-pixbuf.loaders
+touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{abivers}/gtk.immodules
 
 cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -270,21 +266,16 @@
 %post
 /sbin/ldconfig
 umask 022
-%{_bindir}/gdk-pixbuf-query-loaders-3.0%{pqext} > %{_sysconfdir}/gdk-pixbuf.loaders
-%{_bindir}/gtk-query-immodules-3.0%{pqext} > %{_sysconfdir}/gtk.immodules
+%{_bindir}/gdk-pixbuf-query-loaders-3.0%{pqext} --update-cache
+%{_bindir}/gtk-query-immodules-3.0%{pqext} --update-cache
 exit 0
 
 %postun
 /sbin/ldconfig
 if [ "$1" != "0" ]; then
 	umask 022
-	# we need to check for dir existence for multilib installs as the $1 is 1
-	# if we remove the other arch pkg will be still present.
-	# i.e we have installed gtk+2-2.16.5-1.x86_64 and gtk+2-2.16.5-1.i686, and remove gtk+2-2.16.5-1.i686
-	if [ -d %{_sysconfdir} ]; then
-		%{_bindir}/gdk-pixbuf-query-loaders-3.0%{pqext} > %{_sysconfdir}/gdk-pixbuf.loaders
-		%{_bindir}/gtk-query-immodules-3.0%{pqext} > %{_sysconfdir}/gtk.immodules
-	fi
+	%{_bindir}/gdk-pixbuf-query-loaders-3.0%{pqext} --update-cache
+	%{_bindir}/gtk-query-immodules-3.0%{pqext} --update-cache
 fi
 exit 0
 
@@ -296,7 +287,7 @@
 %attr(755,root,root) %{_bindir}/gtk-update-icon-cache-3.0
 %attr(755,root,root) %{_bindir}/gtk3-demo
 %attr(755,root,root) %{_libdir}/libgailutil-3.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgailutil-3.0.so.18
+%attr(755,root,root) %ghost %{_libdir}/libgailutil-3.0.so.0
 %attr(755,root,root) %{_libdir}/libgdk-x11-3.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgdk-x11-3.0.so.0
 %attr(755,root,root) %{_libdir}/libgdk_pixbuf-3.0.so.*.*.*
@@ -315,6 +306,8 @@
 %dir %{_libdir}/gtk-3.0/%{abivers}/printbackends
 %attr(755,root,root) %{_libdir}/gtk-3.0/modules/libferret.so
 %attr(755,root,root) %{_libdir}/gtk-3.0/modules/libgail.so
+%ghost %{_libdir}/gtk-3.0/%{abivers}/gdk-pixbuf.loaders
+%ghost %{_libdir}/gtk-3.0/%{abivers}/gtk.immodules
 %attr(755,root,root) %{_libdir}/gtk-3.0/%{abivers}/engines/libpixmap.so
 %attr(755,root,root) %{_libdir}/gtk-3.0/%{abivers}/immodules/im-*.so
 %attr(755,root,root) %{_libdir}/gtk-3.0/%{abivers}/loaders/libpixbufloader-*.so
@@ -322,15 +315,14 @@
 %attr(755,root,root) %{_libdir}/gtk-3.0/%{abivers}/printbackends/libprintbackend-lpr.so
 %{_libdir}/girepository-1.0/Gdk-3.0.typelib
 %{_libdir}/girepository-1.0/GdkPixbuf-3.0.typelib
+%{_libdir}/girepository-1.0/GdkX11-3.0.typelib
 %{_libdir}/girepository-1.0/Gtk-3.0.typelib
 
 ## XXX: just demo data - move to examples?
 %{_datadir}/gtk-3.0
 
-%dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/im-multipress.conf
-%ghost %{_sysconfdir}/gdk-pixbuf.loaders
-%ghost %{_sysconfdir}/gtk.immodules
+%dir %{_sysconfdir}/gtk-3.0
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gtk-3.0/im-multipress.conf
 %dir %{_datadir}/themes/Default/gtk-*
 %{_datadir}/themes/Default/gtk-*/gtkrc
 %dir %{_datadir}/themes/Emacs
@@ -360,8 +352,7 @@
 %{_libdir}/libgtk-x11-3.0.la
 %{_includedir}/gail-3.0
 %{_includedir}/gtk-3.0
-# this file is packaged in gtk+2
-#%{_aclocaldir}/gtk-2.0.m4
+%{_aclocaldir}/gtk-3.0.m4
 %{_libdir}/gtk-3.0/include
 %{_pkgconfigdir}/gail-3.0.pc
 %{_pkgconfigdir}/gdk-3.0.pc
@@ -375,6 +366,7 @@
 %{_mandir}/man1/gtk-builder-convert-3.0.1*
 %{_datadir}/gir-1.0/Gdk-3.0.gir
 %{_datadir}/gir-1.0/GdkPixbuf-3.0.gir
+%{_datadir}/gir-1.0/GdkX11-3.0.gir
 %{_datadir}/gir-1.0/Gtk-3.0.gir
 
 %if %{with static_libs}
@@ -412,6 +404,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/06/13 11:13:46  megabajt
+- updated to 2.90.2
+- removed -arch_confdir.patch (gdk-pixbuf.loaders and gtk.immodules
+  have been moved to %{_libdir}/gtk-3.0/%{abivers})
+
 Revision 1.1  2010/05/11 20:08:13  megabajt
 - new (based on gtk+2)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+3/gtk+3.spec?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list