Author: wiget Date: Tue Dec 28 21:32:17 2010 GMT Module: packages Tag: HEAD ---- Log message: - 2.91.7 (soname change)
---- Files affected: packages/gtk+3: gtk+3.spec (1.11 -> 1.12) , bashisms.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gtk+3/gtk+3.spec diff -u packages/gtk+3/gtk+3.spec:1.11 packages/gtk+3/gtk+3.spec:1.12 --- packages/gtk+3/gtk+3.spec:1.11 Thu Dec 9 20:24:33 2010 +++ packages/gtk+3/gtk+3.spec Tue Dec 28 22:32:11 2010 @@ -5,6 +5,7 @@ #| ./usr/bin/gtk-builder-convert: a python script text executable #| /tmp/gtk+2-2.12.8-root-glen $ head -n 1 ./usr/bin/gtk-builder-convert #| !/usr/bin/env python +# - fix libgailutil linking # # Conditional build: %bcond_without apidocs # disable gtk-doc @@ -20,12 +21,13 @@ Summary(pl.UTF-8): GIMP Toolkit Summary(tr.UTF-8): GIMP ToolKit arayüz kitaplığı Name: gtk+3 -Version: 2.91.6 +Version: 2.91.7 Release: 1 License: LGPL v2+ Group: X11/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.91/gtk+-%{version}.tar.bz2 -# Source0-md5: b2d5e817c8eda5834ba5df6dcbb6e962 +# Source0-md5: 221d8f13a75be17f51759bedee7db477 +Patch0: bashisms.patch URL: http://www.gtk.org/ BuildRequires: atk-devel >= 1:1.30.0 BuildRequires: autoconf >= 2.62 @@ -80,6 +82,7 @@ %else %define pqext %{nil} %endif +%define skip_post_check_so libgailutil-3.0.so.0.0.0 %description GTK+, which stands for the GIMP ToolKit, is a library for creating @@ -208,6 +211,7 @@ %prep %setup -q -n gtk+-%{version} +%patch0 -p1 %build rm m4/introspection.m4 @@ -285,10 +289,10 @@ %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.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}/libgtk-x11-3.0.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgtk-x11-3.0.so.0 +%attr(755,root,root) %{_libdir}/libgdk-3.0.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libgdk-3.0.so.0 +%attr(755,root,root) %{_libdir}/libgtk-3.0.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libgtk-3.0.so.0 %dir %{_libdir}/gtk-3.0 %dir %{_libdir}/gtk-3.0/modules @@ -338,18 +342,17 @@ %doc ChangeLog %attr(755,root,root) %{_bindir}/gtk-builder-convert-3.0 %attr(755,root,root) %{_libdir}/libgailutil-3.0.so -%attr(755,root,root) %{_libdir}/libgdk-x11-3.0.so -%attr(755,root,root) %{_libdir}/libgtk-x11-3.0.so +%attr(755,root,root) %{_libdir}/libgdk-3.0.so +%attr(755,root,root) %{_libdir}/libgtk-3.0.so %{_libdir}/libgailutil-3.0.la -%{_libdir}/libgdk-x11-3.0.la -%{_libdir}/libgtk-x11-3.0.la +%{_libdir}/libgdk-3.0.la +%{_libdir}/libgtk-3.0.la %{_includedir}/gail-3.0 %{_includedir}/gtk-3.0 %{_aclocaldir}/gtk-3.0.m4 -%{_libdir}/gtk-3.0/include %{_pkgconfigdir}/gail-3.0.pc %{_pkgconfigdir}/gdk-3.0.pc -%{_pkgconfigdir}/gdk-x11-3.0.pc +%{_pkgconfigdir}/gdk-3.0.pc %{_pkgconfigdir}/gtk+-3.0.pc %{_pkgconfigdir}/gtk+-unix-print-3.0.pc %{_pkgconfigdir}/gtk+-x11-3.0.pc @@ -362,8 +365,8 @@ %files static %defattr(644,root,root,755) %{_libdir}/libgailutil-3.0.a -%{_libdir}/libgdk-x11-3.0.a -%{_libdir}/libgtk-x11-3.0.a +%{_libdir}/libgdk-3.0.a +%{_libdir}/libgtk-3.0.a %endif %if %{with apidocs} @@ -390,6 +393,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12 2010/12/28 21:32:11 wiget +- 2.91.7 (soname change) + Revision 1.11 2010/12/09 19:24:33 megabajt - use %glib_compile_schemas ================================================================ Index: packages/gtk+3/bashisms.patch diff -u /dev/null packages/gtk+3/bashisms.patch:1.1 --- /dev/null Tue Dec 28 22:32:17 2010 +++ packages/gtk+3/bashisms.patch Tue Dec 28 22:32:11 2010 @@ -0,0 +1,43 @@ +From 7032996c76c577a9ab13c47f01ecadc762b87506 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <[email protected]> +Date: Tue, 28 Dec 2010 00:24:05 +0000 +Subject: Remove bashisms from configure.ac + +Pointed out by Koop Mast in +https://bugzilla.gnome.org/show_bug.cgi?id=637974 +--- +diff --git a/configure.ac b/configure.ac +index 7be4641..a90f7d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1520,16 +1520,16 @@ _______EOF + ],[ + gdk_windowing='' + if expr "$gdktarget" : ".*x11.*" > /dev/null ; then +- gdk_windowing+=' ++ gdk_windowing='$gdk_windowing + #define GDK_WINDOWING_X11' + fi + if expr "$gdktarget" : ".*win32.*" > /dev/null ; then +- gdk_windowing+=' ++ gdk_windowing='$gdk_windowing + #define GDK_NATIVE_WINDOW_POINTER + #define GDK_WINDOWING_WIN32' + fi + if expr "$gdktarget" : ".*quartz.*" > /dev/null ; then +- gdk_windowing=' ++ gdk_windowing='$gdk_windowing + #define GDK_WINDOWING_QUARTZ' + fi + ]) +@@ -1551,7 +1551,7 @@ AC_ARG_ENABLE(Bsymbolic, + enable_Bsymbolic=no) + LDFLAGS="${SAVED_LDFLAGS}"]) + +-if test "x${enable_Bsymbolic}" == "xyes"; then ++if test "x${enable_Bsymbolic}" = "xyes" ; then + GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions + fi + AC_SUBST(GTK_LINK_FLAGS) +-- +cgit v0.8.3.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+3/gtk+3.spec?r1=1.11&r2=1.12&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
