[libpng10] Nobody else likes macros for commands

[Paul Howarth]

commit ceb2d83ff0f0f235597d2048ad1327436d4d6755
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Jun 29 09:37:53 2011 +0100

    Nobody else likes macros for commands

 libpng10.spec |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/libpng10.spec b/libpng10.spec
index dd2f191..70fa999 100644
--- a/libpng10.spec
+++ b/libpng10.spec
@@ -1,13 +1,13 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
 Version:	1.0.54
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
 Patch0:		libpng-1.0.51-soname.patch
-Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	zlib-devel
 Conflicts:	libpng < 2:1.2.0
 
@@ -35,7 +35,7 @@ libpng10-devel.
 %prep
 %setup -q -n libpng-%{version}
 
-# We want an soname of 2.%{version}
+# We want an soname of 2.%%{version}
 %patch0 -p1 -b .soname
 
 %build
@@ -43,29 +43,29 @@ libpng10-devel.
 	--disable-static \
 	--disable-dependency-tracking \
 	--without-binconfigs
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 # Install docs
 # This is done manually so that the docs, which are all in the same directory,
-# can be split between the main and devel package. If the %doc macro is used
+# can be split between the main and devel package. If the %%doc macro is used
 # in the files list with a non-absolute path, it clears out the docs directory
 # first, which means the splitting of docs into two packages won't work.
 # The alternative would be to have the devel docs in a different directory,
 # but I don't want to do that.
-%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
 # Docs for main package
-%{__install} -p -m 644 ANNOUNCE README TODO CHANGES LICENSE Y2KINFO \
+install -p -m 644 ANNOUNCE README TODO CHANGES LICENSE Y2KINFO \
 	%{buildroot}%{_docdir}/%{name}-%{version}/
 # Docs for devel package
-%{__install} -p -m 644 example.c libpng-%{version}.txt \
+install -p -m 644 example.c libpng-%{version}.txt \
 	%{buildroot}%{_docdir}/%{name}-%{version}/
 
 # Unpackaged files
-%{__rm} -f \
+rm -f \
 	%{buildroot}%{_bindir}/libpng-config \
 	%{buildroot}%{_includedir}/png.h \
 	%{buildroot}%{_includedir}/pngconf.h \
@@ -80,11 +80,11 @@ libpng10-devel.
 	%{buildroot}%{_mandir}/man5/png.5
 
 # Fix devel link
-%{__rm} -f %{buildroot}%{_libdir}/libpng10.so
-%{__ln_s} libpng.so.2 %{buildroot}%{_libdir}/libpng10.so
+rm -f %{buildroot}%{_libdir}/libpng10.so
+ln -s libpng.so.2 %{buildroot}%{_libdir}/libpng10.so
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -111,8 +111,11 @@ libpng10-devel.
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.54-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Wed Jun 29 2011 Paul Howarth <paul at city-fan.org> 1.0.54-3
+- nobody else likes macros for commands
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1.0.54-2
+- rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Fri Jul  2 2010 Paul Howarth <paul at city-fan.org> 1.0.54-1
 - update to 1.0.54