checked in

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=80

gtk2-potfiles.patch

@@ -1,10 +0,0 @@
---- po/POTFILES.in
-+++ po/POTFILES.in
-@@ -35,7 +35,6 @@
- gdk-pixbuf/io-gdip-gif.c
- gdk-pixbuf/io-gdip-ico.c
- gdk-pixbuf/io-gdip-jpeg.c
--gdk-pixbuf/io-gdip-png.c
- gdk-pixbuf/io-gdip-utils.c
- gdk-pixbuf/io-gdip-wmf.c
- gdk/win32/gdkmain-win32.c

gtk2.changes

@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Tue Oct 27 15:47:08 CET 2009 - sbrabec@suse.cz
-
-- Fixed incorrect file list in POTFILES.in (bgo#599774).
-- Added support for translation-update-upstream (FATE#301344).
-- Re-enabled gnome-patch-translation support.
-
 -------------------------------------------------------------------
 Mon Oct  5 23:15:24 CEST 2009 - vuntz@opensuse.org
 

gtk2.spec

@@ -29,7 +29,6 @@ BuildRequires:  gtk-doc
 BuildRequires:  libjasper-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  pango-devel
-BuildRequires:  translation-update-upstream
 Url:            http://www.gtk.org/
 License:        LGPL v2.1 or later
 Group:          System/Libraries
@@ -49,8 +48,6 @@ Source2:        README.SuSE
 Source3:        gtkrc
 # PATCH-FIX-UPSTREAM gtk+-strict-aliasing.patch federico@novell.com - Fix compiler warnings.  This is already in SVN trunk as of 2008/07/18
 Patch:          gtk+-strict-aliasing.patch
-# PATCH-FIX-UPSTREAM gtk2-potfiles.patch bgo599774 sbrabec@suse.cz - Fix POTFILES.in referring to missing file.
-Patch1:         gtk2-potfiles.patch
 # PATCH-FIX-OPENSUSE gtk64.patch sbrabec@novell.com - 64-bit dual install.  See also the Fedora patch for a simpler way of doing this.
 Patch8:         gtk64.patch
 # PATCH-FIX-OPENSUSE gdk-modules-information.diff hhetter@suse.de - Info on how to manually regenerate modules information
@@ -154,11 +151,9 @@ configurable.
 
 %lang_package
 %prep
-%setup -q -n %{_name}-%{version}
+%setup -q -n %{_name}-%{version} 
-%patch1
+# This breaks due to bugs in a Makefile.am;
-translation-update-upstream
+# gnome-patch-translation-prepare
-translation-update-upstream po-properties gtk20-properties
-gnome-patch-translation-prepare
 %patch -p1
 cp -a %{S:1} .
 %if "%_lib" == "lib64"
@@ -173,7 +168,7 @@ cp -a %{S:2} .
 %patch25 -p1
 %patch26 -p1
 %patch53
-gnome-patch-translation-update
+# gnome-patch-translation-update
 
 %build
 ACLOCAL="aclocal -I m4macros" autoreconf -f -i