Accepting request 23286 from GNOME:Factory

Copy from GNOME:Factory/gtk2 based on submit request 23286 from user sbrabec

OBS-URL: https://build.opensuse.org/request/show/23286
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk2?expand=0&rev=77
This commit is contained in:
OBS User autobuild 2009-10-28 00:34:38 +00:00 committed by Git OBS Bridge
parent 178322fb70
commit 7fc095d080
3 changed files with 27 additions and 5 deletions

10
gtk2-potfiles.patch Normal file
View File

@ -0,0 +1,10 @@
--- 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

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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

View File

@ -29,6 +29,7 @@ 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
@ -39,7 +40,7 @@ Obsoletes: gtk2-64bit
#
PreReq: /usr/bin/touch /bin/rm /bin/rmdir
Version: 2.18.1
Release: 2
Release: 3
# FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
Summary: Library for Creation of Graphical User Interfaces (version 2)
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2
@ -48,6 +49,8 @@ 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
@ -151,9 +154,11 @@ configurable.
%lang_package
%prep
%setup -q -n %{_name}-%{version}
# This breaks due to bugs in a Makefile.am;
# gnome-patch-translation-prepare
%setup -q -n %{_name}-%{version}
%patch1
translation-update-upstream
translation-update-upstream po-properties gtk20-properties
gnome-patch-translation-prepare
%patch -p1
cp -a %{S:1} .
%if "%_lib" == "lib64"
@ -168,7 +173,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