summaryrefslogtreecommitdiffstats
path: root/cygwin-crypt.spec
diff options
context:
space:
mode:
Diffstat (limited to 'cygwin-crypt.spec')
-rw-r--r--cygwin-crypt.spec128
1 files changed, 93 insertions, 35 deletions
diff --git a/cygwin-crypt.spec b/cygwin-crypt.spec
index 32ab7e0..e432e68 100644
--- a/cygwin-crypt.spec
+++ b/cygwin-crypt.spec
@@ -1,76 +1,134 @@
-%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}
Name: cygwin-crypt
Version: 1.1
-Release: 1
+Release: 2
Summary: Cygwin crypt library
License: GPLv2+
Group: Development/Libraries
URL: http://cygwin.com/
+BuildArch: noarch
+
Source0: ftp://sourceware.org/pub/cygwin/release/crypt/crypt-%{version}-1-src.tar.bz2
Patch0: crypt-1.1-AR.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
+Patch1: crypt-1.1-no-strip.patch
-BuildRequires: cygwin-filesystem
-BuildRequires: cygwin-gcc
-BuildRequires: cygwin-binutils
+BuildRequires: cygwin32-filesystem
+BuildRequires: cygwin32-gcc
+BuildRequires: cygwin32-binutils
+
+BuildRequires: cygwin64-filesystem
+BuildRequires: cygwin64-gcc
+BuildRequires: cygwin64-binutils
%description
-Cygwin crypt library.
+crypt(3) library for Cygwin toolchains.
+
+%package -n cygwin32-crypt
+Summary: Cygwin32 crypt library.
+Group: Development/Libraries
+Provides: %{name} = %{version}-%{release}
+Obsoletes: %{name} < %{version}-%{release}
+
+%description -n cygwin32-crypt
+crypt(3) library for Cygwin i686 cross-compiler toolchain.
-%package static
-Summary: Static version of the Cygwin crypt library.
+%package -n cygwin32-crypt-static
+Summary: Static version of the Cygwin32 crypt library.
Group: Development/Libraries
-Requires: cygwin-crypt = %{version}-%{release}
+Requires: cygwin32-crypt = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
+Obsoletes: %{name}-static < %{version}-%{release}
-%description static
-Static version of the Cygwin crypt library.
+%description -n cygwin32-crypt-static
+Static version of the Cygwin i686 crypt(3) library.
+
+%package -n cygwin64-crypt
+Summary: Cygwin64 crypt library.
+Group: Development/Libraries
+
+%description -n cygwin64-crypt
+crypt(3) library for Cygwin x86_64 cross-compiler toolchain.
+
+%package -n cygwin64-crypt-static
+Summary: Static version of the Cygwin64 crypt library.
+Group: Development/Libraries
+Requires: cygwin64-crypt = %{version}-%{release}
+
+%description -n cygwin64-crypt-static
+Static version of the Cygwin x86_64 crypt(3) library.
+
+%{?cygwin_debug_package}
%prep
%setup -q -n crypt-%{version}-1
%patch0 -p1
+%patch1 -p2
+
%build
+mkdir -p build_32bit
+pushd build_32bit
+ln -s ../*.* ../Makefile .
make %{?_smp_flags} \
- CC=%{_cygwin_cc} \
- AR=%{_cygwin_ar} \
- CFLAGS="%{_cygwin_cflags}"
+ CC=%{cygwin32_cc} \
+ AR=%{cygwin32_ar} \
+ CFLAGS="%{cygwin32_cflags}"
+popd
+
+mkdir -p build_64bit
+pushd build_64bit
+ln -s ../*.* ../Makefile .
+make %{?_smp_flags} \
+ CC=%{cygwin64_cc} \
+ AR=%{cygwin64_ar} \
+ CFLAGS="%{cygwin64_cflags}"
+popd
%install
-rm -rf $RPM_BUILD_ROOT
+pushd build_32bit
+ make install DESTDIR=$RPM_BUILD_ROOT prefix=%{cygwin32_prefix}
+popd
+pushd build_64bit
+ make install DESTDIR=$RPM_BUILD_ROOT prefix=%{cygwin64_prefix}
+popd
-%{_cygwin_makeinstall}
+# docs will be installed later with %%doc
+rm -fr $RPM_BUILD_ROOT%{cygwin32_docdir}
+rm -fr $RPM_BUILD_ROOT%{cygwin64_docdir}
-rm -fr $RPM_BUILD_ROOT%{_cygwin_prefix}/share/doc/Cygwin
+# Remove Cygwin executables
+rm -f $RPM_BUILD_ROOT%{cygwin32_bindir}/*.exe
+rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/*.exe
-%clean
-rm -rf $RPM_BUILD_ROOT
+%files -n cygwin32-crypt
+%doc crypt.README
+%{cygwin32_bindir}/cygcrypt-0.dll
+%{cygwin32_includedir}/crypt.h
+%{cygwin32_libdir}/libcrypt.dll.a
+%files -n cygwin32-crypt-static
+%{cygwin32_libdir}/libcrypt.a
-%files
-%defattr(-,root,root,-)
+%files -n cygwin64-crypt
%doc crypt.README
-%{_cygwin_bindir}/cygcrypt-0.dll
-%{_cygwin_bindir}/crypt.exe
-%{_cygwin_includedir}/crypt.h
-%{_cygwin_libdir}/libcrypt.dll.a
+%{cygwin64_bindir}/cygcrypt-0.dll
+%{cygwin64_includedir}/crypt.h
+%{cygwin64_libdir}/libcrypt.dll.a
-
-%files static
-%defattr(-,root,root,-)
-%{_cygwin_libdir}/libcrypt.a
+%files -n cygwin64-crypt-static
+%{cygwin64_libdir}/libcrypt.a
%changelog
+* Mon Jul 01 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.1-2
+- Rebuild for new Cygwin packaging scheme.
+- Add cygwin64 package.
+
* Sun Mar 13 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.1-1
- Initial RPM release.