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

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 16:54:48 UTC 2012


commit bad0aee611095cc22b05ed6b6a62e36465351ad1
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 18:52:44 2012 +0200

    Modernize the spec file

 mingw-proj.spec |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/mingw-proj.spec b/mingw-proj.spec
index 71c2ebf..0e22143 100644
--- a/mingw-proj.spec
+++ b/mingw-proj.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}
 
 %global nativename proj
 
@@ -15,11 +12,10 @@ Group:     Applications/Engineering
 License:   MIT
 URL:       http://proj.osgeo.org
 Source0:   http://download.osgeo.org/proj/proj-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 BuildRequires: libtool
-BuildRequires:  mingw32-filesystem >= 35
+BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 
@@ -49,7 +45,6 @@ projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove libtool archives
@@ -63,11 +58,7 @@ rm -R $RPM_BUILD_ROOT%{_mingw32_datadir}/*
 
 %check
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -n mingw32-%{nativename}
-%defattr(-,root,root,-)
 %doc NEWS AUTHORS COPYING README ChangeLog
 %{_mingw32_bindir}/libproj-0.dll
 %{_mingw32_bindir}/*.exe
@@ -77,6 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 4.6.1-8
 - Renamed the source package to mingw-proj (#801017)
+- Modernize the spec file
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.6.1-7
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list