From b5b5a8177d7e9f3dae1a253381200b866c829605 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] Build static subpackages (Erik van Pienbroek) --- curl/mingw32-curl.spec | 36 ++++++++++++++++++++++++++++-------- libidn/mingw32-libidn.spec | 23 ++++++++++++++++++++--- libssh2/mingw32-libssh2.spec | 23 ++++++++++++++++++++--- 3 files changed, 68 insertions(+), 14 deletions(-) diff --git a/curl/mingw32-curl.spec b/curl/mingw32-curl.spec index 2c9a005..14bffee 100644 --- a/curl/mingw32-curl.spec +++ b/curl/mingw32-curl.spec @@ -5,8 +5,8 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-curl -Version: 7.18.2 -Release: 6%{?dist} +Version: 7.19.4 +Release: 1%{?dist} Summary: MinGW Windows port of curl and libcurl License: MIT @@ -21,8 +21,8 @@ BuildArch: noarch Patch1: curl-7.15.3-multilib.patch Patch2: curl-7.16.0-privlibs.patch Patch3: curl-7.17.1-badsocket.patch -Patch4: curl-7.18.2-nssproxy.patch -Patch5: curl-7.18.2-nss-thread-safety.patch +Patch4: curl-7.19.4-tool-leak.patch +Patch5: curl-7.19.4-enable-aes.patch # MinGW-specific patches. Patch1000: mingw-curl-7.18.2-getaddrinfo.patch @@ -62,14 +62,23 @@ resume. This is the MinGW cross-compiled Windows library. +%package static +Summary: Static version of the MinGW Windows Curl library +Requires: %{name} = %{version}-%{release} +Group: Development/Libraries + +%description static +Static version of the MinGW Windows Curl library. + + %prep %setup -q -n curl-%{version} %patch1 -p1 -b .multilib %patch2 -p1 -b .privlibs %patch3 -p1 -b .badsocket -%patch4 -p1 -b .nssproxy -%patch5 -p1 -b .nssthreadsafety +%patch4 -p1 -b .toolleak +%patch5 -p1 -b .enableaes %patch1000 -p1 -b .getaddrinfo @@ -79,7 +88,7 @@ This is the MinGW cross-compiled Windows library. --with-ssl --enable-ipv6 \ --with-ca-bundle=%{_mingw32_sysconfdir}/pki/tls/certs/ca-bundle.crt \ --with-libidn \ - --disable-static --with-libssh2 \ + --enable-static --with-libssh2 \ --without-random # It's not clear where to set the --with-ca-bundle path. This is the @@ -116,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc COPYING %{_mingw32_bindir}/curl-config %{_mingw32_bindir}/curl.exe @@ -127,7 +136,18 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_includedir}/curl/ +%files static +%defattr(-,root,root,-) +%{_mingw32_libdir}/libcurl.a + %changelog +* Fri Apr 3 2009 Erik van Pienbroek - 7.19.4-1 +- Update to version 7.19.4 +- Fixed %%defattr line +- Added -static subpackage. Applications which want to use this + static library need to add -DCURL_STATICLIB to the CFLAGS +- Merged the patches of the native .spec file (7.19.4-5) + * Fri Feb 20 2009 Richard W.M. Jones - 7.18.2-6 - Rebuild for mingw32-gcc 4.4 diff --git a/libidn/mingw32-libidn.spec b/libidn/mingw32-libidn.spec index 3612398..8692617 100644 --- a/libidn/mingw32-libidn.spec +++ b/libidn/mingw32-libidn.spec @@ -10,7 +10,7 @@ Name: mingw32-libidn Version: 1.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows Internationalized Domain Name support library License: LGPLv2+ @@ -41,6 +41,15 @@ Names (IDN) working group, used for internationalized domain names. +%package static +Summary: Static version of the MinGW Windows IDN library +Requires: %{name} = %{version}-%{release} +Group: Development/Libraries + +%description static +Static version of the MinGW Windows IDN library. + + %prep %setup -q -n libidn-%{version} #%patch0 -p1 -b .aconf262 @@ -48,7 +57,7 @@ names. %build -%{_mingw32_configure} --disable-csharp --disable-static +%{_mingw32_configure} --disable-csharp --enable-static --enable-shared make %{?_smp_mflags} @@ -67,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc COPYING COPYING.LIB %{_mingw32_bindir}/idn.exe %{_mingw32_bindir}/libidn-11.dll @@ -78,7 +87,15 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_datadir}/locale/*/LC_MESSAGES/libidn.mo +%files static +%defattr(-,root,root,-) +%{_mingw32_libdir}/libidn.a + %changelog +* Fri Apr 3 2009 Erik van Pienbroek - 1.9-5 +- Added -static subpackage +- Fixed %%defattr line + * Fri Feb 20 2009 Richard W.M. Jones - 1.9-4 - Rebuild for mingw32-gcc 4.4 diff --git a/libssh2/mingw32-libssh2.spec b/libssh2/mingw32-libssh2.spec index 1a63774..7f00ccf 100644 --- a/libssh2/mingw32-libssh2.spec +++ b/libssh2/mingw32-libssh2.spec @@ -6,7 +6,7 @@ Name: mingw32-libssh2 Version: 0.18 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW Windows library implementing the SSH2 protocol License: BSD @@ -41,6 +41,15 @@ SECSH-CONNECTION(23), SECSH-ARCH(20), SECSH-FILEXFER(06)*, SECSH-DHGEX(04), and SECSH-NUMBERS(10). +%package static +Summary: Static version of the MinGW Windows SSH2 library +Requires: %{name} = %{version}-%{release} +Group: Development/Libraries + +%description static +Static version of the MinGW Windows SSH2 library. + + %prep %setup -q -n libssh2-%{version} @@ -55,7 +64,7 @@ autoreconf %build -%{_mingw32_configure} --disable-static --enable-shared +%{_mingw32_configure} --enable-static --enable-shared make %{?_smp_mflags} @@ -72,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc COPYING %{_mingw32_bindir}/libssh2-1.dll %{_mingw32_libdir}/libssh2.dll.a @@ -82,7 +91,15 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_includedir}/libssh2_sftp.h +%files static +%defattr(-,root,root,-) +%{_mingw32_libdir}/libssh2.a + %changelog +* Fri Apr 3 2009 Erik van Pienbroek - 0.18-6 +- Added -static subpackage +- Fixed %%defattr line + * Fri Feb 20 2009 Richard W.M. Jones - 0.18-5 - Rebuild for mingw32-gcc 4.4 -- 1.8.3.1