[mingw-pcre: 10/11] Modernize the spec file

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 16:37:04 UTC 2012


commit e5c048554d79fcfa3ac50aa10fe88c72d1d7a053
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 18:34:51 2012 +0200

    Modernize the spec file

 mingw-pcre.spec |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/mingw-pcre.spec b/mingw-pcre.spec
index 6cca60c..ea86f47 100644
--- a/mingw-pcre.spec
+++ b/mingw-pcre.spec
@@ -1,10 +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-pcre
@@ -18,11 +13,10 @@ URL:		http://www.pcre.org/
 Source0:	ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%{version}.tar.gz
 Patch0:		pcre-8.10-multilib.patch
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:	redhat-rpm-config
-BuildRequires:	mingw32-filesystem >= 56
+BuildRequires:	mingw32-filesystem
 BuildRequires:	mingw32-gcc
 BuildRequires:	mingw32-gcc-c++
 BuildRequires:	mingw32-binutils
@@ -74,17 +68,12 @@ done
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/*
 rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/man/*
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -n mingw32-pcre
-%defattr(-,root,root,-)
 %{_mingw32_bindir}/pcre-config
 %{_mingw32_bindir}/pcregrep.exe
 %{_mingw32_bindir}/pcretest.exe
@@ -99,6 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 8.10-7
 - Renamed the source package to mingw-pcre (#801011)
+- Modernize the spec file
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 8.10-6
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list