[mingw-libzip] Added target for mingw64 (RHBZ #883184)

Erik van Pienbroek epienbro at fedoraproject.org
Sat Dec 8 15:25:53 UTC 2012


commit 69b5676fc5c1dfb6b60e47ba4b96765684cc9873
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Dec 8 16:24:37 2012 +0100

    Added target for mingw64 (RHBZ #883184)

 mingw-libzip.spec |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 7 deletions(-)
---
diff --git a/mingw-libzip.spec b/mingw-libzip.spec
index 4a03105..ef2bc5f 100644
--- a/mingw-libzip.spec
+++ b/mingw-libzip.spec
@@ -1,11 +1,10 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
+%{?mingw_package_header}
 
 %global nativename libzip
 
 Name:           mingw-%{nativename}
 Version:        0.9
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        C library for reading, creating, and modifying zip archives
 
 Group:          System Environment/Libraries
@@ -20,13 +19,18 @@ BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-zlib >= 1.1.2
 
+BuildRequires:  mingw64-filesystem
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-zlib >= 1.1.2
+
 %description
 libzip is a C library for reading, creating, and modifying zip archives. Files
 can be added from data buffers, files, or compressed data copied directly from 
 other zip archives. Changes made without closing the archive can be reverted. 
 The API is documented by man pages.
 
-
+# Win32
 %package -n mingw32-%{nativename}
 Summary:        C library for reading, creating, and modifying zip archives
 
@@ -36,21 +40,35 @@ can be added from data buffers, files, or compressed data copied directly from
 other zip archives. Changes made without closing the archive can be reverted.
 The API is documented by man pages.
 
+# Win64
+%package -n mingw64-%{nativename}
+Summary:        C library for reading, creating, and modifying zip archives
+
+%description -n mingw64-%{nativename}
+libzip is a C library for reading, creating, and modifying zip archives. Files
+can be added from data buffers, files, or compressed data copied directly from
+other zip archives. Changes made without closing the archive can be reverted.
+The API is documented by man pages.
+
+
+%?mingw_debug_package
 
 %prep
 %setup -q -n %{nativename}-%{version}
+autoreconf --install --force
 
 %build
-%{mingw32_configure} --disable-static
-make %{?_smp_mflags}
+%{mingw_configure} --disable-static
+%{mingw_make} %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+%{mingw_make_install} DESTDIR=$RPM_BUILD_ROOT
 
 #Remove files we don't need
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 rm -R $RPM_BUILD_ROOT%{mingw32_datadir}/*
+rm -R $RPM_BUILD_ROOT%{mingw64_datadir}/*
 
 
 %files -n mingw32-%{nativename}
@@ -63,7 +81,20 @@ rm -R $RPM_BUILD_ROOT%{mingw32_datadir}/*
 %{mingw32_libdir}/pkgconfig/libzip.pc
 %{mingw32_includedir}/*.h
 
+%files -n mingw64-%{nativename}
+%doc AUTHORS NEWS README THANKS TODO
+%{mingw64_bindir}/zipcmp.exe
+%{mingw64_bindir}/zipmerge.exe
+%{mingw64_bindir}/ziptorrent.exe
+%{mingw64_bindir}/*.dll
+%{mingw64_libdir}/libzip.dll.a
+%{mingw64_libdir}/pkgconfig/libzip.pc
+%{mingw64_includedir}/*.h
+
 %changelog
+* Mon Dec 03 2012 Alexandru Gagniuc <mr.nuke.me at gmail.com> - 0.9-8
+- Added target for mingw64
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list