[mingw-pango: 27/37] Spec cleanup

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 20:16:30 UTC 2012


commit 414fc99d75f520f97d9a4849e9af58d2eda46b77
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Jul 10 14:03:12 2011 +0300

    Spec cleanup
    
    - Use automatic mingw dep extraction
    - Cleaned up the spec file for modern rpmbuild

 mingw32-pango.spec |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/mingw32-pango.spec b/mingw32-pango.spec
index 068d3d3..3687744 100644
--- a/mingw32-pango.spec
+++ b/mingw32-pango.spec
@@ -1,8 +1,5 @@
 %global __strip %{_mingw32_strip}
 %global __objdump %{_mingw32_objdump}
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-pango
@@ -15,8 +12,6 @@ Group:          Development/Libraries
 URL:            http://www.pango.org
 Source0:        http://download.gnome.org/sources/pango/1.28/pango-%{version}.tar.bz2
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 # Native pango uses a %post script to generate this, but the
 # pango-querymodules.exe binary is not something we can easily run on
 # a Linux host. We could use wine but wine isn't happy in a mock
@@ -73,7 +68,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Pango library.
 
 
-%{_mingw32_debug_package}
+%{?_mingw32_debug_package}
 
 
 %prep
@@ -95,8 +90,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/
@@ -107,12 +100,8 @@ rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
 rm -rf $RPM_BUILD_ROOT/%{_mingw32_mandir}/man1
 rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING
 %{_mingw32_bindir}/libpango-1.0-0.dll
 %{_mingw32_bindir}/libpangocairo-1.0-0.dll
@@ -180,7 +169,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files static
-%defattr(-,root,root,-)
 %{_mingw32_libdir}/libpango-1.0.a
 %{_mingw32_libdir}/libpangocairo-1.0.a
 %{_mingw32_libdir}/libpangoft2-1.0.a
@@ -202,6 +190,8 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sun Jul 10 2011 Kalev Lember <kalevlember at gmail.com> - 1.28.4-4
 - Stop using G_CONST_RETURN
+- Use automatic mingw dep extraction
+- Cleaned up the spec file for modern rpmbuild
 
 * Wed Jul 06 2011 Kalev Lember <kalevlember at gmail.com> - 1.28.4-3
 - Rebuilt against win-iconv


More information about the scm-commits mailing list