- removed x86 asm disabling hack - didn't work in 0.92.0 anyway
Changed files:
WindowMaker.spec -> 1.163
Patch10: %{name}-localenames.patch
Patch11: %{name}-0.91.0-translucency-1.patch
Patch12: %{name}-gnustep.patch
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
URL: http://www.windowmaker.org/
BuildRequires: XFree86-devel
BuildRequires: autoconf
%prep
%setup -q -a 1 -a 2
%prep
%setup -q -a 1 -a 2
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
-# 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
-
-%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}
%{__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#;/' \
cd ..
%{__perl} -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#extension#;/' \
--enable-gnome \
--enable-kde
--enable-gnome \
--enable-kde
touch WindowMaker/Defaults/W*.in
%{__make} \
touch WindowMaker/Defaults/W*.in
%{__make} \
install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
-cd %{name}-extra-%{extraver}
-%{__make} install \
+%{__make} -C %{name}-extra-%{extraver} install \
%find_lang %{name} --all-name
%find_lang %{name} --all-name