- upgraded to 1.2.0pre2

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index 1275d3bb8e0c047099582fe1a9538484c9dd48fb..38cd8c8dc4cf26db5e0e6c80e773f7558aff9be0 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -6,18 +6,18 @@
 Summary:       IceWM X11 Window Manager
 Summary(pl):   IceWM - mened¿er okienek X11
 Name:          icewm
-Version:       1.0.9
-Release:       7
+Version:       1.2.0pre2
+Release:       1
 License:       LGPL
 Group:         X11/Window Managers
-Source0:       ftp://download.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}-2.tar.bz2
+Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}.tar.gz
 Source1:       IceWM.desktop
 Source2:       %{name}.directory
-Source3:       ftp://download.sourceforge.net/pub/sourceforge/icewm/iceicons-0.6.tar.gz
+Source3:       ftp://ftp.sourceforge.net/pub/sourceforge/icewm/iceicons-0.6.tar.gz
 Source4:       IceWM.RunWM
 Source5:       IceWM.wm_style
 Source6:       %{name}-menu
-Patch0:                %{name}-DESTDIR.patch
+Source7:       ftp://ftp.sourceforge.net/pub/sourceforge/icewm/netscapeicons-0.2.tar.gz
 URL:           http://www.icewm.org/
 BuildRequires: XFree86-devel
 BuildRequires: gnome-libs-devel
@@ -28,7 +28,6 @@ Requires(pre):        sh-utils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
-%define                _sysconfdir     /etc/X11/icewm
 %define                _wmstyledir     /etc/sysconfig/wmstyle
 %define                _wmpropsdir     %{_datadir}/wm-properties
 
@@ -47,7 +46,7 @@ Jest przy tym ma
 
 %package themes-base
 Summary:       Pack of themes for IceWM
-Summary(pl):   Zestaw tematów dla IceWM
+Summary(pl):   Zestaw tematów dla IceWM-a
 Group:         Themes
 Requires:      icewm
 
@@ -56,23 +55,21 @@ Standard pack of themes delivered with IceWM. All of them made by
 Marko Macek: gtk2, metal2, motif, nice, warp3, warp4, win95.
 
 %description themes-base -l pl
-Standardowy zestaw tematów dla IceWMa, dostarczany wraz z nim.
-Wszystkie stworzone przez Marko Macek: gtk2, metal2, motif, nice,
+Standardowy zestaw tematów dla IceWM-a, dostarczany wraz z nim.
+Wszystkie stworzone przez Marko Macka: gtk2, metal2, motif, nice,
 warp3, warp4, win95.
 
-%prep -q
+%prep
 %setup -q
-%patch0 -p1
 
 cd lib/icons
-tar -zxf %{SOURCE3}
+tar -xzf %{SOURCE3}
+tar -xzf %{SOURCE7}
 cd ../..
 
 %build
 export LDFLAGS
 %configure \
-       --prefix=%{_prefix} \
-       --with-cfgdir=%{_sysconfdir} \
        --with-docdir=%{_docdir} \
        --enable-i18n \
        --enable-guievents \
@@ -83,7 +80,7 @@ export LDFLAGS
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_wmstyledir},%{_pixmapsdir}/icewm} \
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_wmstyledir}} \
        $RPM_BUILD_ROOT{%{_applnkdir}/Settings/IceWM,%{_wmpropsdir}}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
@@ -92,17 +89,13 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Settings/IceWM/.directory
 install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/IceWM.sh
 install %{SOURCE5} $RPM_BUILD_ROOT%{_wmstyledir}/IceWM.names
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/menu
-install lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/keys
-install lib/preferences $RPM_BUILD_ROOT%{_sysconfdir}/preferences
-install lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}/toolbar
-install lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/winoptions
+install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/menu
+install lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/keys
+install lib/preferences $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/preferences
+install lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/toolbar
+install lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/winoptions
 
-mv -f $RPM_BUILD_ROOT%{_libdir}/X11/icewm/icons/* $RPM_BUILD_ROOT%{_pixmapsdir}/icewm
-rm -rf $RPM_BUILD_ROOT%{_libdir}/X11/icewm/icons
-ln -s %{_pixmapsdir}/icewm $RPM_BUILD_ROOT%{_libdir}/X11/icewm/icons
-
-gzip -9nf BUGS CHANGES FAQ PLATFORMS README* TODO icewm.lsm
+ln -s %{_libdir}/X11/icewm/icons $RPM_BUILD_ROOT%{_pixmapsdir}/icewm
 
 %find_lang %{name}
 
@@ -110,17 +103,14 @@ gzip -9nf BUGS CHANGES FAQ PLATFORMS README* TODO icewm.lsm
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-test -h %{_libdir}/X11/icewm/icons || rm -rf %{_libdir}/X11/icewm/icons
+test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc *.gz doc/*.*ml
+%doc AUTHORS BUGS CHANGES FAQ PLATFORMS README* TODO icewm.lsm doc/*.html
 %attr(755,root,root) %{_bindir}/*
-%dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/*
-%dir %{_applnkdir}/Settings/IceWM
-%{_applnkdir}/Settings/IceWM/.directory
-%{_wmpropsdir}/*
+%dir %{_sysconfdir}/X11/icewm
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/icewm/*
 %{_pixmapsdir}/icewm
 %dir %{_libdir}/X11/icewm
 %{_libdir}/X11/icewm/icons
@@ -129,6 +119,9 @@ test -h %{_libdir}/X11/icewm/icons || rm -rf %{_libdir}/X11/icewm/icons
 %{_libdir}/X11/icewm/taskbar
 %dir %{_libdir}/X11/icewm/themes
 %{_libdir}/X11/icewm/themes/Infadel2
+%dir %{_applnkdir}/Settings/IceWM
+%{_applnkdir}/Settings/IceWM/.directory
+%{_wmpropsdir}/*
 %attr(755,root,root) %{_wmstyledir}/IceWM.sh
 %attr(644,root,root) %{_wmstyledir}/IceWM.names