%define extraver 0.1
-%define _snap 20040718
Summary: NeXT-alike window manager
Summary(es): Administrador de Ventanas parecido con el NeXT
Summary(ru): WindowMaker - ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
Summary(uk): WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
Name: WindowMaker
-Version: 0.81.0
-Release: 0.%{_snap}.11
+Version: 0.92.0
+Release: 1
License: GPL
Group: X11/Window Managers
-Source0: ftp://ftp.windowmaker.org/pub/source/snapshots/%{name}-CVS-%{_snap}.tar.gz
-# Source0-md5: dba7dc37031ecce4c6b71c627c784ece
-Source1: ftp://windowmaker.org/pub/%{name}-data.tar.gz
+Source0: ftp://ftp.windowmaker.org/pub/source/release/%{name}-%{version}.tar.gz
+# Source0-md5: 678cb4a9b22a557cfb524dc3cb457c08
+Source1: %{name}-data.tar.gz
# Source1-md5: 6ea0c37314ea9e9ab27e8bdf45a31a82
Source2: ftp://ftp.windowmaker.org/pub/source/release/%{name}-extra-%{extraver}.tar.gz
# Source2-md5: 07c7700daaaf232bc490f5abaabef085
Source3: %{name}.desktop
Source6: %{name}-xsession.desktop
-Patch0: %{name}-CFLAGS.patch
-Patch1: %{name}-vfmg.patch
-Patch2: %{name}-pixmaps.patch
-Patch3: %{name}-shared.patch
-Patch4: %{name}-areas.patch
+Patch0: %{name}-cvs.patch
+Patch1: %{name}-pl.po-update.patch
+Patch2: %{name}-CFLAGS.patch
+Patch3: %{name}-vfmg.patch
+Patch4: %{name}-shared.patch
Patch5: %{name}-IconPosition.patch
Patch6: %{name}-singleclick.patch
Patch7: %{name}-plmenu.patch
Patch8: %{name}-dockit.patch
-Patch11: %{name}-pl.po-update.patch
-Patch12: %{name}-wmchlocale-fixes.patch
-Patch13: http://www.heily.com/mark/code_samples/appicon_captions_maxprotect.diff
-Patch14: %{name}-localenames.patch
-Patch15: %{name}-enablexft.patch
+Patch9: http://www.heily.com/mark/code_samples/appicon_captions_maxprotect.diff
+Patch10: %{name}-localenames.patch
+Patch11: %{name}-0.91.0-translucency-1.patch
+Patch12: %{name}-gnustep.patch
URL: http://www.windowmaker.org/
-BuildRequires: XFree86-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext-devel
-BuildRequires: libpng >= 1.0.8
BuildRequires: libjpeg-devel >= 6b
+BuildRequires: libpng-devel >= 1.0.8
BuildRequires: libtiff-devel
BuildRequires: libtool >= 1:1.4.2-9
BuildRequires: libungif-devel
-BuildRequires: xft-devel
+BuildRequires: perl-base
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXft-devel
+BuildRequires: xorg-lib-libXpm-devel
Requires: %{name}-libs = %{version}-%{release}
Requires: cpp
+Requires: gnustep-dirs
Requires: tk
-Requires: vfmg
-Requires: xinitrc-ng
+Requires: vfmg >= 0.9.95
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/X11
%package devel
Summary: WindowMaker libraries - development part
-Summary(es): Bibliotecas, archivos de inclusión, e etc. para desarrollar aplicaciones WindowMaker
+Summary(es): Bibliotecas y archivos de inclusión para WindowMaker
Summary(fr): Librairies de WindowMaker
Summary(pl): Biblioteki WindowMakera - czê¶æ dla programistów
Summary(pt_BR): Arquivos de inclusão e bibliotecas para o WindowMaker
Summary(uk): â¦Â̦ÏÔÅËÉ Ð¦ÄÔÒÉÍËÉ ÔÁ .h ÆÁÊÌÉ ÄÌÑ WindowMaker
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: XFree86-devel
-Requires: xft-devel
+Requires: xorg-lib-libXext-devel
+Requires: xorg-lib-libXft-devel
+Requires: xorg-lib-libXpm-devel
Obsoletes: libwraster2-devel
%description devel
ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÍÏÖÌÉ×ÏÓÔ¦ WindowMaker.
%prep
-%setup -q -a 1 -a 2 -n %{name}-CVS-20040723
+%setup -q -a 1 -a 2
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p0
+%patch12 -p0
for f in WindowMaker/*menu*; do
sed -i s,/usr/lib/GNUstep/,%{_libdir}/GNUstep/, $f
done
mv -f po/{no,nb}.po
-mv -f po/{zh_TW.Big5,zh_TW}.po
-mv -f WPrefs.app/po/{zh_TW.Big5,zh_TW}.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}
+# 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#;/' \
+%{__perl} -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#extension#;/' \
WindowMaker/Defaults/WMWindowAttributes.in
%configure \
CPP_PATH="/lib/cpp" \
LINGUAS="bg cs da de el es et fi fr gl hr hu it ja ko ms nb nl pl pt ro ru \
sk sv tr zh_CN zh_TW" \
+ --disable-debug \
--disable-rpath \
- --with-nlsdir=%{_datadir}/locale \
+ --enable-shared \
+ --enable-static \
+ --enable-usermenu \
--with-appspath=%{_libdir}/GNUstep/Apps \
+ --with-nlsdir=%{_datadir}/locale \
+ --with-gnustepdir=%{_libdir}/GNUstep \
--enable-sound \
--enable-gnome \
- --disable-debug \
- --enable-kde \
- --enable-shared \
- --enable-static \
- --enable-usermenu
+ --enable-kde
touch WindowMaker/Defaults/W*.in
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir},%{_wmpropsdir}} \
- $RPM_BUILD_ROOT/etc/sysconfig/wmstyle
+ $RPM_BUILD_ROOT/etc/sysconfig/wmstyle \
+ $RPM_BUILD_ROOT%{_datadir}/WindowMaker/{Sounds,SoundSets}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
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
%clean
rm -rf $RPM_BUILD_ROOT
-%post libs -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files -f %{name}.lang
%doc AUTHORS BUGFORM BUGS ChangeLog FAQ NEWS README
%dir %{_sysconfdir}/WindowMaker
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/WindowMaker/*
-
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/WindowMaker/*
%{_mandir}/man1/*
%lang(sk) %{_mandir}/sk/man1/*
%{_pixmapsdir}/*
%{_wmpropsdir}/WindowMaker.desktop
+%attr(755,root,root) %{_bindir}/convertfonts
%attr(755,root,root) %{_bindir}/bughint
%attr(755,root,root) %{_bindir}/geticonset
%attr(755,root,root) %{_bindir}/getstyle
%attr(755,root,root) %{_bindir}/seticons
%attr(755,root,root) %{_bindir}/setstyle
-%attr(755,root,root) %{_bindir}/wcopy
%attr(755,root,root) %{_bindir}/wdwrite
%attr(755,root,root) %{_bindir}/wdread
%attr(755,root,root) %{_bindir}/wkdemenu.pl
%attr(755,root,root) %{_bindir}/wmaker.inst
%attr(755,root,root) %{_bindir}/wmsetbg
%attr(755,root,root) %{_bindir}/wmsetup
-%attr(755,root,root) %{_bindir}/wmchlocale
-%attr(755,root,root) %{_bindir}/wpaste
-%attr(755,root,root) %{_bindir}/wsetfont
%attr(755,root,root) %{_bindir}/wxcopy
%attr(755,root,root) %{_bindir}/wxpaste
%attr(755,root,root) %{_bindir}/dockit
%{_datadir}/xsessions/WindowMaker.desktop
# the first one is shared with gnustep-make...
-%dir %{_libdir}/GNUstep
-%dir %{_libdir}/GNUstep/Apps
-%dir %{_libdir}/GNUstep/Apps/WPrefs.app
+%dir %{_libdir}/GNUstep/Applications
+%dir %{_libdir}/GNUstep/Applications/WPrefs.app
-%attr(755,root,root) %{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs
-%{_libdir}/GNUstep/Apps/WPrefs.app/tiff
-%{_libdir}/GNUstep/Apps/WPrefs.app/xpm
-%{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs.tiff
-%{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs.xpm
+%{_libdir}/GNUstep/Applications/WPrefs.app/tiff
+%{_libdir}/GNUstep/Applications/WPrefs.app/xpm
+%{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs.tiff
+%{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs.xpm
%files libs
%defattr(644,root,root,755)
projects / packages / WindowMaker.git / blobdiff