[mingw-libgnurx: 14/15] Spec clean up

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 19:21:14 UTC 2012


commit ed890421f0bd69311e6b385f252c4b3bc6013f71
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 6 21:15:56 2012 +0200

    Spec clean up

 mingw-libgnurx.spec |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/mingw-libgnurx.spec b/mingw-libgnurx.spec
index 57b5622..7011ead 100644
--- a/mingw-libgnurx.spec
+++ b/mingw-libgnurx.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:           mingw-libgnurx
@@ -17,12 +14,11 @@ Source0:        http://kent.dl.sourceforge.net/sourceforge/mingw/mingw-libgnurx-
 Source1:        mingw32-libgnurx-configure.ac
 Source2:        mingw32-libgnurx-Makefile.am
 Patch0:         mingw32-libgnurx-honor-destdir.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
 BuildRequires:  autoconf automake libtool
-BuildRequires:  mingw32-filesystem >= 52
+BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 
@@ -46,7 +42,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows regular expression library.
 
 
-%{_mingw32_debug_package}  
+%{?_mingw32_debug_package}
 
 
 %prep
@@ -71,8 +67,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # make install expects %{_mingw32_includedir} to exist
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
 
@@ -90,12 +84,7 @@ sed -i s/gnurx/regex/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libregex.la
 rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/man
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -n mingw32-libgnurx
-%defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_mingw32_bindir}/libgnurx-0.dll
 %{_mingw32_includedir}/regex.h
@@ -103,13 +92,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libregex.la
 
 %files -n mingw32-libgnurx-static
-%defattr(-,root,root,-)
 %{_mingw32_libdir}/libregex.a
 
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 2.5.1-10
 - Renamed the source package to mingw-libgnurx (#800429)
+- Spec clean up
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.5.1-9
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list