- 1.2.16

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index 7b4e3e18510d80182c322a8564b4124ce9d2892c..765e4cac02111fb5e982adc922f6ea2f6812b740 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -17,27 +17,25 @@ Summary(pt_BR):     Gerenciador de Janelas X11
 Summary(ru):   ïËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):   ÷¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          icewm
-Version:       1.2.14
-%define _pre pre10
-Release:       1.%{_pre}.1
+Version:       1.2.16
+#%define _pre pre1
+Release:       1
 Epoch:         2
 License:       LGPL
 Group:         X11/Window Managers
-Source0:       http://dl.sourceforge.net/icewm/%{name}-%{version}%{_pre}.tar.gz
-# Source0-md5: d58838b359592e4fd6a27af063b007de
+#Source0:      http://dl.sourceforge.net/icewm/%{name}-%{version}%{_pre}.tar.gz
+Source0:       http://dl.sourceforge.net/icewm/%{name}-%{version}.tar.gz
+# Source0-md5: 1aa92846cc516a2ac1d668d80c3ca5ea
 Source1:       IceWM.desktop
 Source3:       http://dl.sourceforge.net/icewm/iceicons-0.6.tar.gz
 # Source3-md5: 53ed111a3c4d1e609bd1604ddccd4701
 Source4:       IceWM.RunWM
-Source5:       IceWM.wm_style
 Source6:       http://dl.sourceforge.net/icewm/netscapeicons-0.2.tar.gz
 # Source6-md5: 409aa9b02adc11309ed546c5120c01d2
 Source7:       %{name}-xsession.desktop
 Patch0:                %{name}-broken-xrandr.patch
 Patch1:                %{name}-home_etc.patch
-Patch2:                %{name}-link_with_g++.patch
-Patch3:                %{name}-showdesktopkey.patch
-Patch4:                %{name}-gcc34.patch
+Patch2:                %{name}-helpbrowser.patch
 URL:           http://www.icewm.org/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf >= 2.50
@@ -52,6 +50,7 @@ BuildRequires:        yiff-devel
 Requires(pre): fileutils
 Requires(pre): sh-utils
 Requires:      vfmg
+Requires:      xinitrc-ng
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _wmstyledir     /etc/sysconfig/wmstyle
@@ -117,12 +116,11 @@ Wszystkie stworzone przez Marko Macka: gtk2, metal2, motif, nice,
 nice2, warp3, warp4, win95.
 
 %prep
-%setup -q -n %{name}-%{version}%{_pre}
+#%setup -q -n %{name}-%{version}%{_pre}
+%setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#%patch2 -p1
 
 mv -f po/{no,nb}.po
 mv -f po/{zh_TW.Big5,zh_TW}.po
@@ -157,8 +155,7 @@ install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir},%{_wmstyledir}}
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/%{name}.sh
-install %{SOURCE5} $RPM_BUILD_ROOT%{_wmstyledir}/%{name}.names
+install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/%{name}-session.sh
 install %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
 install lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/keys
 install lib/preferences $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/preferences
@@ -169,7 +166,7 @@ echo %{_bindir}/icewmbg > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/startup
 
 ln -s %{_datadir}/icewm/icons $RPM_BUILD_ROOT%{_pixmapsdir}/icewm
 
-echo "menuprog \"Programs\" %{_datadir}/icewm/icons/folder_16x16.xpm vfmg -c -s icewm" > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
+echo "menuprog \"Programs\" %{_datadir}/icewm/icons/folder_16x16.xpm vfmg -i -f -x -c -s icewm" > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
 
 %find_lang %{name}
 
@@ -197,8 +194,7 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 %{_datadir}/icewm/themes/icedesert
 %{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/*
-%{_wmstyledir}/%{name}.names
-%attr(755,root,root) %{_wmstyledir}/%{name}.sh
+%attr(755,root,root) %{_wmstyledir}/%{name}-session.sh
 
 %files themes-base
 %defattr(644,root,root,755)
@@ -210,3 +206,4 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 %{_datadir}/icewm/themes/warp3
 %{_datadir}/icewm/themes/warp4
 %{_datadir}/icewm/themes/win95
+%{_datadir}/icewm/themes/yellowmotif