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

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 16:14:19 UTC 2012


commit 675469ce1f834bbf96f50df7190c362c04869c56
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 18:11:37 2012 +0200

    Modernize the spec file

 mingw-openjpeg.spec |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/mingw-openjpeg.spec b/mingw-openjpeg.spec
index 590e9c3..5750531 100644
--- a/mingw-openjpeg.spec
+++ b/mingw-openjpeg.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}
 
 # reset patch fuzz, rebasing patches will require delicate surgery -- Rex
@@ -16,12 +13,11 @@ Summary: MinGW Windows openjpeg library
 Group:     Development/Libraries
 License:   BSD
 URL:       http://www.openjpeg.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires: cmake
 
-BuildRequires: mingw32-filesystem >= 52
+BuildRequires: mingw32-filesystem
 BuildRequires: mingw32-gcc
 BuildRequires: mingw32-binutils
 BuildRequires: mingw32-libtiff
@@ -62,7 +58,7 @@ Summary: MinGW Windows openjpeg library
 %{_mingw32_description}
 
 
-%{_mingw32_debug_package}
+%{?_mingw32_debug_package}
 
 
 %prep
@@ -101,7 +97,6 @@ popd
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 pushd build
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
@@ -118,12 +113,7 @@ ln -s openjpeg/openjpeg.h $RPM_BUILD_ROOT%{_mingw32_includedir}/openjpeg.h
 make test -C build
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -n mingw32-openjpeg
-%defattr(-,root,root,-)
 %doc license.txt
 %{_mingw32_includedir}/openjpeg.h
 %{_mingw32_includedir}/openjpeg
@@ -134,6 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 1.3-9
 - Renamed the source package to mingw-openjpeg (#801008)
+- Modernize the spec file
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.3-8
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list