SPECS: WindowMaker.spec - added cvs patch, now builds with gcc 4 -...
qboosh
qboosh at pld-linux.org
Thu Feb 2 23:08:23 CET 2006
Author: qboosh Date: Thu Feb 2 22:08:23 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added cvs patch, now builds with gcc 4
- removed x86 asm disabling hack - didn't work in 0.92.0 anyway
---- Files affected:
SPECS:
WindowMaker.spec (1.162 -> 1.163)
---- Diffs:
================================================================
Index: SPECS/WindowMaker.spec
diff -u SPECS/WindowMaker.spec:1.162 SPECS/WindowMaker.spec:1.163
--- SPECS/WindowMaker.spec:1.162 Sat Jan 21 13:05:32 2006
+++ SPECS/WindowMaker.spec Thu Feb 2 23:08:18 2006
@@ -34,6 +34,7 @@
Patch10: %{name}-localenames.patch
Patch11: %{name}-0.91.0-translucency-1.patch
Patch12: %{name}-gnustep.patch
+Patch13: %{name}-cvs.patch
URL: http://www.windowmaker.org/
BuildRequires: XFree86-devel
BuildRequires: autoconf
@@ -215,6 +216,7 @@
%prep
%setup -q -a 1 -a 2
+%patch13 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -236,26 +238,21 @@
mv -f po/{no,nb}.po
-# don't use x86 asm, it's broken
-# (wrlib/x86_specific.c contains far too many assumptions about function
-# frame used by gcc, so it can crash depending on gcc version and
-# optimizations - and did so in Ac i686 packages)
-%{__perl} -pi -e 's/test \$x86 = 1/false/' configure.ac
-
%build
-%ifarch %{x8664}
-export ac_cv_c_inline_asm=no
-%endif
+#%ifarch %{x8664}
+# hack, should be obsolete - needs check
+#export ac_cv_c_inline_asm=no
+#%endif
%{__libtoolize}
%{__aclocal}
%{__autoheader}
%{__automake}
%{__autoconf}
cd %{name}-extra-%{extraver}
- %{__libtoolize}
- %{__aclocal}
- %{__autoconf}
- %{__automake}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
cd ..
%{__perl} -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#extension#;/' \
@@ -277,7 +274,6 @@
--enable-gnome \
--enable-kde
-
touch WindowMaker/Defaults/W*.in
%{__make} \
@@ -309,10 +305,8 @@
install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
-cd %{name}-extra-%{extraver}
-%{__make} install \
+%{__make} -C %{name}-extra-%{extraver} install \
DESTDIR=$RPM_BUILD_ROOT
-cd ..
%find_lang %{name} --all-name
@@ -393,6 +387,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.163 2006/02/02 22:08:18 qboosh
+- added cvs patch, now builds with gcc 4
+- removed x86 asm disabling hack - didn't work in 0.92.0 anyway
+
Revision 1.162 2006/01/21 12:05:32 atler
- make it build with gnustep-* packages
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/WindowMaker.spec?r1=1.162&r2=1.163&f=u
More information about the pld-cvs-commit
mailing list