From 1e228c3401a6975d68b712ca981f98a9f2e9efa2 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 20 Mar 2012 17:08:53 -0500 Subject: cygwin-openssl 1.0.1-1 --- cygwin-openssl.spec | 26 ++++++++++++++++---------- openssl-0.9.8r-cygwin-cross.patch | 11 ----------- sources | 2 +- 3 files changed, 17 insertions(+), 22 deletions(-) delete mode 100644 openssl-0.9.8r-cygwin-cross.patch diff --git a/cygwin-openssl.spec b/cygwin-openssl.spec index 105577c..41bc194 100644 --- a/cygwin-openssl.spec +++ b/cygwin-openssl.spec @@ -4,10 +4,10 @@ %global __find_requires %{_cygwin_findrequires} %global __find_provides %{_cygwin_findprovides} -%define soversion 0.9.8 +%define soversion 1.0.0 Name: cygwin-openssl -Version: %{soversion}r +Version: 1.0.1 Release: 1 Summary: Cygwin port of the OpenSSL toolkit @@ -15,7 +15,6 @@ Group: Development/Libraries License: OpenSSL URL: http://www.openssl.org/ Source0: ftp://sourceware.org/pub/cygwin/release/openssl/openssl-%{version}-1-src.tar.bz2 -Patch0: openssl-0.9.8r-cygwin-cross.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -46,12 +45,12 @@ This package contains Cygwin libraries and development tools. %prep %setup -q -n openssl-%{version}-1 -%patch0 -p2 %build ./Configure \ --prefix=%{_cygwin_prefix} \ + --cross-compile-prefix=%{_cygwin_target}- \ zlib no-hw no-camellia no-capieng no-cms no-gmp no-idea no-jpake \ no-krb5 no-mdc2 no-rc5 no-rfc3779 no-seed \ shared Cygwin @@ -69,6 +68,15 @@ fi rm -rf $RPM_BUILD_ROOT make INSTALL_PREFIX=$RPM_BUILD_ROOT install_sw +# Remove unnecessary static libraries +rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/lib{crypto,ssl}.a + +# Remove unnecessary Cygwin native binaries and runtime files +rm -f $RPM_BUILD_ROOT%{_cygwin_bindir}/c_rehash +rm -f $RPM_BUILD_ROOT%{_cygwin_bindir}/*.exe +rm -rf $RPM_BUILD_ROOT%{_cygwin_libdir}/engines/ +rm -rf $RPM_BUILD_ROOT%{_cygwin_prefix}/ssl + # Documentation already provided by Fedora native package rm -rf $RPM_BUILD_ROOT%{_cygwin_mandir} @@ -80,22 +88,20 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES LICENSE NEWS -%{_cygwin_bindir}/openssl.exe -%{_cygwin_bindir}/c_rehash %{_cygwin_bindir}/cygcrypto-%{soversion}.dll %{_cygwin_bindir}/cygssl-%{soversion}.dll %{_cygwin_includedir}/openssl -%{_cygwin_libdir}/libcrypto.a %{_cygwin_libdir}/libcrypto.dll.a -%{_cygwin_libdir}/libssl.a %{_cygwin_libdir}/libssl.dll.a -%{_cygwin_libdir}/engines %{_cygwin_libdir}/pkgconfig/libcrypto.pc %{_cygwin_libdir}/pkgconfig/libssl.pc %{_cygwin_libdir}/pkgconfig/openssl.pc -%config(noreplace) %{_cygwin_prefix}/ssl %changelog +* Tue Mar 20 2012 Yaakov Selkowitz - 1.0.1-1 +- Version bump. +- Remove unnecessary files. + * Sun Mar 20 2011 Yaakov Selkowitz - 0.9.8r-1 - Initial spec file, largely based on mingw32-openssl. diff --git a/openssl-0.9.8r-cygwin-cross.patch b/openssl-0.9.8r-cygwin-cross.patch deleted file mode 100644 index 94b9691..0000000 --- a/openssl-0.9.8r-cygwin-cross.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- SOURCES/openssl-0.9.8r-1/Configure 2010-12-10 18:30:42.000000000 -0600 -+++ BUILD/openssl-0.9.8r-1/Configure 2011-03-20 03:19:01.639104941 -0500 -@@ -497,7 +497,7 @@ - - # Cygwin - "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32", --"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", -+"Cygwin", "i686-pc-cygwin-gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", - "debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", - - # NetWare from David Ward (dsward@novell.com) diff --git a/sources b/sources index 2c7e3ff..056caff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0352932ea863bc02b056cda7c9ac5b79 openssl-0.9.8r.tar.gz +b3d18c7ed74247fe691af5d94a2adc6d openssl-1.0.1-1-src.tar.bz2 -- cgit