- release 7.

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index c6ce72f069a96539883e72709ef2099220690462..27d137b196b4fce94bbdb14dbca5480dbb37cb9f 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -7,7 +7,7 @@ Summary:        IceWM X11 Window Manager
 Summary(pl):   IceWM - Mened¿er okienek X11
 Name:          icewm
 Version:       1.0.8
-Release:       4
+Release:       7
 License:       LGPL
 Group:         X11/Window Managers
 Group(es):     X11/Administraadores De Ventanas
@@ -16,20 +16,22 @@ Group(pl):  X11/Zarz
 Source0:       ftp://download.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}-6.tar.bz2
 Source1:       IceWM.desktop
 Source2:       %{name}.directory
+Source3:       ftp://download.sourceforge.net/pub/sourceforge/icewm/iceicons-0.6.tar.gz
 Patch0:                icewm-DESTDIR.patch
 Patch1:                %{name}-time.patch
 Patch2:                %{name}-menu.patch
 URL:           http://www.icewm.org/
+BuildRequires: XFree86-devel
 BuildRequires: autoconf
+BuildRequires: esound-devel
+BuildRequires: gnome-libs-devel
 BuildRequires: imlib-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng >= 1.0.8
+BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libungif-devel
-BuildRequires: XFree86-devel
 BuildRequires: zlib-devel
-BuildRequires: gnome-libs-devel
-BuildRequires: libstdc++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
@@ -49,22 +51,22 @@ powy
 roboczych, paski narzêdziowe, status skrzynki z poczt±, cyfrowy zegar.
 Jest przy tym ma³y i szybki.
 
-%package -n %{name}-themes-base
-Summary:        Pack of themes for icewm
-Summary(pl):    Zestaw tematów dla icewm
+%package themes-base
+Summary:       Pack of themes for icewm
+Summary(pl):   Zestaw tematów dla icewm
 Group:         Themes
 Group(de):     Themen
 Group(pl):     Motywy
 Requires:      icewm
 
-%description -n %{name}-themes-base
+%description themes-base
 Standard pack of themes delivered with icewm.
 All of them made by Marko Macek:
 gtk2, metal2, motif, nice, warp3, warp4, win95
 
-%description -n %{name}-themes-base -l pl
+%description themes-base -l pl
 Standardowy zestaw tematów dla IceWM'a, dostarczany wraz nim.
-Wszystkie stwarzone przez Marko Macek:
+Wszystkie stworzone przez Marko Macek:
 gtk2, metal2, motif, nice, warp3, warp4, win95
 
 %prep -q
@@ -73,8 +75,12 @@ gtk2, metal2, motif, nice, warp3, warp4, win95
 %patch1 -p1
 %patch2 -p1
 
+cd lib/icons
+tar -xvf %{SOURCE3}
+cd ../../
+
 %build
-autoconf
+%{__autoconf}
 %configure \
        --with-shape \
        --with-docdir=/usr/share/doc \
@@ -86,12 +92,12 @@ autoconf
        --with-i18n \
        --enable-nls \
        --enable-guievents \
-       --with-imlib 
+       --with-imlib
 
 %{__make}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 %{__install} -d $RPM_BUILD_ROOT{%{_wmpropsdir},%{_applnkdir}/Settings/IceWM}
 
 %{__make} install \
@@ -105,34 +111,35 @@ rm -rf $RPM_BUILD_ROOT
 %{__install} lib/preferences $RPM_BUILD_ROOT%{_sysconfdir}/preferences
 %{__install} lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/winoptions
 
-gzip -9nf README CHANGES TODO BUGS FAQ icewm.lsm PLATFORMS
+%{__gzip} -9nf BUGS CHANGES FAQ PLATFORMS README TODO icewm.lsm
 
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %doc *.gz doc/*.*ml
 %attr(755,root,root) %{_bindir}/*
-%attr(644,root,root)
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/*
 %dir %{_applnkdir}/Settings/IceWM
 %{_applnkdir}/Settings/IceWM/.directory
 %{_wmpropsdir}/*
 %dir %{_libdir}/X11/icewm
-%{_libdir}/X11/icewm/icons/*
-%{_libdir}/X11/icewm/ledclock/*
-%{_libdir}/X11/icewm/mailbox/*
-%{_libdir}/X11/icewm/taskbar/*
-%{_libdir}/X11/icewm/themes/Infadel2/*
-
-%files -n %{name}-themes-base
-%{_libdir}/X11/icewm/themes/gtk2/*
-%{_libdir}/X11/icewm/themes/metal2/*
-%{_libdir}/X11/icewm/themes/motif/*
-%{_libdir}/X11/icewm/themes/nice/*
-%{_libdir}/X11/icewm/themes/warp3/*
-%{_libdir}/X11/icewm/themes/warp4/*
-%{_libdir}/X11/icewm/themes/win95/*
+%{_libdir}/X11/icewm/icons
+%{_libdir}/X11/icewm/ledclock
+%{_libdir}/X11/icewm/mailbox
+%{_libdir}/X11/icewm/taskbar
+%dir %{_libdir}/X11/icewm/themes
+%{_libdir}/X11/icewm/themes/Infadel2
+
+%files themes-base
+%defattr(644,root,root,755)
+%{_libdir}/X11/icewm/themes/gtk2
+%{_libdir}/X11/icewm/themes/metal2
+%{_libdir}/X11/icewm/themes/motif
+%{_libdir}/X11/icewm/themes/nice
+%{_libdir}/X11/icewm/themes/warp3
+%{_libdir}/X11/icewm/themes/warp4
+%{_libdir}/X11/icewm/themes/win95