- removed redundant rpm macros,

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index e25ccb008492a714f64916ed00639815e1ace6a1..6abb2a2398a8ed132016dcbfae61ea955b4c255d 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:       6
+Release:       8
 License:       LGPL
 Group:         X11/Window Managers
 Group(es):     X11/Administraadores De Ventanas
@@ -20,6 +20,8 @@ Source3:      ftp://download.sourceforge.net/pub/sourceforge/icewm/iceicons-0.6.tar.g
 Patch0:                icewm-DESTDIR.patch
 Patch1:                %{name}-time.patch
 Patch2:                %{name}-menu.patch
+Patch3:                %{name}-env_var_in_menu_prog_line.patch
+Patch4:                %{name}-config.patch
 URL:           http://www.icewm.org/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
@@ -74,15 +76,20 @@ gtk2, metal2, motif, nice, warp3, warp4, win95
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+#%patch3 -p1
+#%patch4 -p1
 
 cd lib/icons
 tar -xvf %{SOURCE3}
 cd ../../
 
 %build
-%{__autoconf}
-%configure \
+export LDFLAGS
+libtoolize --copy --force
+autoconf
+%configure2_13 \
        --with-shape \
+       --prefix=%{_prefix} \
        --with-docdir=/usr/share/doc \
        --with-cfgdir=%{_sysconfdir} \
        --with-sm \
@@ -97,26 +104,30 @@ cd ../../
 %{__make}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__install} -d $RPM_BUILD_ROOT{%{_wmpropsdir},%{_applnkdir}/Settings/IceWM}
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_wmpropsdir},%{_applnkdir}/Settings/IceWM}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__install} %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
-%{__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/toolbar $RPM_BUILD_ROOT%{_sysconfdir}toolbar
-%{__install} lib/preferences $RPM_BUILD_ROOT%{_sysconfdir}/preferences
-%{__install} lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/winoptions
+install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
+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/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/winoptions
 
-%{__gzip} -9nf BUGS CHANGES FAQ PLATFORMS README TODO icewm.lsm
+#mv -f %{_libdir}/X11/icewm/icons/* %{_pixmapsdir}/icewm/
+#rm -rf %{_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
 
 %find_lang %{name}
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)