- added /etc/X11/icewm dir to the package contents,

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index 3a1c3d4def123391e19df1cf9760cd0b1566c1c1..63411b59aa8484c62ac846dc75b9268c28beac56 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.9
-Release:       1
+Release:       4
 License:       LGPL
 Group:         X11/Window Managers
 Group(de):     X11/Fenstermanager
@@ -18,6 +18,8 @@ Source0:      ftp://download.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}
 Source1:       IceWM.desktop
 Source2:       %{name}.directory
 Source3:       ftp://download.sourceforge.net/pub/sourceforge/icewm/iceicons-0.6.tar.gz
+Source4:       IceWM.RunWM
+Source5:       IceWM.wm_style
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-menu.patch
 URL:           http://www.icewm.org/
@@ -36,7 +38,8 @@ BuildRequires:        zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
-%define                _sysconfdir     /etc/X11/icewm/
+%define                _sysconfdir     /etc/X11/icewm
+%define                _wmstyledir     /etc/sysconfig/wmstyle
 %define                _wmpropsdir     %{_datadir}/wm-properties
 
 %description
@@ -61,14 +64,13 @@ Group(pl):  Motywy
 Requires:      icewm
 
 %description themes-base
-Standard pack of themes delivered with icewm.
-All of them made by Marko Macek:
-gtk2, metal2, motif, nice, warp3, warp4, win95
+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 IceWM'a, dostarczany wraz nim.
-Wszystkie stworzone przez Marko Macek:
-gtk2, metal2, motif, nice, warp3, warp4, win95
+Wszystkie stworzone przez Marko Macek: gtk2, metal2, motif, nice,
+warp3, warp4, win95
 
 %prep -q
 %setup -q
@@ -82,24 +84,26 @@ cd ../../
 %build
 export LDFLAGS
 %configure \
-       --with-shape \
        --prefix=%{_prefix} \
-       --with-docdir=/usr/share/doc \
        --with-cfgdir=%{_sysconfdir} \
-       --with-sm \
-       --with-imlib \
+       --with-docdir=%{_docdir} \
        --with-gnome \
        --with-gnome-menus \
        --with-i18n \
-       --enable-nls \
+       --with-imlib \
+       --with-shape \
+       --with-sm \
+       --enable-antialiasing \
+       --enable-gradients \
        --enable-guievents \
-       --with-imlib
+       --enable-nls \
+       --enable-xfreetype 
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_wmpropsdir},%{_applnkdir}/Settings/IceWM}
+install -d $RPM_BUILD_ROOT{%{_wmstyledir},%{_applnkdir}/Settings/IceWM,%{_wmpropsdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -109,8 +113,11 @@ install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Settings/IceWM/.directory
 install lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/keys
 install lib/menu $RPM_BUILD_ROOT%{_sysconfdir}/menu
 install lib/preferences $RPM_BUILD_ROOT%{_sysconfdir}/preferences
-install lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}toolbar
+install lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}/toolbar
 install lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/winoptions
+install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/IceWM.sh
+install %{SOURCE5} $RPM_BUILD_ROOT%{_wmstyledir}/IceWM.names
+
 
 #mv -f %{_libdir}/X11/icewm/icons/* %{_pixmapsdir}/icewm/
 #rm -rf %{_libdir}/X11/icewm/icons
@@ -127,6 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc *.gz doc/*.*ml
 %attr(755,root,root) %{_bindir}/*
+%dir %{_sysconfdir}
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/*
 %dir %{_applnkdir}/Settings/IceWM
 %{_applnkdir}/Settings/IceWM/.directory
@@ -138,6 +146,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/X11/icewm/taskbar
 %dir %{_libdir}/X11/icewm/themes
 %{_libdir}/X11/icewm/themes/Infadel2
+%attr(755,root,root) %{_wmstyledir}/IceWM.sh
+%attr(644,root,root) %{_wmstyledir}/IceWM.names
 
 %files themes-base
 %defattr(644,root,root,755)