[libglade] Nobody else likes macros for commands

[Paul Howarth]

commit 8f42e2cd71ea2cceeb98c3c79cf0d635ae03decd
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Jan 5 23:37:01 2012 +0000

    Nobody else likes macros for commands

 libglade.spec |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/libglade.spec b/libglade.spec
index d080513..115302f 100644
--- a/libglade.spec
+++ b/libglade.spec
@@ -1,7 +1,7 @@
 Summary:	Gnome-1 support library for loading user interfaces
 Name:		libglade
 Version:	0.17
-Release:	25%{?dist}
+Release:	26%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -15,7 +15,7 @@ Patch4:		libglade-0.17-non-weak-symbols.patch
 Patch5:		libglade-0.17-no-local-intl.patch
 Patch6:		libglade-0.17-multiarch.patch
 Patch7:		libglade-0.17-cleanlibs.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	gnome-libs-devel%{?_isa} >= 1:1.4.1.2
 BuildRequires:	libxml-devel%{?_isa} >= 1:1.8.16
 BuildRequires:	autoconf, gettext, gtk-doc, libtool
@@ -63,26 +63,26 @@ that you can use to develop libglade applications.
 
 # Convert docs to UTF-8
 /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf8
-%{__mv} -f ChangeLog.utf8 ChangeLog
+mv -f ChangeLog.utf8 ChangeLog
 
 %build
-%{__autoconf}
+autoconf
 %configure --without-bonobo --disable-static
 
 # Kill bogus RPATHs
-%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
 
-%{__make}
+make
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} INSTALL="install -p" install
 
 # Don't package libtool archives
-%{__rm} %{buildroot}%{_libdir}/libglade{,-gnome}.la
+rm %{buildroot}%{_libdir}/libglade{,-gnome}.la
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -109,11 +109,14 @@ that you can use to develop libglade applications.
 %doc %{_datadir}/gnome/html/
 
 %changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.17-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Thu Jan  5 2012 Paul Howarth <paul at city-fan.org> 1:0.17-26
+- nobody else likes macros for commands
 
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.17-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Feb  8 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:0.17-25
+- rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:0.17-24
+- rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Apr 20 2009 Paul Howarth <paul at city-fan.org> 1:0.17-23
 - use an alternative approach to rpath-fixing - hacking the supplied libtool
@@ -121,7 +124,7 @@ that you can use to develop libglade applications.
 - specify Instruction Set Architecture (%%{?_isa}) in devel package requires
 - link against the libs that are needed, and only those libs
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.17-22
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:0.17-22
 - rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Feb 13 2008 Paul Howarth <paul at city-fan.org> 1:0.17-21