- many small fixes, mostly inpired by kloczek

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 87d1dbe11f25a77281b8fdf73ed1e23b28f3fc11..9e982c221d6be1a590be5c20c361922418fd1112 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -13,8 +13,11 @@ Release:     4
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://ftp.windowmaker.org/pub/source/release/%{name}-%{version}.tar.bz2
+# Source0-md5: 9f4fabc8831af6c58edf8708ee90126f
 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
@@ -33,6 +36,8 @@ Patch11:      %{name}-pl.po-update.patch
 Patch12:       %{name}-wmchlocale-fixes.patch
 Patch13:       http://www.heily.com/mark/code_samples/appicon_captions_maxprotect.diff
 URL:           http://www.windowmaker.org/
+BuildRequires: Hermes-devel
+BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -41,12 +46,10 @@ BuildRequires:      libpng >= 1.0.8
 BuildRequires: libjpeg-devel >= 6b
 BuildRequires: libtiff-devel
 BuildRequires: libungif-devel
-BuildRequires: Hermes-devel
-BuildRequires: XFree86-devel
-Requires:      wmconfig >= 0.9.9-5
-Requires:      cpp
 Requires:      %{name}-libs = %{version}
+Requires:      cpp
 Requires:      tk
+Requires:      wmconfig >= 0.9.9-5
 Requires:      xinitrc >= 3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -236,10 +239,10 @@ rm -f {,%{name}-extra-%{extraver}/}missing
 %{__autoconf}
 %{__automake}
 cd %{name}-extra-%{extraver}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
+       %{__libtoolize}
+       %{__aclocal}
+       %{__autoconf}
+       %{__automake}
 cd ..
 
 perl -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#extension#;/' \
@@ -296,7 +299,8 @@ install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.sh
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.names
 
 cd %{name}-extra-%{extraver}
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 cd ..
 
 %find_lang %{name} --all-name