Add cygwin64

2 files changed, 71 insertions, 74 deletions

diff --git a/bzip2-1.0.4-bzip2recover.patch b/bzip2-1.0.4-bzip2recover.patch
deleted file mode 100644
index e2bfe1c..0000000
--- a/bzip2-1.0.4-bzip2recover.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- bzip2-1.0.4/bzip2recover.c.pom	2007-01-03 03:00:55.000000000 +0100
-+++ bzip2-1.0.4/bzip2recover.c	2007-02-05 11:55:17.000000000 +0100
-@@ -309,7 +309,8 @@
-    UInt32      buffHi, buffLo, blockCRC;
-    Char*       p;
- 
--   strcpy ( progName, argv[0] );
-+   strncpy ( progName, argv[0], BZ_MAX_FILENAME-1);
-+   progName[BZ_MAX_FILENAME-1]='\0';
-    inFileName[0] = outFileName[0] = 0;
- 
-    fprintf ( stderr, 
diff --git a/cygwin-bzip2.spec b/cygwin-bzip2.spec
index b367188..cd88ec3 100644
--- a/cygwin-bzip2.spec
+++ b/cygwin-bzip2.spec
@@ -1,102 +1,111 @@
-%define __strip %{_cygwin_strip}
-%define __objdump %{_cygwin_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_cygwin_findrequires}
-%define __find_provides %{_cygwin_findprovides}
-
-# Running the tests requires Wine.
-%define run_tests 0
+%{?cygwin_package_header}
 
 Name:           cygwin-bzip2
 Version:        1.0.6
-Release:        2
+Release:        3
 Summary:        Cygwin port of bzip2 file compression utility
 
 License:        BSD
 Group:          Development/Libraries
 URL:            http://www.bzip.org/
 Source0:        http://www.bzip.org/%{version}/bzip2-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Patch6:         bzip2-1.0.4-bzip2recover.patch
 Patch11:        bzip2-1.0.6-cygwin-dll.patch
 
-BuildRequires:  cygwin-filesystem
-BuildRequires:  cygwin-binutils
-BuildRequires:  cygwin-gcc
-BuildRequires:  cygwin
-
-%if %{run_tests}
-BuildRequires:  wine
-%endif
+BuildRequires:  cygwin32-filesystem
+BuildRequires:  cygwin32-binutils
+BuildRequires:  cygwin32-gcc
+BuildRequires:  cygwin32
 
+BuildRequires:  cygwin64-filesystem
+BuildRequires:  cygwin64-binutils
+BuildRequires:  cygwin64-gcc
+BuildRequires:  cygwin64
 
 %description
-Bzip2 is a freely available, patent-free, high quality data compressor.
-Bzip2 compresses files to within 10 to 15 percent of the capabilities 
-of the best techniques available.  However, bzip2 has the added benefit 
-of being approximately two times faster at compression and six times 
-faster at decompression than those techniques.  Bzip2 is not the 
-fastest compression utility, but it does strike a balance between speed 
-and compression capability.
+BZip2 library for the Cygwin cross-compiler toolchains.
+
+%package -n cygwin32-bzip2
+Summary:        BZip2 library for Cygwin32 toolchain
+Group:          Development/Libraries
+Provides:       %{name} = %{version}-%{release}
+Obsoletes:      %{name} < %{version}-%{release}
+
+%description -n cygwin32-bzip2
+BZip2 library for the Cygwin i686 cross-compiler toolchain.
+
+%package -n cygwin64-bzip2
+Summary:        BZip2 library for Cygwin64 toolchain
+Group:          Development/Libraries
 
-This package contains development tools and libraries for use when
-cross-compiling Cygwin software in Fedora.
+%description -n cygwin64-bzip2
+BZip2 library for the Cygwin x86_64 cross-compiler toolchain.
+
+%{?cygwin_debug_package}
 
 
 %prep
 %setup -q -n bzip2-%{version}
-
-%patch6 -p1 -b .bz2recover
 %patch11 -p1 -b .dll
 
 
 %build
-make -f Makefile-libbz2_so \
-  CC="%{_cygwin_cc}" \
-  AR="%{_cygwin_ar}" \
-  RANLIB="%{_cygwin_ranlib}" \
-  CFLAGS="%{_cygwin_cflags}" \
+mkdir -p build_32bit
+pushd build_32bit
+ln -s ../*.c ../*.h .
+make -f ../Makefile-libbz2_so \
+  CC="%{cygwin32_cc}" \
+  AR="%{cygwin32_ar}" \
+  RANLIB="%{cygwin32_ranlib}" \
+  CFLAGS="%{cygwin32_cflags}" \
   %{?_smp_mflags} all
-
-# only needed for static libs or tests
-%if 0
-rm -f *.o
-make CC="%{_cygwin_cc}" \
-  AR="%{_cygwin_ar}" \
-  RANLIB="%{_cygwin_ranlib}" \
-  CFLAGS="%{_cygwin_cflags}" \
-  %{?_smp_mflags} \
-%if %{run_tests}
-  all
-%else
-  libbz2.a
-%endif
-%endif
+popd
+
+mkdir -p build_64bit
+pushd build_64bit
+ln -s ../*.c ../*.h .
+make -f ../Makefile-libbz2_so \
+  CC="%{cygwin64_cc}" \
+  AR="%{cygwin64_ar}" \
+  RANLIB="%{cygwin64_ranlib}" \
+  CFLAGS="%{cygwin64_cflags}" \
+  %{?_smp_mflags} all
+popd
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+pushd build_32bit
+install -D -m0755 cygbz2-1.dll $RPM_BUILD_ROOT%{cygwin32_bindir}/cygbz2-1.dll
+install -D -m0644 bzlib.h $RPM_BUILD_ROOT%{cygwin32_includedir}/bzlib.h
+install -D -m0644 libbz2.dll.a $RPM_BUILD_ROOT%{cygwin32_libdir}/libbz2.dll.a
+popd
 
-install -D -m0755 cygbz2-1.dll $RPM_BUILD_ROOT%{_cygwin_bindir}/cygbz2-1.dll
-install -D -m0644 bzlib.h $RPM_BUILD_ROOT%{_cygwin_includedir}/bzlib.h
-install -D -m0644 libbz2.dll.a $RPM_BUILD_ROOT%{_cygwin_libdir}/libbz2.dll.a
+pushd build_64bit
+install -D -m0755 cygbz2-1.dll $RPM_BUILD_ROOT%{cygwin64_bindir}/cygbz2-1.dll
+install -D -m0644 bzlib.h $RPM_BUILD_ROOT%{cygwin64_includedir}/bzlib.h
+install -D -m0644 libbz2.dll.a $RPM_BUILD_ROOT%{cygwin64_libdir}/libbz2.dll.a
+popd
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+%files -n cygwin32-bzip2
+%doc LICENSE
+%{cygwin32_bindir}/cygbz2-1.dll
+%{cygwin32_includedir}/bzlib.h
+%{cygwin32_libdir}/libbz2.dll.a
 
-%files
-%defattr(-,root,root,-)
+%files -n cygwin64-bzip2
 %doc LICENSE
-%{_cygwin_bindir}/cygbz2-1.dll
-%{_cygwin_includedir}/bzlib.h
-%{_cygwin_libdir}/libbz2.dll.a
+%{cygwin64_bindir}/cygbz2-1.dll
+%{cygwin64_includedir}/bzlib.h
+%{cygwin64_libdir}/libbz2.dll.a
 
 
 %changelog
+* Sun Jun 30 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.0.6-3
+- Rebuild for new Cygwin packaging scheme.
+- Add cygwin64 package.
+
 * Sun Aug 21 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.0.6-2
 - Remove Cygwin EXEs.