Rebuilt for cygwin64

1 files changed, 107 insertions, 50 deletions

diff --git a/cygwin-openssl.spec b/cygwin-openssl.spec
index f653ac5..782ff91 100644
--- a/cygwin-openssl.spec
+++ b/cygwin-openssl.spec
@@ -1,106 +1,163 @@
-%global __strip %{_cygwin_strip}
-%global __objdump %{_cygwin_objdump}
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_cygwin_findrequires}
-%global __find_provides %{_cygwin_findprovides}
+%{?cygwin_package_header}
 
 %define soversion 1.0.0
 
 Name:           cygwin-openssl
 Version:        1.0.1e
-Release:        1
+Release:        2
 Summary:        Cygwin port of the OpenSSL toolkit
 
 Group:          Development/Libraries
 License:        OpenSSL
 URL:            http://www.openssl.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 Source0:        http://www.openssl.org/source/openssl-%{version}.tar.gz
+Patch0:         openssl-1.0.0-beta5-enginesdir.patch
+Patch1:         openssl-1.0.1-cygwin64.patch
+
+BuildRequires:  cygwin32-filesystem
+BuildRequires:  cygwin32-binutils
+BuildRequires:  cygwin32-gcc
+BuildRequires:  cygwin32
+BuildRequires:  cygwin32-zlib
+
+BuildRequires:  cygwin64-filesystem
+BuildRequires:  cygwin64-binutils
+BuildRequires:  cygwin64-gcc
+BuildRequires:  cygwin64
+BuildRequires:  cygwin64-zlib
 
-BuildRequires:  cygwin-filesystem
-BuildRequires:  cygwin-binutils
-BuildRequires:  cygwin-gcc
-BuildRequires:  cygwin
-BuildRequires:  cygwin-zlib
 BuildRequires:  mktemp
 BuildRequires:  perl
 BuildRequires:  sed
 BuildRequires:  /usr/bin/cmp
 BuildRequires:  /usr/bin/rename
 # The build script uses /usr/bin/makedepend which comes from imake.
+# We also use lndir below to set up duplicate build trees
 BuildRequires:  imake
 
-Requires:       pkgconfig
-
 
 %description
-The OpenSSL toolkit provides support for secure communications between
-machines. OpenSSL includes a certificate management tool and shared
-libraries which provide various cryptographic algorithms and
-protocols.
+OpenSSL encryption toolkit for Cygwin toolchains.
+
+%package -n cygwin32-openssl
+Summary:        Cygwin32 OpenSSL libraries
+Group:          Development/Libraries
+Provides:       %{name} = %{version}-%{release}
+Obsoletes:      %{name} < %{version}-%{release}
+
+%description -n cygwin32-openssl
+OpenSSL encryption toolkit for the Cygwin i686 toolchain.
+
+%package -n cygwin64-openssl
+Summary:        Cygwin64 OpenSSL libraries
+Group:          Development/Libraries
 
-This package contains Cygwin libraries and development tools.
+%description -n cygwin64-openssl
+OpenSSL encryption toolkit for the Cygwin x86_64 toolchain.
+
+%{?cygwin_debug_package}
 
 
 %prep
 %setup -q -n openssl-%{version}
+%patch0 -p1
+%patch1 -p2
+
+if ! iconv -f UTF-8 -t ASCII//TRANSLIT CHANGES >/dev/null 2>&1 ; then
+  iconv -f ISO-8859-1 -t UTF-8 -o CHANGES.utf8 CHANGES && \
+    mv -f CHANGES.utf8 CHANGES
+fi
 
 
 %build
+# openssl must be built in-tree
+mkdir -p ../build_32bit ../build_64bit
+lndir -silent `pwd` ../build_32bit
+lndir -silent `pwd` ../build_64bit
+mv ../build_32bit ../build_64bit .
+
+pushd build_32bit
 ./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
+  --prefix=%{cygwin32_prefix} \
+  --cross-compile-prefix=%{cygwin32_target}- \
+  shared zlib no-idea no-rc5 Cygwin
 
 make depend
 make all build-shared
+popd
 
-if ! iconv -f UTF-8 -t ASCII//TRANSLIT CHANGES >/dev/null 2>&1 ; then
-  iconv -f ISO-8859-1 -t UTF-8 -o CHANGES.utf8 CHANGES && \
-    mv -f CHANGES.utf8 CHANGES
-fi
+
+mkdir -p build_64bit
+pushd build_64bit
+./Configure \
+  --prefix=%{cygwin64_prefix} \
+  --cross-compile-prefix=%{cygwin64_target}- \
+  shared zlib no-idea no-rc5 no-asm Cygwin-x86_64
+
+make depend
+make all build-shared
+popd
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+pushd build_32bit
+make INSTALL_PREFIX=$RPM_BUILD_ROOT install_sw
+popd
+pushd build_64bit
 make INSTALL_PREFIX=$RPM_BUILD_ROOT install_sw
+popd
 
 # Remove unnecessary static libraries
-rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/lib{crypto,ssl}.a
+rm -f $RPM_BUILD_ROOT%{cygwin32_libdir}/lib{crypto,ssl}.a
+rm -f $RPM_BUILD_ROOT%{cygwin64_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}
+rm -f $RPM_BUILD_ROOT%{cygwin32_bindir}/c_rehash
+rm -f $RPM_BUILD_ROOT%{cygwin32_bindir}/*.exe
+rm -rf $RPM_BUILD_ROOT%{cygwin32_libdir}/engines/
+rm -rf $RPM_BUILD_ROOT%{cygwin32_prefix}/ssl
 
+rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/c_rehash
+rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/*.exe
+rm -rf $RPM_BUILD_ROOT%{cygwin64_libdir}/engines/
+rm -rf $RPM_BUILD_ROOT%{cygwin64_prefix}/ssl
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Documentation already provided by Fedora native package
+rm -rf $RPM_BUILD_ROOT%{cygwin32_mandir}
+rm -rf $RPM_BUILD_ROOT%{cygwin64_mandir}
 
 
-%files
-%defattr(-,root,root,-)
+%files -n cygwin32-openssl
+%doc CHANGES LICENSE NEWS
+%{cygwin32_bindir}/cygcrypto-%{soversion}.dll
+%{cygwin32_bindir}/cygssl-%{soversion}.dll
+%{cygwin32_includedir}/openssl
+%{cygwin32_libdir}/libcrypto.dll.a
+%{cygwin32_libdir}/libssl.dll.a
+%{cygwin32_libdir}/pkgconfig/libcrypto.pc
+%{cygwin32_libdir}/pkgconfig/libssl.pc
+%{cygwin32_libdir}/pkgconfig/openssl.pc
+
+%files -n cygwin64-openssl
 %doc CHANGES LICENSE NEWS
-%{_cygwin_bindir}/cygcrypto-%{soversion}.dll
-%{_cygwin_bindir}/cygssl-%{soversion}.dll
-%{_cygwin_includedir}/openssl
-%{_cygwin_libdir}/libcrypto.dll.a
-%{_cygwin_libdir}/libssl.dll.a
-%{_cygwin_libdir}/pkgconfig/libcrypto.pc
-%{_cygwin_libdir}/pkgconfig/libssl.pc
-%{_cygwin_libdir}/pkgconfig/openssl.pc
+%{cygwin64_bindir}/cygcrypto-%{soversion}.dll
+%{cygwin64_bindir}/cygssl-%{soversion}.dll
+%{cygwin64_includedir}/openssl
+%{cygwin64_libdir}/libcrypto.dll.a
+%{cygwin64_libdir}/libssl.dll.a
+%{cygwin64_libdir}/pkgconfig/libcrypto.pc
+%{cygwin64_libdir}/pkgconfig/libssl.pc
+%{cygwin64_libdir}/pkgconfig/openssl.pc
 
 
 %changelog
-* Sun Feb 16 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.0.1e-1
+* Tue Jul 02 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.0.1e-2
+- Rebuild for new Cygwin packaging scheme.
+- Add cygwin64 package.
+
+* Sun Feb 17 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.0.1e-1
 - Version bump.
 
 * Thu May 24 2012 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.0.1c-1