X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-gtk%2B2.spec;h=6757e370dadd013754ae3ce197b183b2e03bc016;hb=b4ace7735a767a304665a4f23a2b7bffdd74f257;hp=f109674b9b83777f32f956847775e043a61cdf39;hpb=a893e084ec8de58ab24b763194603a5b81ba1d34;p=packages%2Fcrossmingw32-gtk%2B2.git

diff --git a/crossmingw32-gtk+2.spec b/crossmingw32-gtk+2.spec
index f109674..6757e37 100644
--- a/crossmingw32-gtk+2.spec
+++ b/crossmingw32-gtk+2.spec
@@ -1,24 +1,25 @@
 Summary:	The Gimp Toolkit - Ming32 cross version
 Summary(pl.UTF-8):	Gimp Toolkit - wersja skrośna dla Ming32
-%define		_realname   gtk+2
-Name:		crossmingw32-%{_realname}
-Version:	2.10.12
+Name:		crossmingw32-gtk+2
+Version:	2.12.0
 Release:	1
-License:	LGPL
+License:	LGPL v2+
 Group:		Development/Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2
-# Source0-md5:	cf969c62134c662ff07e64613ed6c11f
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
+# Source0-md5:	e9c280afec29b11772af5a7c807abf41
+Patch0:		%{name}-libtool.patch
 URL:		http://www.gtk.org/
-BuildRequires:	crossmingw32-atk >= 1.18.0
+BuildRequires:	crossmingw32-atk >= 1.20.0
 BuildRequires:	crossmingw32-gcc
-BuildRequires:	crossmingw32-glib2 >= 2.12.12
+BuildRequires:	crossmingw32-glib2 >= 2.14.0
 BuildRequires:	crossmingw32-libjpeg
 BuildRequires:	crossmingw32-libpng
 BuildRequires:	crossmingw32-libtiff
-BuildRequires:	crossmingw32-pango >= 1.16.2
-Requires:	crossmingw32-atk >= 1.18.0
-Requires:	crossmingw32-glib2 >= 2.12.12
-Requires:	crossmingw32-pango >= 1.16.2
+BuildRequires:	crossmingw32-pango >= 1.18.1
+BuildRequires:	pkgconfig >= 1:0.15
+Requires:	crossmingw32-atk >= 1.20.0
+Requires:	crossmingw32-glib2 >= 2.14.0
+Requires:	crossmingw32-pango >= 1.18.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		abivers	2.10.0
@@ -27,7 +28,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		target			i386-mingw32
 %define		target_platform 	i386-pc-mingw32
-%define		arch			%{_prefix}/%{target}
 
 %define		_sysprefix		/usr
 %define		_prefix			%{_sysprefix}/%{target}
@@ -65,9 +65,9 @@ Ten pakiet zawiera wersję skrośną dla Win32.
 Summary:	DLL GTK+ libraries for Windows
 Summary(pl.UTF-8):	Biblioteki DLL GTK+ dla Windows
 Group:		Applications/Emulators
-Requires:	crossmingw32-atk-dll >= 1.18.0
-Requires:	crossmingw32-glib2-dll >= 2.12.12
-Requires:	crossmingw32-pango-dll >= 1.16.2
+Requires:	crossmingw32-atk-dll >= 1.20.0
+Requires:	crossmingw32-glib2-dll >= 2.14.0
+Requires:	crossmingw32-pango-dll >= 1.18.1
 Requires:	wine
 
 %description dll
@@ -78,15 +78,17 @@ Biblioteki DLL GTK+ dla Windows.
 
 %prep
 %setup -q -n gtk+-%{version}
+%patch0 -p1
 
 %build
-export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
+export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
+	ac_cv_path_CUPS_CONFIG=no \
 	--target=%{target} \
 	--host=%{target} \
 	--disable-gtk-doc \