- 0.91.0

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 55e509619a14f013476531e1b8054d0bb3a52a16..9564c457ceb64bfda8734f4f57d274916204cf65 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,5 +1,4 @@
 %define                extraver        0.1
-%define                _snap           20040321
 
 Summary:       NeXT-alike window manager
 Summary(es):   Administrador de Ventanas parecido con el NeXT
@@ -9,53 +8,45 @@ Summary(pt_BR):       Gerente de Janelas parecido com o NeXT
 Summary(ru):   WindowMaker - ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):   WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          WindowMaker
-Version:       0.81.0
-Release:       0.%{_snap}.1
+Version:       0.91.0
+Release:       1
 License:       GPL
 Group:         X11/Window Managers
-Source0:       ftp://ftp.windowmaker.org/pub/source/snapshots/%{name}-CVS-%{_snap}.tar.gz
-# Source0-md5: ecbd8f1cee5e2ad1adb99baadb142169
+Source0:       ftp://ftp.windowmaker.org/pub/source/release/%{name}-%{version}.tar.gz
+# Source0-md5: be07953e905d1e42fe7a65ac2193a5f9
 Source1:       ftp://windowmaker.org/pub/%{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
-Source4:       %{name}.RunWM
-Source5:       %{name}.wm_style
 Source6:       %{name}-xsession.desktop
 Patch0:                %{name}-CFLAGS.patch
-Patch1:                %{name}-wmconfig.patch
+Patch1:                %{name}-vfmg.patch
 Patch2:                %{name}-pixmaps.patch
 Patch3:                %{name}-shared.patch
-Patch4:                %{name}-areas.patch
-Patch5:                %{name}-IconPosition.patch
-Patch6:                %{name}-singleclick.patch
-Patch7:                %{name}-plmenu.patch
-Patch8:                %{name}-dockit.patch
-Patch9:                %{name}-po.patch
-Patch10:       %{name}-rxvt.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}-CVS-before-xft2.patch
+Patch4:                %{name}-IconPosition.patch
+Patch5:                %{name}-singleclick.patch
+Patch6:                %{name}-plmenu.patch
+Patch7:                %{name}-dockit.patch
+Patch8:                %{name}-pl.po-update.patch
+Patch9:                http://www.heily.com/mark/code_samples/appicon_captions_maxprotect.diff
+Patch10:       %{name}-localenames.patch
 URL:           http://www.windowmaker.org/
-BuildRequires: Hermes-devel
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libtool
 BuildRequires: gettext-devel
-BuildRequires: libpng >= 1.0.8
+BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: libjpeg-devel >= 6b
 BuildRequires: libtiff-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 1:1.4.2-9
 BuildRequires: libungif-devel
-Requires:      %{name}-libs = %{version}
+BuildRequires: xft-devel
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      cpp
 Requires:      tk
-Requires:      wmconfig >= 0.9.9-5
-Requires:      xinitrc >= 3.0
+Requires:      vfmg
+Requires:      xinitrc-ng
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/X11
@@ -154,7 +145,9 @@ Summary(pt_BR):     Arquivos de inclus
 Summary(ru):   âÉÂÌÉÏÔÅËÉ ÐÏÄÄÅÒÖËÉ É .h ÆÁÊÌÙ ÄÌÑ WindowMaker
 Summary(uk):   â¦Â̦ÏÔÅËÉ Ð¦ÄÔÒÉÍËÉ ÔÁ .h ÆÁÊÌÉ ÄÌÑ WindowMaker
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      XFree86-devel
+Requires:      xft-devel
 Obsoletes:     libwraster2-devel
 
 %description devel
@@ -193,7 +186,7 @@ Summary(ru):        
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ Ð¦ÄÔÒÉÍËÉ ÄÌÑ WindowMaker
 Group:         Development/Libraries
 Summary(pt_BR):        Componentes estáticos de desenvolvimento para o WindowMaker
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 This package contains static libraries for building
@@ -216,7 +209,7 @@ utilizando componentes est
 ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÍÏÖÌÉ×ÏÓÔ¦ WindowMaker.
 
 %prep
-%setup -q -a 1 -a 2 -n %{name}-CVS-%{_snap}
+%setup -q -a 1 -a 2
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -228,26 +221,26 @@ utilizando componentes est
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
 
 for f in WindowMaker/*menu*; do
-       sed s,/usr/local/GNUstep/,%{_libdir}/GNUstep/, $f >$f.new
-       mv -f $f.new $f
+       sed -i s,/usr/lib/GNUstep/,%{_libdir}/GNUstep/, $f
+       sed -i s,/usr/local/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
 %{__libtoolize}
 %{__aclocal}
-%{__autoconf}
+%{__autoheader}
 %{__automake}
+%{__autoconf}
 cd %{name}-extra-%{extraver}
        %{__libtoolize}
        %{__aclocal}
@@ -271,7 +264,7 @@ perl -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#e
        --enable-kde \
        --enable-shared \
        --enable-static \
-       --enable-usermenu
+       --enable-usermenu \
 
 touch WindowMaker/Defaults/W*.in
 
@@ -301,8 +294,6 @@ install contrib/dockit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir}
 
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/wmaker.sh
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/wmaker.names
 install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
 
 cd %{name}-extra-%{extraver}
@@ -315,7 +306,7 @@ cd ..
 %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
@@ -325,21 +316,18 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/WindowMaker
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/WindowMaker/*
 
-%attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
-/etc/sysconfig/wmstyle/*.names
-
 %{_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
@@ -349,9 +337,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -378,12 +363,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
 %attr(755,root,root) %{_bindir}/get-wings-flags
 %attr(755,root,root) %{_bindir}/get-wraster-flags
 %attr(755,root,root) %{_bindir}/get-wutil-flags
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_includedir}/*
+%{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)