SPECS: crossmingw32-wxWidgets.spec - 2.6.1

wolf wolf at pld-linux.org
Sun Jun 12 03:01:18 CEST 2005


Author: wolf                         Date: Sun Jun 12 01:01:18 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.6.1

---- Files affected:
SPECS:
   crossmingw32-wxWidgets.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-wxWidgets.spec
diff -u SPECS/crossmingw32-wxWidgets.spec:1.1 SPECS/crossmingw32-wxWidgets.spec:1.2
--- SPECS/crossmingw32-wxWidgets.spec:1.1	Wed Jan 19 02:15:16 2005
+++ SPECS/crossmingw32-wxWidgets.spec	Sun Jun 12 03:01:12 2005
@@ -3,19 +3,19 @@
 Summary:	wxWidgets library - Mingw32 cross version
 Summary(pl):	Biblioteka wxWidgets - wersja skrośna dla Mingw32
 Name:		crossmingw32-%{realname}
-Version:	2.5.3
+Version:	2.6.1
 Release:	1
 License:	wxWidgets Licence (LGPL with exception)
 Group:		Development/Libraries
-Source0:	http://dl.sourceforge.net/wxwindows/wxAll-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/wxwindows/%{realname}-%{version}.tar.bz2
 # Source0-md5:	33994e85efc06307977d2ddb9cbd91a1
 Patch0:		%{realname}-samples.patch
-Patch1:		%{realname}-eggtrayicon.patch
-Patch2:		%{realname}-utils.patch
+Patch1:		%{realname}-ac.patch
+Patch2:		%{realname}-gif0delay.patch
 URL:		http://www.wxWidgets.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake
-BuildRequires:	bakefile >= 0.1.4
+BuildRequires:	bakefile >= 0.1.8
 BuildRequires:	crossmingw32-gcc-c++
 BuildRequires:	crossmingw32-libjpeg
 BuildRequires:	crossmingw32-libpng
@@ -72,6 +72,13 @@
 %patch1 -p1
 %patch2 -p1
 
+echo 'AC_DEFUN([AM_PATH_GTK],[:])' > fake-am_path_gtk.m4
+
+# bakefile.m4 from 0.1.8
+tail -n +1518 aclocal.m4 | head -n 1397 > bakefile.m4
+# AC_BAKEFILE_PROG_* macros
+tail -n +721 aclocal.m4 | head -n 142 >> bakefile.m4
+
 %build
 CC=%{target}-gcc ; export CC
 CXX=%{target}-g++ ; export CXX
@@ -84,6 +91,7 @@
 LDSHARED="%{target}-gcc -shared" ; export LDSHARED
 TARGET="%{target}" ; export TARGET
 
+cp -f /usr/share/automake/config.sub .
 %{__aclocal} -I .
 %{__autoconf}
 
@@ -119,7 +127,7 @@
 cp -r $RPM_BUILD_ROOT%{_libdir}/wx $RPM_BUILD_ROOT%{arch}/lib/
 cp -r $RPM_BUILD_ROOT%{_includedir} $RPM_BUILD_ROOT%{arch}
 
-ln -s %{arch}/lib/wx/config/i386-mingw32-msw-ansi-release-2.5 $RPM_BUILD_ROOT%{_bindir}
+ln -s %{arch}/lib/wx/config/i386-mingw32-msw-ansi-release-2.6 $RPM_BUILD_ROOT%{_bindir}
 
 rm $RPM_BUILD_ROOT/%{_bindir}/wx-config
 
@@ -146,6 +154,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/06/12 01:01:12  wolf
+- 2.6.1
+
 Revision 1.1  2005/01/19 01:15:16  wolf
 - crossmingw32-wxMSW.spec renamed, updated, standarized
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/crossmingw32-wxWidgets.spec?r1=1.1&r2=1.2&f=u




More information about the pld-cvs-commit mailing list