[mingw-libzip: 9/10] Modernize the spec file

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 15:53:54 UTC 2012


commit 9ff85a997a0cee4dfc0d16c810ac8bba5f955ed1
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 17:51:12 2012 +0200

    Modernize the spec file

 mingw-libzip.spec |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/mingw-libzip.spec b/mingw-libzip.spec
index 0172a7e..68a6e08 100644
--- a/mingw-libzip.spec
+++ b/mingw-libzip.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 libzip
 
@@ -15,11 +12,10 @@ Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.nih.at/libzip/index.html
 Source0:        http://www.nih.at/libzip/%{nativename}-%{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
 BuildRequires:  mingw32-zlib >= 1.1.2
@@ -50,18 +46,14 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 #Remove files we don't need
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 rm -R $RPM_BUILD_ROOT%{_mingw32_datadir}/*
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files -n mingw32-%{nativename}
-%defattr(-,root,root,-)
 %doc AUTHORS NEWS README THANKS TODO
 %{_mingw32_bindir}/zipcmp.exe
 %{_mingw32_bindir}/zipmerge.exe
@@ -74,6 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 0.9-6
 - Renamed the source package to mingw-libzip (#800932)
+- Modernize the spec file
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.9-5
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list