[zziplib] 0.13.60, fix export-dynamic usage
Tom Callaway
spot at fedoraproject.org
Thu Mar 8 18:48:02 UTC 2012
commit 444eea13abcdd857724720473473a5f84be96625
Author: Tom Callaway <spot at fedoraproject.org>
Date: Thu Mar 8 13:48:00 2012 -0500
0.13.60, fix export-dynamic usage
.gitignore | 1 +
sources | 2 +-
zziplib-0.13.60-proper-export-dynamic.patch | 12 +++++++++
zziplib.spec | 36 +++++++++------------------
4 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 20fbc01..8cb8655 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
zziplib-0.13.49.tar.bz2
/zziplib-0.13.59.tar.bz2
+/zziplib-0.13.60.tar.bz2
diff --git a/sources b/sources
index f04c36c..b8a6481 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14b5a6fc229afe9916d48358479568d3 zziplib-0.13.59.tar.bz2
+54a6aa53262483a4d54f7c59f0a7258b zziplib-0.13.60.tar.bz2
diff --git a/zziplib-0.13.60-proper-export-dynamic.patch b/zziplib-0.13.60-proper-export-dynamic.patch
new file mode 100644
index 0000000..411cd34
--- /dev/null
+++ b/zziplib-0.13.60-proper-export-dynamic.patch
@@ -0,0 +1,12 @@
+diff -up zziplib-0.13.60/configure.fix zziplib-0.13.60/configure
+--- zziplib-0.13.60/configure.fix 2012-03-08 13:35:53.989071114 -0500
++++ zziplib-0.13.60/configure 2012-03-08 13:36:10.900929640 -0500
+@@ -13713,7 +13713,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking link options" >&5
+ $as_echo_n "checking link options... " >&6; }
+ ZZIPLIB_LDFLAGS=""
+-test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic"
++test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="-Wl,--export-dynamic"
+ RESOLVES=" # "
+ case "$host_os" in mingw*)
+ ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
diff --git a/zziplib.spec b/zziplib.spec
index 3c344a6..4fe1e10 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,13 +1,13 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
-Version: 0.13.59
-Release: 4%{?dist}
+Version: 0.13.60
+Release: 1%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL: http://zziplib.sourceforge.net/
Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
Patch0: zziplib-0.13.59-multilib.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch1: zziplib-0.13.60-proper-export-dynamic.patch
BuildRequires: perl
BuildRequires: python
BuildRequires: zip
@@ -25,11 +25,10 @@ can bundle files into a single zip archive and access them. The implementation
is based only on the (free) subset of compression with the zlib algorithm
which is actually used by the zip/unzip tools.
-
%package utils
Summary: Utilities for the zziplib library
Group: Applications/Archiving
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description utils
The zziplib library is intentionally lightweight, it offers the ability to
@@ -40,11 +39,10 @@ which is actually used by the zip/unzip tools.
This packages contains all the utilities that come with the zziplib library.
-
%package devel
Summary: Development files for the zziplib library
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
Requires: zlib-devel
Requires: SDL-devel
@@ -59,14 +57,13 @@ which is actually used by the zip/unzip tools.
This package contains files required to build applications that will use the
zziplib library.
-
%prep
%setup -q
%patch0 -p1
+%patch1 -p1 -b .fix
# Save the common patched _config.h file to overwrite the generated one
%{__cp} -a zzip/_config.h _config.h
-
%build
%configure \
--disable-static \
@@ -77,35 +74,24 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' */libtoo
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%{__make} %{?_smp_mflags}
-
%install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
# Overwrite the platform specific _config.h with our own modified common one
-%{__rm} -f %{buildroot}%{_includedir}/zzip/_config.h
-%{__install} -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h
-
-
-%clean
-%{__rm} -rf %{buildroot}
-
+rm -f %{buildroot}%{_includedir}/zzip/_config.h
+install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-
%files
-%defattr(-,root,root,-)
%doc docs/COPYING* ChangeLog README TODO
%{_libdir}/*.so.*
%files utils
-%defattr(-,root,root,-)
%{_bindir}/*
%files devel
-%defattr(-,root,root,-)
%doc docs/README.SDL docs/*.htm
%{_includedir}/*
%exclude %{_libdir}/*.la
@@ -114,8 +100,10 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%{_datadir}/aclocal/*.m4
%{_mandir}/man3/*
-
%changelog
+* Thu Mar 8 2012 Tom Callaway <spot at fedoraproject.org> - 0.13.60-1
+- update to 0.13.60
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.59-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list