SPECS: crossmingw32-wxWidgets.spec - updated to 2.6.2 - disable pr...

qboosh qboosh at pld-linux.org
Wed Oct 19 15:47:55 CEST 2005


Author: qboosh                       Date: Wed Oct 19 13:47:55 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 2.6.2
- disable precomp-headers (build fails on gcc 3.4.3 with enabled)

---- Files affected:
SPECS:
   crossmingw32-wxWidgets.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-wxWidgets.spec
diff -u SPECS/crossmingw32-wxWidgets.spec:1.3 SPECS/crossmingw32-wxWidgets.spec:1.4
--- SPECS/crossmingw32-wxWidgets.spec:1.3	Sun Jun 12 03:05:38 2005
+++ SPECS/crossmingw32-wxWidgets.spec	Wed Oct 19 15:47:50 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.6.1
+Version:	2.6.2
 Release:	1
 License:	wxWidgets Licence (LGPL with exception)
 Group:		Development/Libraries
 Source0:	http://dl.sourceforge.net/wxwindows/%{realname}-%{version}.tar.bz2
-# Source0-md5:	045f0edad0988620a4aa36096bb16e28
+# Source0-md5:	ee0aa211febd992c8540e6c9df749b51
 Patch0:		%{realname}-samples.patch
 Patch1:		%{realname}-ac.patch
 Patch2:		%{realname}-gif0delay.patch
 URL:		http://www.wxWidgets.org/
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake
-BuildRequires:	bakefile >= 0.1.8
+#BuildRequires:	bakefile >= 0.1.9
 BuildRequires:	crossmingw32-gcc-c++
 BuildRequires:	crossmingw32-libjpeg
 BuildRequires:	crossmingw32-libpng
@@ -42,8 +42,6 @@
 %define		optflags	-O2
 %endif
 
-%define		rpmcxxflags	"%{rpmcflags}"
-
 %description
 wxWidgets is a free C++ library for cross-platform GUI development.
 With wxWidgets, you can create applications for different GUIs (GTK+,
@@ -74,11 +72,6 @@
 
 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
@@ -92,12 +85,13 @@
 TARGET="%{target}" ; export TARGET
 
 cp -f /usr/share/automake/config.sub .
-%{__aclocal} -I .
+%{__aclocal} -I build/aclocal
 %{__autoconf}
 
 %configure \
 	--with-msw \
 	--with-opengl \
+	--disable-precomp-headers \
 	--enable-official-build \
 	--enable-std-iostreams \
 	--enable-controls \
@@ -111,7 +105,8 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{arch}/{bin,include,lib},%{_datadir}/wine/windows/system}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 sed -i  -e 's at includedir="/usr/include"@includedir="%{arch}/include"@' \
 	-e 's at libdir="/usr/lib"@libdir="%{arch}/lib"@' \
@@ -154,6 +149,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/10/19 13:47:50  qboosh
+- updated to 2.6.2
+- disable precomp-headers (build fails on gcc 3.4.3 with enabled)
+
 Revision 1.3  2005/06/12 01:05:38  wolf
 - md5
 
================================================================

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




More information about the pld-cvs-commit mailing list