- removed redundant rpm macros,

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index 36b09be63de1bda72b0f9caef8c6491983e567bb..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:       5
+Release:       8
 License:       LGPL
 Group:         X11/Window Managers
 Group(es):     X11/Administraadores De Ventanas
@@ -16,20 +16,24 @@ Group(pl):  X11/Zarz
 Source0:       ftp://download.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}-6.tar.bz2
 Source1:       IceWM.desktop
 Source2:       %{name}.directory
+Source3:       ftp://download.sourceforge.net/pub/sourceforge/icewm/iceicons-0.6.tar.gz
 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
+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: XFree86-devel
 BuildRequires: zlib-devel
-BuildRequires: gnome-libs-devel
-BuildRequires: libstdc++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
@@ -49,22 +53,22 @@ powy
 roboczych, paski narzêdziowe, status skrzynki z poczt±, cyfrowy zegar.
 Jest przy tym ma³y i szybki.
 
-%package -n %{name}-themes-base
-Summary:        Pack of themes for icewm
-Summary(pl):    Zestaw tematów dla icewm
+%package themes-base
+Summary:       Pack of themes for icewm
+Summary(pl):   Zestaw tematów dla icewm
 Group:         Themes
 Group(de):     Themen
 Group(pl):     Motywy
 Requires:      icewm
 
-%description -n %{name}-themes-base
+%description themes-base
 Standard pack of themes delivered with icewm.
 All of them made by Marko Macek:
 gtk2, metal2, motif, nice, warp3, warp4, win95
 
-%description -n %{name}-themes-base -l pl
+%description themes-base -l pl
 Standardowy zestaw tematów dla IceWM'a, dostarczany wraz nim.
-Wszystkie stwarzone przez Marko Macek:
+Wszystkie stworzone przez Marko Macek:
 gtk2, metal2, motif, nice, warp3, warp4, win95
 
 %prep -q
@@ -72,11 +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
+export LDFLAGS
+libtoolize --copy --force
 autoconf
-%configure \
+%configure2_13 \
        --with-shape \
+       --prefix=%{_prefix} \
        --with-docdir=/usr/share/doc \
        --with-cfgdir=%{_sysconfdir} \
        --with-sm \
@@ -86,26 +99,30 @@ autoconf
        --with-i18n \
        --enable-nls \
        --enable-guievents \
-       --with-imlib 
+       --with-imlib
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__install} -d $RPM_BUILD_ROOT{%{_wmpropsdir},%{_applnkdir}/Settings/IceWM}
+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
+
+#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 README CHANGES TODO BUGS FAQ icewm.lsm PLATFORMS
+gzip -9nf BUGS CHANGES FAQ PLATFORMS README TODO icewm.lsm
 
 %find_lang %{name}
 
@@ -114,10 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %doc *.gz doc/*.*ml
 %attr(755,root,root) %{_bindir}/*
-%attr(644,root,root)
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/*
 %dir %{_applnkdir}/Settings/IceWM
 %{_applnkdir}/Settings/IceWM/.directory
 %{_wmpropsdir}/*
@@ -126,9 +142,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/X11/icewm/ledclock
 %{_libdir}/X11/icewm/mailbox
 %{_libdir}/X11/icewm/taskbar
+%dir %{_libdir}/X11/icewm/themes
 %{_libdir}/X11/icewm/themes/Infadel2
 
-%files -n %{name}-themes-base
+%files themes-base
 %defattr(644,root,root,755)
 %{_libdir}/X11/icewm/themes/gtk2
 %{_libdir}/X11/icewm/themes/metal2