[xu4] New snapshot; unbundle the zip lib.

[Jason ティビツ]

commit 44b35414a977d5637e42e7cd8eb55f3f1c7bfae5
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Tue Mar 29 20:39:05 2011 -0500

    New snapshot; unbundle the zip lib.

 xu4-1.1-buildfix.patch |   35 -----------------------------------
 xu4-1.1-unbundle.patch |   37 +++++++++++++++++++++++++++++++++++++
 xu4.spec               |   18 +++++++++++-------
 3 files changed, 48 insertions(+), 42 deletions(-)
---
diff --git a/xu4-1.1-unbundle.patch b/xu4-1.1-unbundle.patch
new file mode 100644
index 0000000..49762f3
--- /dev/null
+++ b/xu4-1.1-unbundle.patch
@@ -0,0 +1,37 @@
+diff -up u4/src/Makefile.common.unbundle u4/src/Makefile.common
+--- u4/src/Makefile.common.unbundle	2011-03-29 20:31:06.682285027 -0500
++++ u4/src/Makefile.common	2011-03-29 20:31:15.882001317 -0500
+@@ -6,7 +6,6 @@ VERSION=1.1svn
+ CSRCS=\
+         lzw/hash.c \
+         lzw/lzw.c \
+-        unzip.c \
+         $(NULL)
+ 
+ CXXSRCS=\
+diff -up u4/src/Makefile.unbundle u4/src/Makefile
+--- u4/src/Makefile.unbundle	2010-12-13 16:50:58.000000000 -0600
++++ u4/src/Makefile	2011-03-29 20:23:10.861965251 -0500
+@@ -15,7 +15,7 @@ FEATURES=-DHAVE_BACKTRACE=1 -DHAVE_VARIA
+ DEBUGCXXFLAGS=-ggdb1 -rdynamic -g -O0 -fno-inline -fno-eliminate-unused-debug-types -gstabs -g3
+ CXXFLAGS=$(FEATURES) -Wall -I. $(UIFLAGS) $(shell xml2-config --cflags) -DICON_FILE=\"$(datadir)/pixmaps/u4.bmp\" -DVERSION=\"$(VERSION)\" $(DEBUGCXXFLAGS)
+ CFLAGS=$(CXXFLAGS)
+-LIBS=$(UILIBS) $(shell xml2-config --libs) -lpng
++LIBS=$(UILIBS) $(shell xml2-config --libs) -lpng $(EXTRALIBS)
+ INSTALL=install
+ 
+ ifeq ($(STATIC_GCC_LIBS),true)
+diff -up u4/src/u4file.cpp.unbundle u4/src/u4file.cpp
+--- u4/src/u4file.cpp.unbundle	2011-03-29 20:23:10.856965406 -0500
++++ u4/src/u4file.cpp	2011-03-29 20:23:10.868965036 -0500
+@@ -4,9 +4,9 @@
+ 
+ #include <cctype>
+ #include <cstdlib>
++#include <unzip.h>
+ 
+ #include "u4file.h"
+-#include "unzip.h"
+ #include "debug.h"
+ #ifdef MACOSX
+ #include <libgen.h>
diff --git a/xu4.spec b/xu4.spec
index 10c3894..f88f977 100644
--- a/xu4.spec
+++ b/xu4.spec
@@ -1,9 +1,9 @@
 %define svndate 20110329
-%define svnrev 2869
+%define svnrev 2873
 
 Name:           xu4
 Version:        1.1
-Release:        0.13.%{svndate}svn%{svnrev}%{?dist}
+Release:        0.14.%{svndate}svn%{svnrev}%{?dist}
 Summary:        Ultima IV recreated
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,8 +15,8 @@ Source2:        xu4.autodlrc
 Source3:        u4download.txt
 Patch0:         xu4-zipfile.patch
 Patch1:         xu4-1.0beta3-desktop.patch
-Patch2:         xu4-1.1-buildfix.patch
-BuildRequires:  SDL_mixer-devel libxml2-devel
+Patch2:         xu4-1.1-unbundle.patch
+BuildRequires:  SDL_mixer-devel libxml2-devel minizip-devel
 BuildRequires:  libpng-devel desktop-file-utils
 Requires:       hicolor-icon-theme autodownloader
 
@@ -37,7 +37,7 @@ spirit of the original game will be added.
 %setup -q -n u4
 %patch0 -p1 -z .zipfile
 %patch1 -p1 -z .desktop
-%patch2 -p1 -z .buildfix
+%patch2 -p1 -z .unbundle
 if [ "%{_lib}" = "lib64" ]; then
   sed -i 's|/usr/lib|%{_libdir}|g' src/u4file.cpp
 fi
@@ -46,14 +46,14 @@ cp %{SOURCE3} .
 
 %build
 pushd src
-make DEBUGCXXFLAGS="%{optflags}" \
+make DEBUGCXXFLAGS="%{optflags}" EXTRALIBS=-lminizip\
   bindir=%{_bindir} datadir=%{_datadir} libdir=%{_libdir} %{?_smp_mflags}
 popd
 
 
 %install
 pushd src
-# Note: make install DESTDIR=%{buildroot}, doesn't work
+# Note: make install DESTDIR=%%{buildroot}, doesn't work
 %{makeinstall}
 find %{buildroot}/%{_libdir}/u4 -name '*.xml' -o -name '*.dtd'|xargs chmod -x
 popd
@@ -100,6 +100,10 @@ fi
 
 
 %changelog
+* Tue Mar 29 2011 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1-0.14.20110329svn2873
+- Slightly newer snapshot with more fixes.
+- Use the system minizip library instead of the ancient bundled version.
+
 * Tue Mar 29 2011 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1-0.13.20110329svn2869
 - Update to latest SVN snapshot.
 - Drop gcc46 patch; no longer needed.