[icewm] Fix FTBFS on new architectures (aarch64/ppc64le), Cleanup and modernise spec

Peter Robinson pbrobinson at fedoraproject.org
Mon Jun 16 15:56:46 UTC 2014 

commit 5ec3bbc25ae42037a9f6d78961c32b157a1f4e68
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Jun 16 16:56:35 2014 +0100

    Fix FTBFS on new architectures (aarch64/ppc64le), Cleanup and modernise spec

 icewm.spec |  129 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 61 insertions(+), 68 deletions(-)
---
diff --git a/icewm.spec b/icewm.spec
index e5f1a35..0b4cfbc 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,16 +1,15 @@
-Name:			icewm
-Version:		1.3.8
-Release:		2%{?dist}
-Summary:		Light and configurable window manager
-Group:			User Interface/Desktops
-License:		LGPLv2+
-URL:			http://www.icewm.org
-Source0:		http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
-Source1:		http://lostclus.linux.kiev.ua/scripts/icewm-xdg-menu
-Source2:		icewm.desktop
-Source3:		icewm-startup
-Source4:		clearlooks-v3.tgz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		icewm
+Version:	1.3.8
+Release:	3%{?dist}
+Summary:	Light and configurable window manager
+Group:		User Interface/Desktops
+License:	LGPLv2+
+URL:		http://www.icewm.org
+Source0:	http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source1:	http://lostclus.linux.kiev.ua/scripts/icewm-xdg-menu
+Source2:	icewm.desktop
+Source3:	icewm-startup
+Source4:	clearlooks-v3.tgz
 
 BuildRequires:	giflib-devel
 BuildRequires:	libXinerama-devel
@@ -28,19 +27,19 @@ BuildRequires:	popt-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires:		gnome-icon-theme
-Requires:		alsa-utils
-Requires:		xdg-utils
-Requires:		xterm
+Requires:	gnome-icon-theme
+Requires:	alsa-utils
+Requires:	xdg-utils
+Requires:	xterm
 
-Patch1:			icewm-1.3.8-menu.patch
-Patch2:			icewm-toolbar.patch
-Patch3:			icewm-keys.patch
-Patch4:			icewm-1.3.8-fribidi.patch
-Patch5:			icewm-1.3.7-dso.patch
-Patch6:			icewm-defaults.patch
-Patch7:			icewm-1.3.7-menuiconsize.patch
-Patch8:			icewm-1.3.8-deprecated.patch
+Patch1:		icewm-1.3.8-menu.patch
+Patch2:		icewm-toolbar.patch
+Patch3:		icewm-keys.patch
+Patch4:		icewm-1.3.8-fribidi.patch
+Patch5:		icewm-1.3.7-dso.patch
+Patch6:		icewm-defaults.patch
+Patch7:		icewm-1.3.7-menuiconsize.patch
+Patch8:		icewm-1.3.8-deprecated.patch
 
 
 %description
@@ -48,24 +47,24 @@ IceWM is a window manager for the X Window System (freedesktop, XFree86).
 The goal of IceWM is speed, simplicity, and not getting in the user's way.
 
 
-%package		gnome
-Summary:		GNOME menu support for IceWM window manager
-Group:			User Interface/Desktops
-Requires:		gnome-menus
-Requires:		icewm = %{version}-%{release}
+%package	gnome
+Summary:	GNOME menu support for IceWM window manager
+Group:		User Interface/Desktops
+Requires:	gnome-menus
+Requires:	icewm = %{version}-%{release}
 
 
 %description	gnome
 IceWM-gnome adds gnome-menu support for the IceWM window manager.
 
 
-%package		xdgmenu
-BuildArch:		noarch
-License:		Public Domain
-Summary:		Automatically generate the main IceWM menu
-Group:			User Interface/Desktops
-Requires:		pyxdg
-Requires:		icewm = %{version}-%{release}
+%package	xdgmenu
+BuildArch:	noarch
+License:	Public Domain
+Summary:	Automatically generate the main IceWM menu
+Group:		User Interface/Desktops
+Requires:	pyxdg
+Requires:	icewm = %{version}-%{release}
 
 
 %description	xdgmenu
@@ -74,13 +73,13 @@ freedesktop.org .desktop files. Files are re-generated each time the
 user logs-in.
 
 
-%package		clearlooks
-BuildArch:		noarch
-Summary:		Clearlooks like theme for IceWM
-Group:			User Interface/Desktops
-Requires:		ImageMagick
-Requires:		icewm = %{version}-%{release}
-Requires:		fedora-logos
+%package	clearlooks
+BuildArch:	noarch
+Summary:	Clearlooks like theme for IceWM
+Group:		User Interface/Desktops
+Requires:	ImageMagick
+Requires:	icewm = %{version}-%{release}
+Requires:	fedora-logos
 
 
 %description	clearlooks
@@ -101,32 +100,30 @@ older Fedora releases and RHEL.
 
 
 %build
-autoconf
-./autogen.sh
-./configure --prefix=/usr						\
-			--enable-gradients					\
-			--enable-antialiasing				\
-			--enable-i18n						\
-			--enable-menus-gnome2				\
-			--with-cfgdir=%{_sysconfdir}/icewm
+autoreconf -vif
+%configure --prefix=/usr \
+	--enable-gradients \
+	--enable-antialiasing \
+	--enable-i18n \
+	--enable-menus-gnome2 \
+	--with-cfgdir=%{_sysconfdir}/icewm
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-%{__install} -p -m 644 doc/icewm.1.man $RPM_BUILD_ROOT/%{_mandir}/man1/icewm.1
+install -p -m 644 doc/icewm.1.man $RPM_BUILD_ROOT/%{_mandir}/man1/icewm.1
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{_bindir}
-%{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icewm/
-%{__install} -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icewm/startup
+install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icewm/startup
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xsessions/
-%{__install} -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xsessions/
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xsessions/
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icewm/themes
 tar -C $RPM_BUILD_ROOT%{_datadir}/icewm/themes -xzf %{SOURCE4}
@@ -136,19 +133,14 @@ echo "Theme=\"clearlooks/default.theme\"" > $RPM_BUILD_ROOT%{_datadir}/icewm/the
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post clearlooks
-[ -d /usr/share/icewm/themes/clearlooks ] && [ -x /usr/bin/convert ] &&					\
-	[ -f /usr/share/icons/hicolor/24x24/apps/fedora-logo-icon.png ] &&					\
-		convert /usr/share/icons/hicolor/24x24/apps/fedora-logo-icon.png				\
+[ -d /usr/share/icewm/themes/clearlooks ] && [ -x /usr/bin/convert ] &&	\
+	[ -f /usr/share/icons/hicolor/24x24/apps/fedora-logo-icon.png ] && \
+		convert /usr/share/icons/hicolor/24x24/apps/fedora-logo-icon.png \
 				/usr/share/icewm/themes/clearlooks/taskbar/linux.xpm || echo -n
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS BUGS CHANGES COPYING README README.wm-session TODO doc/*.html
 %exclude %{_datadir}/icewm/startup
 %exclude %{_datadir}/icewm/themes/clearlooks
@@ -166,24 +158,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files gnome
-%defattr(-,root,root,-)
 %{_bindir}/icewm-menu-gnome2
 
 
 %files xdgmenu
-%defattr(-,root,root,-)
 %{_bindir}/icewm-xdg-menu*
 %{_datadir}/icewm/startup
 
 
 %files clearlooks
-%defattr(-,root,root,-)
 %{_datadir}/icewm/themes/clearlooks-2px
 %{_datadir}/icewm/themes/clearlooks
 %{_datadir}/icewm/theme
 
 
 %changelog
+* Mon Jun 16 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.3.8-3
+- Fix FTBFS on new architectures (aarch64/ppc64le)
+- Cleanup and modernise spec
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

More information about the scm-commits mailing list