From 95624d68c615818c0e57e6a6bfbc870341688190 Mon Sep 17 00:00:00 2001 From: Tomasz Pala Date: Sat, 2 Mar 2002 22:49:16 +0000 Subject: [PATCH] - removed Requires: autoconf, libtool and some of *-devel (required by imlib-devel), - moved icons to %{_pixmapsdir}/icewm. Changed files: icewm.spec -> 1.83 --- icewm.spec | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/icewm.spec b/icewm.spec index 1c231ce..9853b88 100644 --- a/icewm.spec +++ b/icewm.spec @@ -20,17 +20,10 @@ Patch0: %{name}-DESTDIR.patch Patch1: %{name}-menu.patch URL: http://www.icewm.org/ BuildRequires: XFree86-devel -BuildRequires: autoconf -BuildRequires: libtool 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: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -72,7 +65,7 @@ win95 %patch1 -p1 cd lib/icons -tar -xvf %{SOURCE3} +tar -zxf %{SOURCE3} cd ../../ %build @@ -86,15 +79,14 @@ export LDFLAGS --enable-xfreetype \ --with-gnome-menus \ --with-imlib - %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_wmstyledir},%{_applnkdir}/Settings/IceWM,%{_wmpropsdir}} +install -d $RPM_BUILD_ROOT{%{_wmstyledir},%{_pixmapsdir}/icewm} \ + $RPM_BUILD_ROOT{%{_applnkdir}/Settings/IceWM,%{_wmpropsdir}} -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT +%{__make} install DESTDIR=$RPM_BUILD_ROOT install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir} install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Settings/IceWM/.directory @@ -106,10 +98,9 @@ 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 -#ln -s %{_pixmapsdir}/icewm $RPM_BUILD_ROOT%{_libdir}/X11/icewm/icons +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 @@ -127,6 +118,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_applnkdir}/Settings/IceWM %{_applnkdir}/Settings/IceWM/.directory %{_wmpropsdir}/* +%{_pixmapsdir}/icewm %dir %{_libdir}/X11/icewm %{_libdir}/X11/icewm/icons %{_libdir}/X11/icewm/ledclock -- 2.44.0