X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=icewm.spec;h=cb30ae31afecf7a60bbd3d4997309fffcfa2b5ba;hb=13bff080c0f42a5beb817248aadb44e77867b25f;hp=b1c6d6da393b63ce246ec8496d3b709a193bdf42;hpb=10c19d5641dcc485e8e92f86a53e77a8f33cd357;p=packages%2Ficewm.git

diff --git a/icewm.spec b/icewm.spec
index b1c6d6d..cb30ae3 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -4,12 +4,11 @@
 # _without_antialiasing	- disable antialiasing
 # _without_freetype	- disable xfreetype support (implies _without_antialiasing)
 # _without_guievents	- disable guievents
-# _without_gnome	- disable GNOME support
+# _with_gnome		- enable GNOME support
 # _without_imlib	- disable imlib support
 #
 # TODO:
 # - make a PLD-theme - default :]
-# - bigger menu-file
 #
 
 Summary:	IceWM X11 Window Manager
@@ -19,34 +18,45 @@ Summary(pt_BR):	Gerenciador de Janelas X11
 Summary(ru):	ïËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):	÷¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:		icewm
-Version:	1.2.7
-Release:	1
+Version:	1.2.14
+%define _pre pre9
+Release:	1.%{_pre}.1
 Epoch:		2
 License:	LGPL
 Group:		X11/Window Managers
-Source0:	http://dl.sourceforge.net/icewm/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/icewm/%{name}-%{version}%{_pre}.tar.gz
+# Source0-md5:	b28db6d83f44d1b440fdae6657970eda
 Source1:	IceWM.desktop
 Source2:	%{name}.directory
 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
 URL:		http://www.icewm.org/
 BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{!?_without_guievents:BuildRequires:	esound-devel}
 BuildRequires:	gettext-devel
-%{!?_without_gnome:BuildRequires:	gnome-libs-devel}
+%{?_with_gnome:BuildRequires:	gnome-desktop-devel}
 %{!?_without_imlib:BuildRequires:	imlib-devel}
 BuildRequires:	libstdc++-devel
-%{!?_without_freetype:BuildRequires:	Xft-devel >= 2.1}
+%{!?_without_freetype:BuildRequires:	xft-devel >= 2.1}
+BuildRequires:	yiff-devel
 Requires(pre):	fileutils
 Requires(pre):	sh-utils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_wmstyledir	/etc/sysconfig/wmstyle
 %define		_wmpropsdir	/usr/share/wm-properties
+%define		specflags_ia32	"-fomit-frame-pointer"
 
 %description
 Window Manager for X Window System. Can emulate the look of
@@ -107,15 +117,19 @@ Wszystkie stworzone przez Marko Macka: gtk2, metal2, motif, nice,
 nice2, warp3, warp4, win95.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_pre}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 cd lib/icons
 tar -xzf %{SOURCE3}
 tar -xzf %{SOURCE6}
-cd ../..
 
 %build
 rm -f missing
+cp -f /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
@@ -124,7 +138,7 @@ rm -f missing
 	%{!?_without_antialiasing:--enable-antialiasing} \
 	%{?_without_freetype:--disable-xfreetype} \
 	%{!?_without_guievents:--enable-guievents} \
-	%{!?_without_gnome:--with-gnome-menus} \
+	%{?_with_gnome:--enable-menus-gnome} \
 	%{?_without_imlib:--without-imlib} \
 	--enable-shaped-decorations \
 	--with-cfgdir=%{_sysconfdir}/X11/%{name} \
@@ -133,23 +147,31 @@ rm -f missing
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_wmstyledir}} \
+install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir},%{_wmstyledir}} \
 	$RPM_BUILD_ROOT{%{_applnkdir}/Settings/IceWM,%{_wmpropsdir},%{_sysconfdir}/X11/%{name}}
 
-%{__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
-install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/IceWM.sh
-install %{SOURCE5} $RPM_BUILD_ROOT%{_wmstyledir}/IceWM.names
+install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/%{name}.sh
+install %{SOURCE5} $RPM_BUILD_ROOT%{_wmstyledir}/%{name}.names
+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
 install lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/toolbar
 install lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/winoptions
+echo %{_bindir}/icewmbg > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/startup
+:> $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/restart
 
 ln -s %{_datadir}/icewm/icons $RPM_BUILD_ROOT%{_pixmapsdir}/icewm
 
-echo "menuprog \"Programs\" %{_datadir}/icewm/icons/folder_16x16.xpm icewm-menu-gnome1 --list \"%{_applnkdir}\"" > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
+%if 0%{?_with_gnome:1}
+echo "menuprog \"Programs\" %{_datadir}/icewm/icons/folder_16x16.xpm icewm-menu-gnome2 --list \"%{_applnkdir}\"" > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
+%else
+echo "menuprog \"Programs\" %{_datadir}/icewm/icons/folder_16x16.xpm wmconfig --output icewm" > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
+%endif
 
 %find_lang %{name}
 
@@ -161,10 +183,11 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS CHANGES FAQ PLATFORMS README* TODO icewm.lsm doc/*.html
+%doc AUTHORS BUGS CHANGES PLATFORMS README* TODO icewm.lsm doc/*.html
 %attr(755,root,root) %{_bindir}/*
 %dir %{_sysconfdir}/X11/%{name}
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/%{name}/*
+%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/X11/%{name}/[!rs]*
+%config(noreplace,missingok) %verify(not md5 size mtime) %attr(755,root,root) %{_sysconfdir}/X11/%{name}/[rs]*
 %{_pixmapsdir}/icewm
 %dir %{_datadir}/icewm
 %{_datadir}/icewm/icons
@@ -174,11 +197,12 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 %dir %{_datadir}/icewm/themes
 %{_datadir}/icewm/themes/Infadel2
 %{_datadir}/icewm/themes/icedesert
+%{_datadir}/xsessions/%{name}.desktop
 %dir %{_applnkdir}/Settings/IceWM
 %{_applnkdir}/Settings/IceWM/.directory
 %{_wmpropsdir}/*
-%attr(755,root,root) %{_wmstyledir}/IceWM.sh
-%attr(644,root,root) %{_wmstyledir}/IceWM.names
+%{_wmstyledir}/%{name}.names
+%attr(755,root,root) %{_wmstyledir}/%{name}.sh
 
 %files themes-base
 %defattr(644,root,root,755)