[mingw-qwt: 20/21] Modernize the spec file

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 17:14:06 UTC 2012


commit a020796a6bc7408d1ef9794c9bd6c4dd99d3d02b
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 18:58:27 2012 +0200

    Modernize the spec file

 mingw-qwt.spec |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/mingw-qwt.spec b/mingw-qwt.spec
index 0ac61e7..b92a589 100644
--- a/mingw-qwt.spec
+++ b/mingw-qwt.spec
@@ -1,3 +1,7 @@
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%define __debug_install_post %{_mingw32_debug_install_post}
+
 %global name1 qwt
 %global name2 %{name1}5
 
@@ -28,16 +32,8 @@ Summary:        MinGW Windows Qwt library
 MinGW Windows Qwt library.
 
 
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
-
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
+%{?_mingw32_debug_package}
 
-%define __debug_install_post %{_mingw32_debug_install_post}
-
-%{_mingw32_debug_package}
 
 %prep
 %setup -qn %{name1}-%{version}
@@ -68,7 +64,6 @@ make debug
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install
 #remove unneeded stuff
 rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/%{name1}
@@ -78,11 +73,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/%{name1}
 %{__cp} lib/lib%{name1}d5.a $RPM_BUILD_ROOT%{_mingw32_libdir}/
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -n mingw32-%{name1}
-%defattr(-,root,root,-)
 %doc CHANGES
 %doc COPYING
 %doc README
@@ -95,6 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 5.2.1-6
 - Renamed the source package to mingw-qwt (#801020)
+- Modernize the spec file
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.1-5
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list