- rel 19; fix build

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 63d0d46d0c01a6d2a78e2331eb12bd2a46cfbf39..da5ecfda6dc3665ed9f5b5226bc5a3fa35eab102 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_with    gnome           # build with support for GNOME2 wm-properties
+%bcond_with    gnome2          # build with support for GNOME2 wm-properties
 #
 %define                extraver        0.1
 Summary:       NeXT-alike window manager
@@ -12,7 +12,7 @@ Summary(ru.UTF-8):    WindowMaker - оконный менеджер для X11
 Summary(uk.UTF-8):     WindowMaker - віконний менеджер для X11
 Name:          WindowMaker
 Version:       0.92.0
-Release:       14
+Release:       19
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://windowmaker.info/pub/source/release/%{name}-%{version}.tar.gz
@@ -38,6 +38,8 @@ 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
@@ -241,6 +243,8 @@ utilizando componentes estáticos (raramente necessário).
 %patch12 -p0
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 for f in WindowMaker/*menu*; do
        %{__sed} -i s,/GNUstep/Apps,/GNUstep/Applications, $f
@@ -314,8 +318,8 @@ install contrib/dockit   $RPM_BUILD_ROOT%{_bindir}
 install contrib/dockit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 install WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_pixmapsdir}
-#%{?with_gnome:install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir}}
-%{?with_gnome:%{__sed} s,@LIBDIR@,%{_libdir}, %{SOURCE3} > $RPM_BUILD_ROOT%{_wmpropsdir}/WindowMaker.desktop}
+#%{?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
@@ -344,7 +348,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sk) %{_mandir}/sk/man1/*.1*
 
 %{_pixmapsdir}/*.xpm
-%{?with_gnome:%{_wmpropsdir}/WindowMaker.desktop}
+%{?with_gnome2:%{_wmpropsdir}/WindowMaker.desktop}
 
 %attr(755,root,root) %{_bindir}/convertfonts
 %attr(755,root,root) %{_bindir}/bughint
@@ -367,7 +371,6 @@ 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