- many small fixes, mostly inpired by kloczek

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 5b2dd8b9a70a24a9d03d0846dc5b20f6a960c990..9e982c221d6be1a590be5c20c361922418fd1112 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -9,12 +9,15 @@ Summary(ru):  WindowMaker - 
 Summary(uk):   WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          WindowMaker
 Version:       0.80.2
-Release:       3
+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
@@ -31,7 +34,10 @@ 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
 URL:           http://www.windowmaker.org/
+BuildRequires: Hermes-devel
+BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -40,19 +46,15 @@ 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)
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
 %define                _sysconfdir     /etc/X11
-%define                _wmpropsdir     %{_datadir}/wm-properties
+%define                _wmpropsdir     /usr/share/wm-properties
 
 %description
 Window Maker is an X11 window manager which emulates the look and feel
@@ -193,8 +195,8 @@ This package contains static libraries for building
 WindowMaker-enhanced applications.
 
 %description static -l pl
-Ten pakiet zawiera statyczne biblioteki niezbêdne do tworzenia
-aplikacji wykorzystuj±cych mo¿liwo¶ci zarz±dcy okien WindowMaker.
+Ten pakiet zawiera statyczne biblioteki do tworzenia aplikacji
+wykorzystuj±cych mo¿liwo¶ci zarz±dcy okien WindowMaker.
 
 %description static -l pt_BR
 Instale este pacote se você deseja desenvolver para o WindowMaker,
@@ -223,6 +225,7 @@ utilizando componentes est
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 for f in WindowMaker/*menu*; do
        sed s,/usr/local/GNUstep/,/usr/X11R6/lib/GNUstep/, $f >$f.new
@@ -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,17 +299,18 @@ 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
 
-%post   libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS BUGFORM BUGS ChangeLog FAQ NEWS README
@@ -366,7 +370,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
+%{_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