- patch updated

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index 0565ca2ff2b8018d972329cc5a8d292aa577fdd7..39710536f72358287f451c29b47312c446eb99ad 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,15 +1,16 @@
 Summary:       IceWM X11 Window Manager
 Summary(pl):   IceWM - Mened¿er okienek X11
 Name:          icewm
-Version:       1.0.7
+Version:       1.0.8
 Release:       1
 License:       GPL
 Group:         X11/Window Managers
 Group(es):     X11/Administraadores De Ventanas
 Group(fr):     X11/Gestionnaires De Fenêtres
 Group(pl):     X11/Zarz±dcy Okien
-Source0:       ftp://download.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}-7.tar.bz2
+Source0:       ftp://download.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}-4.tar.bz2
 Source1:       IceWM.desktop
+Source2:       %{name}.directory
 Patch0:                icewm-DESTDIR.patch
 Patch1:                %{name}-time.patch
 URL:           http://www.icewm.org/
@@ -26,7 +27,8 @@ BuildRequires:        libstdc++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
-%define                _sysconfdir     /etc/X11/icewm
+%define                _sysconfdir     /etc
+%define                _wmpropsdir     %{_datadir}/wm-properties
 
 %description
 Window Manager for X Window System. Can emulate the look of
@@ -57,23 +59,25 @@ autoconf
        --with-i18n \
        --enable-nls \
        --enable-guievents \
-       --with-imlib
+       --with-imlib 
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
+%{__install} -d $RPM_BUILD_ROOT%{_wmpropsdir}
+%{__install} -d $RPM_BUILD_ROOT%{_prefix}/share/applnk/Settings/IceWM
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
-install lib/keys $RPM_BUILD_ROOT/etc/X11/icewm/keys
-install lib/menu $RPM_BUILD_ROOT/etc/X11/icewm/menu
-install lib/toolbar $RPM_BUILD_ROOT/etc/X11/icewm/toolbar
-install lib/preferences $RPM_BUILD_ROOT/etc/X11/icewm/preferences
-install lib/winoptions $RPM_BUILD_ROOT/etc/X11/icewm/winoptions
+%{__install} %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
+%{__install} %{SOURCE2} $RPM_BUILD_ROOT%{_prefix}/share/applnk/Settings/IceWM/.directory
+%{__install} lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/keys
+%{__install} lib/menu $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/menu
+%{__install} lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/toolbar
+%{__install} lib/preferences $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/preferences
+%{__install} lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/winoptions
 
 gzip -9nf README CHANGES TODO BUGS
 
@@ -83,10 +87,13 @@ gzip -9nf README CHANGES TODO BUGS
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%config(noreplace) %verify(not md5 mtime size) /etc/X11/icewm/*
 %defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %doc {README,CHANGES,TODO,BUGS}.gz doc/*.html
 %attr(755,root,root) %{_bindir}/*
-%dir %{_sysconfdir}
-%{_libdir}/X11/icewm
-%{_datadir}/gnome/wm-properties/*
+%attr(644,root,root)
+%dir %{_prefix}/share/applnk/Settings/IceWM
+%{_prefix}/share/applnk/Settings/IceWM/.directory
+%dir %{_libdir}/X11/icewm
+%{_libdir}/X11/icewm/*
+%{_wmpropsdir}/*