Author: qboosh Date: Thu Mar 8 12:46:05 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added w32api patch to fix build with latest mingw32/w32api
- cleanup, separated -dll
---- Files affected:
SPECS:
crossmingw32-gtk+2.spec (1.10 -> 1.11)
---- Diffs:
================================================================
Index: SPECS/crossmingw32-gtk+2.spec
diff -u SPECS/crossmingw32-gtk+2.spec:1.10 SPECS/crossmingw32-gtk+2.spec:1.11
--- SPECS/crossmingw32-gtk+2.spec:1.10 Sun Feb 25 16:11:21 2007
+++ SPECS/crossmingw32-gtk+2.spec Thu Mar 8 13:46:00 2007
@@ -1,14 +1,6 @@
# $Revision$, $Date$
Summary: The Gimp Toolkit - Ming32 cross version
-Summary(cs.UTF-8): Sada nástrojů pro Gimp
-Summary(de.UTF-8): Der Gimp-Toolkit
-Summary(es.UTF-8): Conjunto de herramientas Gimp
-Summary(fi.UTF-8): Gimp-työkalukokoelma
-Summary(fr.UTF-8): Le toolkit de Gimp
-Summary(it.UTF-8): Il toolkit per Gimp
Summary(pl.UTF-8): Gimp Toolkit - wersja skrośna dla Ming32
-Summary(pt_BR.UTF-8): Kit de ferramentas Gimp
-Summary(tr.UTF-8): Gimp ToolKit arayüz kitaplığı
%define _realname gtk+2
Name: crossmingw32-%{_realname}
Version: 2.10.9
@@ -17,15 +9,17 @@
Group: Libraries
Source0:
http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2
# Source0-md5: 20d763198efb38263b22dee347f69da6
-Patch0: %{name}-static.patch
-Patch1: %{name}-build.patch
+Patch0: %{name}-w32api.patch
URL: http://www.gtk.org/
+BuildRequires: crossmingw32-atk >= 1.6.0
+BuildRequires: crossmingw32-gcc
+BuildRequires: crossmingw32-glib2 >= 2.4.7
BuildRequires: crossmingw32-libjpeg
BuildRequires: crossmingw32-libpng
BuildRequires: crossmingw32-libtiff
-BuildRequires: unzip
-Requires: crossmingw32-glib2 >= 2.4.7
+BuildRequires: crossmingw32-pango >= 1.4.1
Requires: crossmingw32-atk >= 1.6.0
+Requires: crossmingw32-glib2 >= 2.4.7
Requires: crossmingw32-pango >= 1.4.1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -36,12 +30,11 @@
%define target i386-mingw32
%define target_platform i386-pc-mingw32
%define arch %{_prefix}/%{target}
-%define gccarch %{_prefix}/lib/gcc-lib/%{target}
-%define gcclib
%{_prefix}/lib/gcc-lib/%{target}/%{version}
%define _sysprefix /usr
%define _prefix %{_sysprefix}/%{target}
%define _pkgconfigdir %{_prefix}/lib/pkgconfig
+%define _dlldir /usr/share/wine/windows/system
%define __cc %{target}-gcc
%define __cxx %{target}-g++
@@ -56,24 +49,7 @@
dealing with different color depths, and GTK is a widget set for
creating user interfaces.
-%description -l cs.UTF-8
-Knihovny X původně psané pro GIMP, které nyní používá také řada jiných
-programů.
-
-%description -l da.UTF-8
-X biblioteker, oprindeligt udviklet til GIMP, men anvendes nu af flere
-forskellige programmer.
-
-%description -l de.UTF-8
-Die X-Libraries, die ursprünglich für GIMP geschrieben wurden und
-mittlerweile für eine ganze Reihe anderer Programme benutzt werden.
-
-%description -l fr.UTF-8
-X-kirjastot, jotka alunperin kirjoitettiin GIMP:lle, mutta joita
-käytetään nyt myös useissa muissakin ohjelmissa.
-
-%description -l it.UTF-8
-Libreria X scritta per GIMP. Viene usata da diversi programmi.
+This package contains the cross version for Win32.
%description -l pl.UTF-8
GTK+, która to biblioteka stała się podstawą programu Gimp, zawiera
@@ -85,18 +61,26 @@
piksel). GTK (druga część GTK+) jest natomiast już zbiorem różnego
rodzaju kontrolek służących do tworzenia interfejsu użytkownika.
-%description -l pt_BR.UTF-8
-Bibliotecas X originalmente escritas para o GIMP, que agora estão
-sendo também usadas por vários outros programas.
-
-%description -l tr.UTF-8
-Başlangıçta GIMP için yazılmış X kitaplıkları. Şu anda başka
-programlarca da kullanılmaktadır.
+Ten pakiet zawiera wersję skrośną dla Win32.
+
+%package dll
+Summary: DLL GTK+ libraries for Windows
+Summary(pl.UTF-8): Biblioteki DLL GTK+ dla Windows
+Group: Applications/Emulators
+Requires: crossmingw32-atk-dll >= 1.6.0
+Requires: crossmingw32-glib2-dll >= 2.4.7
+Requires: crossmingw32-pango-dll >= 1.4.1
+Requires: wine
+
+%description dll
+DLL GTK+ libraries for Windows.
+
+%description dll -l pl.UTF-8
+Biblioteki DLL GTK+ dla Windows.
%prep
%setup -q -n gtk+-%{version}
-#%patch0 -p1
-#%patch1 -p1
+%patch0 -p1
%build
export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
@@ -114,50 +98,46 @@
--disable-xkb \
--with-gdk-target=win32 \
--without-x \
- --without-xinput \
- --enable-static
-
-#%{__sed} -i -e 's/^deplibs_check_method=.*/deplibs_check_method="pass_all"/'
libtool
+ --without-xinput
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0 \
- $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{abivers}/filesystems
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- m4datadir=%{_aclocaldir} \
- pkgconfigdir=%{_pkgconfigdir}
+ DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_dlldir}
+mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk.immodules
+%if 0%{!?debug:1}
+%{target}-strip --strip-unneeded -R.comment -R.note
$RPM_BUILD_ROOT%{_dlldir}/*.dll
+%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
+%endif
# remove unsupported locale scheme
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED]
+rm -rf $RPM_BUILD_ROOT%{_datadir}/{aclocal,gtk-2.0,gtk-doc,locale,man,themes}
# shut up check-files (static modules and *.la for modules)
rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-*/2.*/*/*.{a,la}
-# for various GTK+2 modules
-#install -d $(echo $RPM_BUILD_ROOT%{_libdir}/gtk-*)/modules
-
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/{az_IR,[EMAIL PROTECTED]
-
-%find_lang %{name} --all-name
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%{_includedir}/gtk-2.0
-%{_libdir}/*.dll.a
+%{_libdir}/libg[dt]k*.dll.a
+%{_libdir}/libg[dt]k*.la
+%{_libdir}/g[dt]k*.def
%dir %{_libdir}/gtk-2.0
-%{_libdir}/gtk-2.0/*
+%{_libdir}/gtk-2.0/include
+%{_includedir}/gtk-2.0
+%{_includedir}/gtk-unix-print-2.0
%{_pkgconfigdir}/*.pc
-# XXX: missing dir
-%dir %{_datadir}/gtk-2.0
-%{_datadir}/gtk-2.0/*
+
+%files dll
+%defattr(644,root,root,755)
+%{_dlldir}/libg[dt]k*.dll
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -165,6 +145,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2007/03/08 12:46:00 qboosh
+- added w32api patch to fix build with latest mingw32/w32api
+- cleanup, separated -dll
+
Revision 1.10 2007/02/25 15:11:21 czarny
- proper build
- needs static build as well
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/crossmingw32-gtk+2.spec?r1=1.10&r2=1.11&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
