X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=icewm.spec;h=a64666405086f0a0ee3b9285358772f4a6f8f290;hb=1dc87219c93e59fef7319302ce77b01e97a56a59;hp=c8d35faaad098423630d24708d6c007b167899e2;hpb=f01bf02772a3a6d90836e6af52c3f71ccc7ae016;p=packages%2Ficewm.git

diff --git a/icewm.spec b/icewm.spec
index c8d35fa..a646664 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,11 +1,10 @@
 #
 # Conditional build:
-# _with_gradients	- enable gradients (implies _with_antialiasing)
-# _without_antialiasing	- disable antialiasing
-# _without_freetype	- disable xfreetype support (implies _without_antialiasing)
-# _without_guievents	- disable guievents
-# _with_gnome		- enable GNOME support
-# _without_imlib	- disable imlib support
+%bcond_without	gradients	# enable gradients (implies with_antialiasing)
+%bcond_without	antialiasing	# disable antialiasing
+%bcond_without	freetype	# disable xfreetype support (implies !with_antialiasing)
+%bcond_without	guievents	# disable guievents
+%bcond_without	imlib		# disable imlib support
 #
 # TODO:
 # - make a PLD-theme - default :]
@@ -17,39 +16,46 @@ Summary(pl):	IceWM - zarz
 Summary(pt_BR):	Gerenciador de Janelas X11
 Summary(ru):	ïËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):	÷¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
+Summary(de):	Enlightenment ist ein Window Manager für X
 Name:		icewm
-Version:	1.2.13
-Release:	0.pre3.1
+Version:	1.2.20
+#%define _pre pre1
+Release:	0.1
 Epoch:		2
 License:	LGPL
 Group:		X11/Window Managers
-Source0:	http://dl.sourceforge.net/icewm/%{name}-%{version}pre3.tar.gz
-# Source0-md5:	0ccc3d4df8fc87642aad5864290a853e
+#Source0:	http://dl.sourceforge.net/icewm/%{name}-%{version}%{_pre}.tar.gz
+Source0:	http://dl.sourceforge.net/icewm/%{name}-%{version}.tar.gz
+# Source0-md5:	6c94dae56fbf9aa085a1d780538018c1
 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}-helpbrowser.patch
 URL:		http://www.icewm.org/
 BuildRequires:	XFree86-devel
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-%{!?_without_guievents:BuildRequires:	esound-devel}
+%{?with_guievents:BuildRequires:	esound-devel}
 BuildRequires:	gettext-devel
-%{?_with_gnome:BuildRequires:	gnome-desktop-devel}
-%{!?_without_imlib:BuildRequires:	imlib-devel}
+%{?with_imlib:BuildRequires:	imlib-devel}
 BuildRequires:	libstdc++-devel
-%{!?_without_freetype:BuildRequires:	xft-devel >= 2.1}
+%{?with_freetype:BuildRequires:	xft-devel >= 2.1}
+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
 %define		_wmpropsdir	/usr/share/wm-properties
-%define		specflags_ia32	"-fomit-frame-pointer"
+%define		specflags_ia32	 -fomit-frame-pointer
 
 %description
 Window Manager for X Window System. Can emulate the look of
@@ -94,6 +100,16 @@ Windows'95, OS/2 Warp 3,4, Motif. 
 ÐÅÒÅͦÝÅÎÎÑ ×¦ËÏÎ, ÓÍÕÖËÕ ÚÁ×ÄÁÎØ, ÓÐÉÓÏË ×¦ËÏÎ, ÓÔÁÎ ÐÏÛÔÏ×ϧ
 ÓËÒÉÎØËÉ, ÃÉÆÒÏ×ÉÊ ÇÏÄÉÎÎÉË. û×ÉÄËÉÊ ÔÁ ËÏÍÐÁËÔÎÉÊ.
 
+%description -l de
+IceWM ist ein in C++ programmierter, unter GPL stehender
+Fenstermanager für das X11-Fenstersystem. Ziel von IceWM ist
+Geschwindigkeit, Schlichtheit und Bedienerfreundlichkeit.
+
+In der Standardeinstellung erinnert das Design von IceWM stark an
+Microsoft Windows: Er verfügt über eine Taskleiste am unteren
+Bildrand, das aktive Fenster lässt sich mit der Tastenkombination
+ALT-TAB wechseln, etc.
+
 %package themes-base
 Summary:	Pack of themes for IceWM
 Summary(pl):	Zestaw motywów dla IceWM-a
@@ -110,24 +126,31 @@ Wszystkie stworzone przez Marko Macka: gtk2, metal2, motif, nice,
 nice2, warp3, warp4, win95.
 
 %prep
-%setup -q -n %{name}-%{version}pre3
+#setup -q -n %{name}-%{version}%{_pre}
+%setup -q
+%patch0 -p1
+%patch1 -p1
+#patch2 -p1
+
+mv -f po/{no,nb}.po
+mv -f po/{zh_TW.Big5,zh_TW}.po
 
 cd lib/icons
 tar -xzf %{SOURCE3}
 tar -xzf %{SOURCE6}
 
 %build
-rm -f missing
+cp -f /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %configure \
-	%{?_with_gradients:--enable-gradients} \
-	%{!?_without_antialiasing:--enable-antialiasing} \
-	%{?_without_freetype:--disable-xfreetype} \
-	%{!?_without_guievents:--enable-guievents} \
-	%{?_with_gnome:--enable-menus-gnome} \
-	%{?_without_imlib:--without-imlib} \
+	%{?with_gradients:--enable-gradients} \
+	%{?with_antialiasing:--enable-antialiasing} \
+	%{!?with_freetype:--disable-xfreetype --enable-corefonts} \
+	%{?with_guievents:--enable-guievents} \
+	%{!?with_imlib:--without-imlib} \
+	--disable-menus-gnome \
 	--enable-shaped-decorations \
 	--with-cfgdir=%{_sysconfdir}/X11/%{name} \
 	--with-docdir=%{_docdir}
@@ -135,18 +158,17 @@ rm -f missing
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_wmstyledir}} \
-	$RPM_BUILD_ROOT{%{_applnkdir}/Settings/IceWM,%{_wmpropsdir},%{_sysconfdir}/X11/%{name}}
+install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir},%{_wmstyledir}} \
+	$RPM_BUILD_ROOT{%{_wmpropsdir},%{_sysconfdir}/X11/%{name}}
 
 %{__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}-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
+sed 's|^# IconPath=""|IconPath="%{_datadir}/pixmaps:%{_datadir}/icons"|' < 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
@@ -154,11 +176,7 @@ echo %{_bindir}/icewmbg > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/startup
 
 ln -s %{_datadir}/icewm/icons $RPM_BUILD_ROOT%{_pixmapsdir}/icewm
 
-%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
+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}
 
@@ -173,8 +191,8 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 %doc AUTHORS BUGS CHANGES PLATFORMS README* TODO icewm.lsm doc/*.html
 %attr(755,root,root) %{_bindir}/*
 %dir %{_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]*
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/[!rs]*
+%config(noreplace,missingok) %verify(not %attr(755,root,root md5 mtime) size) %{_sysconfdir}/X11/%{name}/[rs]*
 %{_pixmapsdir}/icewm
 %dir %{_datadir}/icewm
 %{_datadir}/icewm/icons
@@ -184,11 +202,9 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 %dir %{_datadir}/icewm/themes
 %{_datadir}/icewm/themes/Infadel2
 %{_datadir}/icewm/themes/icedesert
-%dir %{_applnkdir}/Settings/IceWM
-%{_applnkdir}/Settings/IceWM/.directory
+%{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/*
-%attr(755,root,root) %{_wmstyledir}/IceWM.sh
-%attr(644,root,root) %{_wmstyledir}/IceWM.names
+%attr(755,root,root) %{_wmstyledir}/%{name}-session.sh
 
 %files themes-base
 %defattr(644,root,root,755)
@@ -200,3 +216,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