X-Git-Url: http://git.pld-linux.org/?p=packages%2Ficewm.git;a=blobdiff_plain;f=icewm.spec;h=d0ed18254078afe90e44495c51a6301b9c6c4534;hp=cfbd88c99fc941ff669f70964361067b017bd25c;hb=8852bbe;hpb=eadac3d2057ebf4179ea2d4042a2ea7678b75ea6

diff --git a/icewm.spec b/icewm.spec
index cfbd88c..d0ed182 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,13 +1,20 @@
-#
-# Conditional build:
-%bcond_without	gradients	# disable gradients (requires antialiasing which requires freetype)
-%bcond_without	freetype	# disable xfreetype support (implies !with_antialiasing)
-%bcond_without	guievents	# disable guievents
-%bcond_with	gnome2		# build with support for GNOME2 wm-properties
-#
 # TODO:
 # - make a PLD-theme - default :]
+#
+# Conditional build:
+%bcond_without	gradients	# gradients (requires antialiasing which requires freetype)
+%bcond_without	freetype	# xfreetype support (implies no antialiasing)
+%bcond_without	guievents	# GUI events
+%bcond_without	alsa		# ALSA sound for GUI events
+%bcond_with	esd		# EsounD sound for GUI events
+%bcond_without	yiff		# YIFF sound for GUI events
+%bcond_with	gnome2		# support for GNOME2 menus and wm-properties
 
+%if %{without guievents}
+%undefine	with_alsa
+%undefine	with_esd
+%undefine	with_yiff
+%endif
 Summary:	IceWM X11 Window Manager
 Summary(de.UTF-8):	IceWM ist ein Window Manager für X
 Summary(es.UTF-8):	Administrador de Ventanas X11
@@ -16,45 +23,49 @@ Summary(pt_BR.UTF-8):	Gerenciador de Janelas X11
 Summary(ru.UTF-8):	Оконный менеджер для X11
 Summary(uk.UTF-8):	Віконний менеджер для X11
 Name:		icewm
-Version:	1.3.7
-%define	_iceicons_ver		0.6
-%define	_netscapeicons_ver	0.2
-Release:	3
+Version:	1.4.2
+%define	iceicons_ver		0.6
+Release:	2
 Epoch:		2
-License:	LGPL
+License:	LGPL v2
 Group:		X11/Window Managers
-Source0:	http://dl.sourceforge.net/icewm/%{name}-%{version}.tar.gz
-# Source0-md5:	224695231aedb2b91db3254a13e1c8dd
+#Source0Download: https://github.com/ice-wm/icewm/releases
+Source0:	https://github.com/ice-wm/icewm/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	db9900056366adc163b2e501a5247bbc
 Source1:	IceWM.desktop
-Source3:	http://dl.sourceforge.net/icewm/iceicons-%{_iceicons_ver}.tar.gz
+Source3:	http://downloads.sourceforge.net/icewm/iceicons-%{iceicons_ver}.tar.gz
 # Source3-md5:	53ed111a3c4d1e609bd1604ddccd4701
 Source4:	icewm-startup.sh
-Source6:	http://dl.sourceforge.net/icewm/netscapeicons-%{_netscapeicons_ver}.tar.gz
-# Source6-md5:	409aa9b02adc11309ed546c5120c01d2
-Source7:	%{name}-xsession.desktop
 Patch0:		%{name}-build-fixes.patch
-Patch1:		%{name}-tray_hotfixes.patch
-Patch2:		%{name}-fix_input_focus_loss_for_deiconified_frame_1.patch
-Patch3:		%{name}-ifstate-exact-check.patch
-Patch4:		%{name}-imap-unseen.patch
-Patch5:		%{name}-autohide.patch
-URL:		http://www.icewm.org/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake
-BuildRequires:	gdk-pixbuf-devel
-BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel
-BuildRequires:	kde4-kde3support
+URL:		https://ice-wm.org/
+%{?with_alsa:BuildRequires:	alsa-lib-devel}
+BuildRequires:	asciidoc
+BuildRequires:	autoconf >= 2.69
+BuildRequires:	automake >= 1:1.13.4
+%{?with_esd:BuildRequires:	esound-devel}
+BuildRequires:	fontconfig-devel
+BuildRequires:	fribidi-devel >= 0.10.4
+BuildRequires:	gdk-pixbuf2-xlib-devel >= 2.0
+BuildRequires:	gettext-tools >= 0.19.6
+BuildRequires:	glib2-devel >= 2.0
+%{?with_gnome2:BuildRequires:	gnome-desktop2-devel >= 2.0}
+%{?with_gnome2:BuildRequires:	gnome-vfs2-devel >= 2.0}
+%{?with_gnome2:BuildRequires:	libgnomeui-devel >= 2.0}
+%{?with_alsa:BuildRequires:	libsndfile-devel}
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:2.4.2
 BuildRequires:	pkgconfig
+BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel
 %{?with_freetype:BuildRequires:	xorg-lib-libXft-devel >= 2.1}
 BuildRequires:	xorg-lib-libXinerama-devel
-%{?with_guievents:BuildRequires:	yiff-devel}
-Requires(pre):	fileutils
-Requires(pre):	sh-utils
+BuildRequires:	xorg-lib-libXrandr-devel
+%{?with_yiff:BuildRequires:	yiff-devel >= 2.14.7-3}
+Requires(pre):	/bin/rm
+Requires(pre):	/usr/bin/test
 Requires:	shared-mime-info
 Requires:	xinitrc-ng
 Suggests:	vfmg >= 0.9.95
@@ -124,56 +135,72 @@ Group:		Themes
 Requires:	icewm
 
 %description themes-base
-Standard pack of themes delivered with IceWM. All of them made by
-Marko Macek: gtk2, metal2, motif, nice, nice2, warp3, warp4, win95.
+Standard pack of themes delivered with IceWM:
+- CrystalBlue by BlueScorpio
+- Helix by RudeSka and TigerT
+- NanoBlue by lion1810
+- metal2, motif, win32 by Marko Macek
+
+This package contains also old themes, no longer installed by default
+in IceWM 1.4:
+- gtk2, nice, nice2, warp3, warp4 by Marko Macek
+- yellowmotif by Andreas Leitgeb
 
 %description themes-base -l pl.UTF-8
-Standardowy zestaw motywów dla IceWM-a, dostarczany wraz z nim.
-Wszystkie stworzone przez Marko Macka: gtk2, metal2, motif, nice,
-nice2, warp3, warp4, win95.
+Standardowy zestaw motywów dla IceWM-a, dostarczany wraz z nim:
+- CrystalBlue autorstwa BlueScorpio
+- Helix autorstwa RudeSka i TigerT
+- NanoBlue autorstwa lion1810
+- metal2, motif, win32 autorstwa Marko Macka
+
+Pakiet zawiera także stare motywy, nie instalowane domyślnie wraz z
+IceWM-em 1.4:
+- gtk2, nice, nice2, warp3, warp4 autorstwa Marko Macka
+- yellowmotif autorstwa Andreasa Leitgeba
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
-cd lib/icons
-tar -xzf %{SOURCE3}
-tar -xzf %{SOURCE6}
+tar -xzf %{SOURCE3} -C lib/icons
+
+%{__sed} -i -e '/po\/Makefile.in/d' configure.ac
 
 %build
-cp -f /usr/share/automake/config.sub .
-%{__aclocal}
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
+%{__automake}
 %configure \
+	ASCIIDOC=/usr/bin/asciidoc \
 	%{!?with_gradients:--disable-gradients} \
-	%{!?with_freetype:--disable-xfreetype --enable-corefonts} \
-	%{?with_guievents:--enable-guievents} \
+	%{?with_guievents:--enable-guievents --with-icesound=%{?with_alsa:ALSA,}OSS%{?with_yiff:,Y}%{?with_esd:,ESound}} \
+	%{!?with_gnome2:--disable-menus-gnome2} \
 	--enable-shaped-decorations \
+	%{!?with_freetype:--disable-xfreetype --enable-corefonts} \
 	--with-cfgdir=%{_sysconfdir}/X11/%{name} \
 	--with-docdir=%{_docdir}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir}} \
-	$RPM_BUILD_ROOT{%{_wmpropsdir},%{_sysconfdir}/X11/%{name}}
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_wmpropsdir},%{_sysconfdir}/X11/%{name}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{?with_gnome2:install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icewm/startup
-install %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
-install lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/keys
-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
+%{__sed} -e 's|^# IconPath=""|IconPath="%{_datadir}/pixmaps:%{_datadir}/icons"|' -i $RPM_BUILD_ROOT%{_datadir}/icewm/preferences
+
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/icewm
+
+%{?with_gnome2:cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}}
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icewm/startup
+cp -p lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/keys
+cp -p lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/toolbar
+cp -p 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
 
@@ -181,6 +208,12 @@ ln -s %{_datadir}/icewm/icons $RPM_BUILD_ROOT%{_pixmapsdir}/icewm
 
 echo "menuprog \"Programs\" %{_datadir}/icewm/icons/folder_16x16.xpm vfmg -i -f -x -c -s icewm" > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
 
+# old themes, no longer installed
+cp -pr lib/themes/{gtk2,nice,nice2,warp3,warp4,yellowmotif} $RPM_BUILD_ROOT%{_datadir}/icewm/themes
+
+# duplicate locale
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/no
+
 %find_lang %{name}
 
 %clean
@@ -191,32 +224,60 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS CHANGES PLATFORMS README* TODO icewm.lsm doc/*.html
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS BUGS CHANGES ChangeLog NEWS PLATFORMS README.md THANKS TODO doc/*.html
+%attr(755,root,root) %{_bindir}/icehelp
+%attr(755,root,root) %{_bindir}/icesh
+%if %{with guievents}
+%attr(755,root,root) %{_bindir}/icesound
+%endif
+%attr(755,root,root) %{_bindir}/icewm
+%attr(755,root,root) %{_bindir}/icewm-menu-fdo
+%attr(755,root,root) %{_bindir}/icewm-session
+%attr(755,root,root) %{_bindir}/icewm-set-gnomewm
+%attr(755,root,root) %{_bindir}/icewmbg
+%attr(755,root,root) %{_bindir}/icewmhint
+%attr(755,root,root) %{_bindir}/icewmtray
 %dir %{_sysconfdir}/X11/%{name}
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/[!rs]*
-%config(noreplace,missingok) %verify(not md5 mtime size) %attr(755,root,root) %{_sysconfdir}/X11/%{name}/[rs]*
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/keys
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/menu
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/toolbar
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/winoptions
+%config(noreplace,missingok) %verify(not md5 mtime size) %attr(755,root,root) %{_sysconfdir}/X11/%{name}/restart
+%config(noreplace,missingok) %verify(not md5 mtime size) %attr(755,root,root) %{_sysconfdir}/X11/%{name}/startup
 %{_pixmapsdir}/icewm
 %dir %{_datadir}/icewm
 %{_datadir}/icewm/icons
+%{_datadir}/icewm/keys
+%{_datadir}/icewm/menu
 %{_datadir}/icewm/ledclock
 %{_datadir}/icewm/mailbox
+%{_datadir}/icewm/preferences
+%{_datadir}/icewm/programs
 %attr(755,root,root) %{_datadir}/icewm/startup
+%{_datadir}/icewm/toolbar
 %{_datadir}/icewm/taskbar
+%{_datadir}/icewm/winoptions
 %dir %{_datadir}/icewm/themes
 %{_datadir}/icewm/themes/Infadel2
+%{_datadir}/icewm/themes/default
 %{_datadir}/icewm/themes/icedesert
-%{_datadir}/xsessions/%{name}.desktop
-%{?with_gnome2:%{_wmpropsdir}/*}
+%{_datadir}/xsessions/icewm.desktop
+%{_datadir}/xsessions/icewm-session.desktop
+%{?with_gnome2:%{_wmpropsdir}/IceWM.desktop}
+%{_mandir}/man1/icewm.1*
 
 %files themes-base
 %defattr(644,root,root,755)
-%{_datadir}/icewm/themes/gtk2
+%{_datadir}/icewm/themes/CrystalBlue
+%{_datadir}/icewm/themes/Helix
+%{_datadir}/icewm/themes/NanoBlue
 %{_datadir}/icewm/themes/metal2
 %{_datadir}/icewm/themes/motif
+%{_datadir}/icewm/themes/win95
+# old themes, no longer installed in 1.4.x
+%{_datadir}/icewm/themes/gtk2
 %{_datadir}/icewm/themes/nice
 %{_datadir}/icewm/themes/nice2
 %{_datadir}/icewm/themes/warp3
 %{_datadir}/icewm/themes/warp4
-%{_datadir}/icewm/themes/win95
 %{_datadir}/icewm/themes/yellowmotif