[mingw-openssl: 31/32] Modernize the spec file

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 20:08:51 UTC 2012


commit d93b9b251a60265f56af937acd507bd3b0a0baac
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 6 22:03:28 2012 +0200

    Modernize the spec file

 mingw-openssl.spec |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/mingw-openssl.spec b/mingw-openssl.spec
index 6c60f7f..023d1f8 100644
--- a/mingw-openssl.spec
+++ b/mingw-openssl.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}
 
 # For the curious:
@@ -94,11 +91,9 @@ Patch101:       mingw32-openssl-1.0.0-beta3-libversion.patch
 # Fix engines/ install target after lib rename
 Patch102:       mingw32-openssl-1.0.0d-sfx.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 52
+BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 
@@ -310,7 +305,6 @@ fi
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}/openssl
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
@@ -343,12 +337,8 @@ popd
 mkdir -m700 $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pki/CA
 mkdir -m700 $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pki/CA/private
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files -n mingw32-openssl
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_mingw32_bindir}/openssl.exe
 %{_mingw32_bindir}/c_rehash
@@ -364,7 +354,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files -n mingw32-openssl-static
-%defattr(-,root,root,-)
 %{_mingw32_libdir}/libcrypto.a
 %{_mingw32_libdir}/libssl.a
 
@@ -372,6 +361,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 1.0.0d-4
 - Renamed the source package to mingw-openssl (#800443)
+- Modernize the spec file
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.0.0d-3
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list