[mingw-openssl: 5/32] - Fixed %defattr line - Added -static subpackage

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 20:06:39 UTC 2012


commit c2a1431a48021bc7d30ff8cd4ffb6611c9443b5c
Author: epienbro <epienbro at fedoraproject.org>
Date:   Tue Apr 14 19:34:14 2009 +0000

    - Fixed %defattr line
    - Added -static subpackage

 mingw32-openssl.spec |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/mingw32-openssl.spec b/mingw32-openssl.spec
index ee14313..e4d3315 100644
--- a/mingw32-openssl.spec
+++ b/mingw32-openssl.spec
@@ -27,7 +27,7 @@
 
 Name:           mingw32-openssl
 Version:        0.9.8j
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW port of the OpenSSL toolkit
 
 License:        OpenSSL
@@ -131,6 +131,14 @@ protocols.
 This package contains Windows (MinGW) libraries and development tools.
 
 
+%package static
+Summary:        Static version of the MinGW port of the OpenSSL toolkit
+Requires:       %{name} = %{version}-%{release}
+
+%description static
+Static version of the MinGW port of the OpenSSL toolkit.
+
+
 %prep
 %setup -q -n openssl-%{version}
 
@@ -282,10 +290,6 @@ make INSTALL_PREFIX=$RPM_BUILD_ROOT install build-shared
 install libcrypto-%{soversion}.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
 install libssl-%{soversion}.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
 
-# Remove static libraries but DON'T remove *.dll.a files.
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libcrypto.a
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libssl.a
-
 # I have no idea why it installs the manpages in /etc, but
 # we remove them anyway.
 rm -r $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pki/tls/man
@@ -313,7 +317,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc LICENSE
 %{_mingw32_bindir}/openssl.exe
 %{_mingw32_bindir}/c_rehash
@@ -328,7 +332,17 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_mingw32_sysconfdir}/pki
 
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libcrypto.a
+%{_mingw32_libdir}/libssl.a
+
+
 %changelog
+* Tue Apr 14 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.9.8j-5
+- Fixed %%defattr line
+- Added -static subpackage
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8j-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


More information about the scm-commits mailing list