From 4f39fc9e0cdfa134b544e3770123a16ad46ab537 Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Tue, 19 Jun 2007 18:19:28 +0000
Subject: [PATCH] Minor cleanups.

---
 zziplib.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/zziplib.spec b/zziplib.spec
index 48883f2..71bfd1d 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
 Summary: Lightweight library to easily extract data from zip files
 Name: zziplib
 Version: 0.13.49
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL/MPL
 Group: Applications/Archiving
 URL: http://zziplib.sourceforge.net/
@@ -54,14 +54,18 @@ zziplib library.
 
 %build
 %configure \
+    --disable-static \
     --enable-sdl \
     --enable-frame-pointer
+# Remove rpath on 64bit archs
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' */libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
 %{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 
 
 %clean
@@ -86,7 +90,6 @@ zziplib library.
 %defattr(-,root,root,-)
 %doc docs/README.SDL docs/*.htm
 %{_includedir}/*
-%exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
@@ -96,6 +99,11 @@ zziplib library.
 
 
 %changelog
+* Tue Jun 19 2007 Matthias Saou <http://freshrpms.net/> 0.13.49-2
+- Disable static lib build instead of excluding it later.
+- Remove rpath on 64bit archs.
+- Switch to using DESTDIR install method.
+
 * Mon Mar 26 2007 Matthias Saou <http://freshrpms.net/> 0.13.49-1
 - Update to 0.13.49 to fix CVE-2007-1614 (rhbz #233700).
 - Include new man3 pages to the devel sub-package.