[SDL_Pango] Add disttag, cleanup spec

Peter Robinson pbrobinson at fedoraproject.org
Tue Jul 24 22:32:49 UTC 2012


commit 43bdf6670c557c225082246fa68f5891020dfb04
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jul 24 23:32:16 2012 +0100

    Add disttag, cleanup spec

 SDL_Pango.spec |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/SDL_Pango.spec b/SDL_Pango.spec
index 1df2b91..94c110d 100644
--- a/SDL_Pango.spec
+++ b/SDL_Pango.spec
@@ -1,16 +1,17 @@
 Summary: Rendering of internationalized text for SDL (Simple DirectMedia Layer)
 Name: SDL_Pango
 Version: 0.1.2
-Release: 14
+Release: 15%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://sdlpango.sourceforge.net/
+
 Source0: http://downloads.sf.net/sdlpango/SDL_Pango-%{version}.tar.gz
 Source1: doxygen.png
 Patch0: SDL_Pango-0.1.2-suppress-warning.patch
 Patch1: SDL_Pango-0.1.2-API-adds.patch
 Patch2: SDL_Pango-0.1.2-matrix_declarations.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
 BuildRequires: pango-devel, SDL-devel, dos2unix
 BuildRequires: autoconf, automake, libtool
 
@@ -35,9 +36,9 @@ Development files for SDL_pango.
 %patch1 -p1 -b .API-adds
 %patch2 -p1 -b .matrix_declarations
 # Clean up, we include the entire "docs/html" content for the devel package
-%{__rm} -rf docs/html/CVS/
+rm -rf docs/html/CVS/
 # Replace the corrupt doxygen.png file with a proper one
-%{__install} -m 0644 -p %{SOURCE1} docs/html/doxygen.png
+install -m 0644 -p %{SOURCE1} docs/html/doxygen.png
 # Fix the (many) DOS encoded files, not *.png since they get corrupt
 find . -not -name \*.png -type f -exec dos2unix -k {} \;
 # For FC-5 x86_64 this is required, or the shared library doesn't get built
@@ -47,16 +48,11 @@ libtoolize --copy --force
 
 %build
 %configure --disable-static
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-
-
-%clean
-%{__rm} -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -79,6 +75,9 @@ libtoolize --copy --force
 
 
 %changelog
+* Tue Jul 24 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.1.2-15
+- Add disttag, cleanup spec
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list