- rel 19; fix build

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index cce6c164f907557123fc8661b3af98d8f59d81d1..da5ecfda6dc3665ed9f5b5226bc5a3fa35eab102 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,5 +1,8 @@
+#
+# Conditional build:
+%bcond_with    gnome2          # build with support for GNOME2 wm-properties
+#
 %define                extraver        0.1
-
 Summary:       NeXT-alike window manager
 Summary(es.UTF-8):     Administrador de Ventanas parecido con el NeXT
 Summary(fr.UTF-8):     Gestionnaire de fenêtres avec le look NeXT
@@ -9,7 +12,7 @@ Summary(ru.UTF-8):     WindowMaker - оконный менеджер для X11
 Summary(uk.UTF-8):     WindowMaker - віконний менеджер для X11
 Name:          WindowMaker
 Version:       0.92.0
-Release:       8
+Release:       19
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://windowmaker.info/pub/source/release/%{name}-%{version}.tar.gz
@@ -33,20 +36,28 @@ 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
+Patch13:       %{name}-wine.patch
+Patch14:       %{name}-libpng14.patch
+Patch15:       %{name}-libpng15.patch
+Patch16:       %{name}-format.patch
 URL:           http://www.windowmaker.info/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: giflib-devel
 BuildRequires: libjpeg-devel >= 6b
-BuildRequires: libpng-devel >= 1.0.8
+BuildRequires: libpng-devel >= 2:1.4.0
 BuildRequires: libtiff-devel
 BuildRequires: libtool >= 1:1.4.2-9
 BuildRequires: perl-base
+BuildRequires: pkgconfig
+BuildRequires: sed >= 4.0
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXft-devel
+BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXpm-devel
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      Esetroot
 Requires:      cpp >= 6:4.0.0
 Requires:      gnustep-dirs
 Requires:      tk
@@ -230,13 +241,18 @@ utilizando componentes estáticos (raramente necessário).
 %patch10 -p1
 %patch11 -p1
 %patch12 -p0
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 for f in WindowMaker/*menu*; do
-       sed -i s,/usr/lib/GNUstep/,%{_libdir}/GNUstep/, $f
-       sed -i s,/usr/local/GNUstep/,%{_libdir}/GNUstep/, $f
+       %{__sed} -i s,/GNUstep/Apps,/GNUstep/Applications, $f
+       %{__sed} -i s,%{_libdir}/GNUstep/,%{_libdir}/GNUstep/, $f
+       %{__sed} -i s,%{_prefix}/local/GNUstep/,%{_libdir}/GNUstep/, $f
 done
 
-mv -f po/{no,nb}.po
+%{__mv} po/{no,nb}.po
 
 %build
 #%ifarch %{x8664}
@@ -266,8 +282,9 @@ cd ..
        --disable-rpath \
        --enable-shared \
        --enable-static \
+       --enable-xinerama \
        --enable-usermenu \
-       --with-appspath=%{_libdir}/GNUstep/Apps \
+       --with-appspath=%{_libdir}/GNUstep/Applications \
        --with-nlsdir=%{_datadir}/locale \
        --with-gnustepdir=%{_libdir}/GNUstep \
        --enable-sound \
@@ -276,7 +293,7 @@ cd ..
 
 touch WindowMaker/Defaults/W*.in
 
-%{__make} \
+%{__make} -j1 \
        CFLAGS="%{rpmcflags}" \
        LDFLAGS="%{rpmldflags}"
 
@@ -301,13 +318,17 @@ install contrib/dockit   $RPM_BUILD_ROOT%{_bindir}
 install contrib/dockit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 install WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir}
+#%{?with_gnome2:install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir}}
+%{?with_gnome2:%{__sed} s,@LIBDIR@,%{_libdir}, %{SOURCE3} > $RPM_BUILD_ROOT%{_wmpropsdir}/WindowMaker.desktop}
 
 install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
+#%{__sed} s,@LIBDIR@,%{_libdir}, %{SOURCE6} > $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
 
 %{__make} -C %{name}-extra-%{extraver} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
 %find_lang %{name} --all-name
 
 %clean
@@ -323,29 +344,21 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/WindowMaker
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/WindowMaker/*
 
-%{_mandir}/man1/*
-%lang(sk) %{_mandir}/sk/man1/*
+%{_mandir}/man1/*.1*
+%lang(sk) %{_mandir}/sk/man1/*.1*
 
-%{_pixmapsdir}/*
-%{_wmpropsdir}/WindowMaker.desktop
+%{_pixmapsdir}/*.xpm
+%{?with_gnome2:%{_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}/wdwrite
-%attr(755,root,root) %{_bindir}/wdread
+%attr(755,root,root) %{_bindir}/set*
+%attr(755,root,root) %{_bindir}/wd*
 %attr(755,root,root) %{_bindir}/wkdemenu.pl
-%attr(755,root,root) %{_bindir}/wm-oldmenu2new
-%attr(755,root,root) %{_bindir}/wmagnify
-%attr(755,root,root) %{_bindir}/wmaker
-%attr(755,root,root) %{_bindir}/wmaker.inst
-%attr(755,root,root) %{_bindir}/wmsetbg
-%attr(755,root,root) %{_bindir}/wmsetup
-%attr(755,root,root) %{_bindir}/wxcopy
-%attr(755,root,root) %{_bindir}/wxpaste
+%attr(755,root,root) %{_bindir}/wm*
+%attr(755,root,root) %{_bindir}/wx*
 %attr(755,root,root) %{_bindir}/dockit
 
 %{_datadir}/WindowMaker
@@ -358,13 +371,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs
 
 %{_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)
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libExtraWINGs.so.0
+%attr(755,root,root) %ghost %{_libdir}/libWINGs.so.0
+%attr(755,root,root) %ghost %{_libdir}/libWMaker.so.0
+%attr(755,root,root) %ghost %{_libdir}/libWUtil.so.0
+%attr(755,root,root) %ghost %{_libdir}/libwraster.so.3
 %{_datadir}/WINGs
 
 %files devel
@@ -373,7 +390,6 @@ rm -rf $RPM_BUILD_ROOT
 %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