Author: megabajt Date: Thu Jul 1 22:41:52 2010 GMT Module: packages Tag: DEVEL ---- Log message: - updated to 2.21.4
---- Files affected: packages/gtk+2: gtk+2.spec (1.333.2.4 -> 1.333.2.5) ---- Diffs: ================================================================ Index: packages/gtk+2/gtk+2.spec diff -u packages/gtk+2/gtk+2.spec:1.333.2.4 packages/gtk+2/gtk+2.spec:1.333.2.5 --- packages/gtk+2/gtk+2.spec:1.333.2.4 Sat Jun 12 16:02:12 2010 +++ packages/gtk+2/gtk+2.spec Fri Jul 2 00:41:46 2010 @@ -20,13 +20,13 @@ Summary(pl.UTF-8): GIMP Toolkit Summary(tr.UTF-8): GIMP ToolKit arayüz kitaplığı Name: gtk+2 -Version: 2.21.2 +Version: 2.21.4 Release: 1 Epoch: 2 License: LGPL v2+ Group: X11/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.21/gtk+-%{version}.tar.bz2 -# Source0-md5: 4c8d78dc50c0f9bf7784194e52670d6a +# Source0-md5: 71f15885add9dfab47659966acc7ef66 Patch0: %{name}-arch_confdir.patch URL: http://www.gtk.org/ BuildRequires: atk-devel >= 1:1.30.0 @@ -36,15 +36,12 @@ %{?with_cups:BuildRequires: cups-devel} BuildRequires: docbook-dtd412-xml BuildRequires: docbook-style-xsl +BuildRequires: gdk-pixbuf2-devel >= 2.21.0 BuildRequires: gettext-devel BuildRequires: glib2-devel >= 1:2.25.8 BuildRequires: gobject-introspection-devel >= 0.6.7 %{?with_apidocs:BuildRequires: gtk-doc >= 1.11} BuildRequires: gtk-doc-automake >= 1.11 -BuildRequires: jasper-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel >= 1.4.0 -BuildRequires: libtiff-devel BuildRequires: libtool >= 1:1.4.2-9 BuildRequires: libxml2-progs >= 1:2.6.31 BuildRequires: libxslt-progs >= 1.1.20 @@ -66,6 +63,7 @@ BuildRequires: xorg-lib-libXrender-devel Requires: atk >= 1:1.30.0 Requires: cairo >= 1.6.0 +Requires: gdk-pixbuf2 >= 2.21.0 Requires: glib2 >= 1:2.24.0 Requires: pango >= 1:1.26.0 Requires: xorg-lib-libXrandr >= 1.3.0 @@ -150,6 +148,7 @@ Group: X11/Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: atk-devel >= 1:1.30.0 +Requires: gdk-pixbuf2-devel >= 2.21.0 Requires: glib2-devel >= 1:2.24.0 Requires: pango-devel >= 1:1.26.0 Requires: shared-mime-info @@ -247,7 +246,6 @@ --%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \ --with-gdktarget=x11 \ --with-html-dir=%{_gtkdocdir} \ - --with-libjasper \ --with-xinput=yes %{__make} @@ -261,7 +259,6 @@ m4datadir=%{_aclocaldir} \ pkgconfigdir=%{_pkgconfigdir} -touch $RPM_BUILD_ROOT%{_sysconfdir}/gdk-pixbuf.loaders touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk.immodules cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} @@ -273,7 +270,6 @@ %if "%{_lib}" != "lib" # We need to have 32-bit and 64-bit binaries as they have hardcoded LIBDIR. # (needed when multilib is used) -mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders{,%{pqext}} mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0{,%{pqext}} %endif @@ -293,7 +289,6 @@ %post /sbin/ldconfig umask 022 -%{_bindir}/gdk-pixbuf-query-loaders%{pqext} > %{_sysconfdir}/gdk-pixbuf.loaders %{_bindir}/gtk-query-immodules-2.0%{pqext} > %{_sysconfdir}/gtk.immodules exit 0 @@ -305,7 +300,6 @@ # 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%{pqext} > %{_sysconfdir}/gdk-pixbuf.loaders %{_bindir}/gtk-query-immodules-2.0%{pqext} > %{_sysconfdir}/gtk.immodules fi fi @@ -313,14 +307,12 @@ %triggerpostun -- gtk+2 < 2:2.4.0 umask 022 -%{_bindir}/gdk-pixbuf-query-loaders%{pqext} > %{_sysconfdir}/gdk-pixbuf.loaders %{_bindir}/gtk-query-immodules-2.0%{pqext} > %{_sysconfdir}/gtk.immodules exit 0 %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS NEWS README -%attr(755,root,root) %{_bindir}/gdk-pixbuf-query-loaders%{pqext} %attr(755,root,root) %{_bindir}/gtk-demo %attr(755,root,root) %{_bindir}/gtk-query-immodules-2.0%{pqext} %attr(755,root,root) %{_bindir}/gtk-update-icon-cache @@ -328,10 +320,6 @@ %attr(755,root,root) %ghost %{_libdir}/libgailutil.so.18 %attr(755,root,root) %{_libdir}/libgdk-x11-2.0.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgdk-x11-2.0.so.0 -%attr(755,root,root) %{_libdir}/libgdk_pixbuf-2.0.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgdk_pixbuf-2.0.so.0 -%attr(755,root,root) %{_libdir}/libgdk_pixbuf_xlib-2.0.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgdk_pixbuf_xlib-2.0.so.0 %attr(755,root,root) %{_libdir}/libgtk-x11-2.0.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgtk-x11-2.0.so.0 @@ -345,13 +333,10 @@ %dir %{_libdir}/gtk-2.0/%{abivers}/filesystems %dir %{_libdir}/gtk-2.0/%{abivers}/immodules %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/immodules/im-*.so -%dir %{_libdir}/gtk-2.0/%{abivers}/loaders -%attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/loaders/libpixbufloader-*.so %dir %{_libdir}/gtk-2.0/%{abivers}/printbackends %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/printbackends/libprintbackend-file.so %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/printbackends/libprintbackend-lpr.so %{_libdir}/girepository-1.0/Gdk-2.0.typelib -%{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib %{_libdir}/girepository-1.0/Gtk-2.0.typelib # XXX: just demo data - move to examples? @@ -359,7 +344,6 @@ %dir %{_sysconfdir} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/im-multipress.conf -%ghost %{_sysconfdir}/gdk-pixbuf.loaders %ghost %{_sysconfdir}/gtk.immodules %dir %{_datadir}/themes/Default/gtk-* %{_datadir}/themes/Default/gtk-*/gtkrc @@ -369,24 +353,18 @@ %dir %{_datadir}/themes/Raleigh %dir %{_datadir}/themes/Raleigh/gtk-* %{_datadir}/themes/Raleigh/gtk-*/gtkrc -%{_mandir}/man1/gdk-pixbuf-query-loaders.1* %{_mandir}/man1/gtk-query-immodules-2.0.1* %{_mandir}/man1/gtk-update-icon-cache.1* %files devel %defattr(644,root,root,755) %doc ChangeLog -%attr(755,root,root) %{_bindir}/gdk-pixbuf-csource %attr(755,root,root) %{_bindir}/gtk-builder-convert %attr(755,root,root) %{_libdir}/libgailutil.so %attr(755,root,root) %{_libdir}/libgdk-x11-2.0.so -%attr(755,root,root) %{_libdir}/libgdk_pixbuf-2.0.so -%attr(755,root,root) %{_libdir}/libgdk_pixbuf_xlib-2.0.so %attr(755,root,root) %{_libdir}/libgtk-x11-2.0.so %{_libdir}/libgailutil.la %{_libdir}/libgdk-x11-2.0.la -%{_libdir}/libgdk_pixbuf-2.0.la -%{_libdir}/libgdk_pixbuf_xlib-2.0.la %{_libdir}/libgtk-x11-2.0.la %{_includedir}/gail-1.0 %{_includedir}/gtk-2.0 @@ -395,16 +373,12 @@ %{_libdir}/gtk-2.0/include %{_pkgconfigdir}/gail.pc %{_pkgconfigdir}/gdk-2.0.pc -%{_pkgconfigdir}/gdk-pixbuf-2.0.pc -%{_pkgconfigdir}/gdk-pixbuf-xlib-2.0.pc %{_pkgconfigdir}/gdk-x11-2.0.pc %{_pkgconfigdir}/gtk+-2.0.pc %{_pkgconfigdir}/gtk+-unix-print-2.0.pc %{_pkgconfigdir}/gtk+-x11-2.0.pc %{_datadir}/gir-1.0/Gdk-2.0.gir -%{_datadir}/gir-1.0/GdkPixbuf-2.0.gir %{_datadir}/gir-1.0/Gtk-2.0.gir -%{_mandir}/man1/gdk-pixbuf-csource.1* %{_mandir}/man1/gtk-builder-convert.1* %if %{with static_libs} @@ -412,8 +386,6 @@ %defattr(644,root,root,755) %{_libdir}/libgailutil.a %{_libdir}/libgdk-x11-2.0.a -%{_libdir}/libgdk_pixbuf-2.0.a -%{_libdir}/libgdk_pixbuf_xlib-2.0.a %{_libdir}/libgtk-x11-2.0.a %endif @@ -422,7 +394,6 @@ %defattr(644,root,root,755) %{_gtkdocdir}/gail-libgail-util %{_gtkdocdir}/gdk -%{_gtkdocdir}/gdk-pixbuf %{_gtkdocdir}/gtk %endif @@ -442,6 +413,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.333.2.5 2010/07/01 22:41:46 megabajt +- updated to 2.21.4 + Revision 1.333.2.4 2010/06/12 14:02:12 lisu - up to 2.21.2 - glib2-devel >= 1:2.25.8 is required ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+2/gtk+2.spec?r1=1.333.2.4&r2=1.333.2.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
