X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=icewm.spec;h=b564ac6f26483f7f8870545477d145652b47417e;hb=2cbab07f6a64814cf1fe29f8b77c152407ab2a13;hp=6a4e72dc462f5410a8d2c8e7d482662e345e53a3;hpb=4d3f10fd79f516ff5dbf41c16758b29b21ee8894;p=packages%2Ficewm.git

diff --git a/icewm.spec b/icewm.spec
index 6a4e72d..b564ac6 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -6,25 +6,26 @@
 Summary:	IceWM X11 Window Manager
 Summary(pl):	IceWM - Mened¿er okienek X11
 Name:		icewm
-Version:	1.0.8
-Release:	8
+Version:	1.0.9
+Release:	5
 License:	LGPL
 Group:		X11/Window Managers
+Group(de):	X11/Fenstermanager
 Group(es):	X11/Administraadores De Ventanas
 Group(fr):	X11/Gestionnaires De Fenêtres
 Group(pl):	X11/Zarz±dcy Okien
-Source0:	ftp://download.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}-6.tar.bz2
+Source0:	ftp://download.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}-2.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
+Source4:	IceWM.RunWM
+Source5:	IceWM.wm_style
+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
@@ -37,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
@@ -62,22 +64,18 @@ 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
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
 
 cd lib/icons
 tar -xvf %{SOURCE3}
@@ -85,54 +83,57 @@ cd ../../
 
 %build
 export LDFLAGS
-libtoolize --copy --force
-autoconf
-%configure2_13 \
-	--with-shape \
+%configure \
 	--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 \
+	--enable-i18n \
+	--with-imlib \
+	--with-shape \
+	--with-sm \
 	--enable-guievents \
-	--with-imlib
+	--enable-gradients \
+	--enable-xfreetype \
+	--enable-nls 
 
 %{__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{%{_wmstyledir},%{_applnkdir}/Settings/IceWM,%{_wmpropsdir}}
 
 %{__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
+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
 
-%{__gzip} -9nf BUGS CHANGES FAQ PLATFORMS README TODO icewm.lsm
+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)
 %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
@@ -144,6 +145,8 @@ autoconf
 %{_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)