- updated to 2.99.0

- fix shebang in gtk-builder-convert
- separate gtk-builder-convert and gtk-update-icon-cache programs to subpackages (same to be done in gtk+2.spec)
- fix some new bashisms

Changed files:
    bashisms.patch -> 1.2
    gtk+3.spec -> 1.13
    python.patch -> 1.1

diff --git a/bashisms.patch b/bashisms.patch
index cd0457b84254ba28ea78e79e4829c1af1baae815..79595466054b953e80366e3dddf975ff3f8452c2 100644 (file)
--- a/bashisms.patch
+++ b/bashisms.patch
@@ -1,43 +1,29 @@
-From 7032996c76c577a9ab13c47f01ecadc762b87506 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-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'
+--- gtk+-2.99.0/configure.ac.wiget     2011-01-06 04:55:33.000000000 +0100
++++ gtk+-2.99.0/configure.ac   2011-01-09 21:32:51.429526702 +0100
+@@ -324,7 +324,7 @@ else
  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
+ # strip leading space
+-GDK_BACKENDS=${GDK_BACKENDS/# }
++GDK_BACKENDS=${GDK_BACKENDS# }
+ 
+ AC_SUBST(GDK_BACKENDS)
+ 
+@@ -1162,7 +1162,7 @@ if test "x$enable_x11_backend" == xyes;
+   AM_CONDITIONAL(USE_X11, true)
+ 
+   # strip leading space
+-  X_EXTENSIONS=${X_EXTENSIONS/# }
++  X_EXTENSIONS=${X_EXTENSIONS# }
+ 
+ else
+   XPACKAGES=
+@@ -1658,7 +1658,7 @@ perf/Makefile
+ AC_OUTPUT
+ 
+ # beautify the immodule list a bit
+-included_immodules=${included_immodules//,/ }
++included_immodules="$(echo $included_immodules|sed -e 's/,/ /g')"
+ included_immodules=${included_immodules:-none}
+ 
+ echo "configuration:"

diff --git a/gtk+3.spec b/gtk+3.spec
index f0c4e7c4066415d68821ccd3a2a7d1a84b2d8e2d..c57fb859ed8b7149ebc3d15c1fd7f63f0cf52d7c 100644 (file)
--- a/gtk+3.spec
+++ b/gtk+3.spec
@@ -1,9 +1,4 @@
 # TODO
-# - solve this:
-#| /tmp/gtk+2-2.12.8-root-glen $ find -type f|xargs file|grep -i python
-#| ./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:
@@ -20,13 +15,14 @@ Summary(it.UTF-8):  Il toolkit per GIMP
 Summary(pl.UTF-8):     GIMP Toolkit
 Summary(tr.UTF-8):     GIMP ToolKit arayüz kitaplığı
 Name:          gtk+3
-Version:       2.91.7
+Version:       2.99.0
 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: 221d8f13a75be17f51759bedee7db477
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.99/gtk+-%{version}.tar.bz2
+# Source0-md5: 8991403e30457362f1bf20f1313a6456
 Patch0:                bashisms.patch
+Patch1:                python.patch
 URL:           http://www.gtk.org/
 BuildRequires: atk-devel >= 1:1.30.0
 BuildRequires: autoconf >= 2.62
@@ -125,6 +121,13 @@ rodzaju kontrolek służących do tworzenia interfejsu użytkownika.
 Başlangıçta GIMP için yazılmış X kitaplıkları. Şu anda başka
 programlarca da kullanılmaktadır.
 
+%package -n gtk-update-icon-cache
+Summary:       Update icon cache used by GTK+ library
+Group:         Applications/System
+
+%description -n gtk-update-icon-cache
+Update icon cache used by GTK+ library.
+
 %package devel
 Summary:       GTK+ header files and development documentation
 Summary(cs.UTF-8):     Sada nástrojů GIMP a kreslící kit GIMP
@@ -160,6 +163,15 @@ Header files and development documentation for the GTK+ libraries.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe i dokumentacja do bibliotek GTK+.
 
+%package -n gtk-builder-convert
+Summary:       Convert glade files to GtkBuilder format
+Group:         Development/Tools
+Requires:      python-modules
+
+%description -n gtk-builder-convert
+Converts Glade files into XML files which can be loaded with
+GtkBuilder.
+
 %package static
 Summary:       GTK+ static libraries
 Summary(pl.UTF-8):     Biblioteki statyczne GTK+
@@ -211,6 +223,7 @@ Moduł GTK+ do drukowania przez CUPS.
 %prep
 %setup -q -n gtk+-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 rm m4/introspection.m4
@@ -222,14 +235,16 @@ rm m4/introspection.m4
 %{__automake}
 %configure \
        --disable-silent-rules \
-       %{!?with_cups:ac_cv_path_CUPS_CONFIG=no} \
+       %{__disable cups} \
        %{?debug:--enable-debug=yes} \
-       --%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
+       %{__enable_disable apidocs gtk-doc} \
        --enable-man \
-       --%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \
-       --with-gdktarget=x11 \
+       %{__enable_disable static_libs static} \
+       --enable-x11-backend \
        --with-html-dir=%{_gtkdocdir} \
-       --with-xinput=yes
+       --enable-xinput \
+       --enable-xkb \
+       --enable-xinerama
 %{__make}
 
 %install
@@ -284,7 +299,6 @@ exit 0
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
 %attr(755,root,root) %{_bindir}/gtk-query-immodules-3.0%{pqext}
-%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.0
@@ -334,12 +348,15 @@ exit 0
 %dir %{_datadir}/themes/Raleigh/gtk-*
 %{_datadir}/themes/Raleigh/gtk-*/gtkrc
 %{_mandir}/man1/gtk-query-immodules-3.0.1*
-%{_mandir}/man1/gtk-update-icon-cache-3.0.1*
+
+%files -n gtk-update-icon-cache
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gtk-update-icon-cache
+%{_mandir}/man1/gtk-update-icon-cache.1*
 
 %files devel
 %defattr(644,root,root,755)
 %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-3.0.so
 %attr(755,root,root) %{_libdir}/libgtk-3.0.so
@@ -351,15 +368,19 @@ exit 0
 %{_aclocaldir}/gtk-3.0.m4
 %{_pkgconfigdir}/gail-3.0.pc
 %{_pkgconfigdir}/gdk-3.0.pc
-%{_pkgconfigdir}/gdk-3.0.pc
+%{_pkgconfigdir}/gdk-x11-3.0.pc
 %{_pkgconfigdir}/gtk+-3.0.pc
 %{_pkgconfigdir}/gtk+-unix-print-3.0.pc
 %{_pkgconfigdir}/gtk+-x11-3.0.pc
-%{_mandir}/man1/gtk-builder-convert-3.0.1*
 %{_datadir}/gir-1.0/Gdk-3.0.gir
 %{_datadir}/gir-1.0/GdkX11-3.0.gir
 %{_datadir}/gir-1.0/Gtk-3.0.gir
 
+%files -n gtk-builder-convert
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gtk-builder-convert
+%{_mandir}/man1/gtk-builder-convert.1*
+
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)

diff --git a/python.patch b/python.patch
new file mode 100644 (file)
index 0000000..154133f
--- /dev/null
+++ b/python.patch
@@ -0,0 +1,8 @@
+--- gtk+-2.99.0/gtk/gtk-builder-convert.wig    2011-01-09 22:55:41.546478959 +0100
++++ gtk+-2.99.0/gtk/gtk-builder-convert        2011-01-09 22:56:25.132114551 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright (C) 2006-2008 Async Open Source
+ #                         Henrique Romano <henrique@async.com.br>