From 264b9c7dd2838bfaaee2eea38b580c28d2b816a4 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Dec 15 2011 20:57:46 +0000
Subject: Update to new snapshot; fix libpng build error.


---

diff --git a/.gitignore b/.gitignore
index 582ad2e..ea4e9bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xu4-20100119svn.tar.xz
 /xu4-20110124svn.tar.xz
 /xu4-20110329svn.tar.xz
+/xu4-20111215svn.tar.xz
diff --git a/sources b/sources
index e40616b..fe7d2a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb58cce1245add364db58e8fa8186e52  xu4-20110329svn.tar.xz
+532856dde43806be61809a36d2573df2  xu4-20111215svn.tar.xz
diff --git a/xu4-zipfile.patch b/xu4-zipfile.patch
deleted file mode 100644
index 16df245..0000000
--- a/xu4-zipfile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur u4.orig/src/u4file.cpp u4/src/u4file.cpp
---- u4.orig/src/u4file.cpp	2004-11-29 06:38:26.000000000 +0100
-+++ u4/src/u4file.cpp	2007-02-02 15:59:34.000000000 +0100
-@@ -236,6 +236,9 @@
-         if (!pathname.empty()) {
-             /* original u4 zip is present */
-             add(new U4ZipPackage(pathname, "ultima4/", false));
-+            /* add twice as sometimes the zip contains an ultima4 dir
-+               and sometimes not */
-+            add(new U4ZipPackage(pathname, "", false));
-         }
-     }
- 
diff --git a/xu4.spec b/xu4.spec
index def890d..4ed7a90 100644
--- a/xu4.spec
+++ b/xu4.spec
@@ -1,9 +1,9 @@
-%define svndate 20110329
-%define svnrev 2873
+%define svndate 20111215
+%define svnrev 2997
 
 Name:           xu4
 Version:        1.1
-Release:        0.15.%{svndate}svn%{svnrev}%{?dist}
+Release:        0.16.%{svndate}svn%{svnrev}%{?dist}
 Summary:        Ultima IV recreated
 Group:          Amusements/Games
 License:        GPLv2+
@@ -13,9 +13,8 @@ Source0:        xu4-%{svndate}svn.tar.xz
 Source1:        xu4.sh
 Source2:        xu4.autodlrc
 Source3:        u4download.txt
-Patch0:         xu4-zipfile.patch
-Patch1:         xu4-1.0beta3-desktop.patch
-Patch2:         xu4-1.1-unbundle.patch
+Patch0:         xu4-1.0beta3-desktop.patch
+Patch1:         xu4-1.1-unbundle.patch
 BuildRequires:  SDL_mixer-devel libxml2-devel minizip-devel
 BuildRequires:  libpng-devel desktop-file-utils
 Requires:       hicolor-icon-theme autodownloader
@@ -35,9 +34,8 @@ spirit of the original game will be added.
 
 %prep
 %setup -q -n u4
-%patch0 -p1 -z .zipfile
-%patch1 -p1 -z .desktop
-%patch2 -p1 -z .unbundle
+%patch0 -p1 -z .desktop
+%patch1 -p1 -z .unbundle
 if [ "%{_lib}" = "lib64" ]; then
   sed -i 's|/usr/lib|%{_libdir}|g' src/u4file.cpp
 fi
@@ -76,17 +74,16 @@ mv %{buildroot}/%{_datadir}/pixmaps/u4.png \
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ]; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
@@ -100,6 +97,11 @@ fi
 
 
 %changelog
+* Thu Dec 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.1-0.16.20111215svn2997
+- Update to new snapshot, fixing (among other things) the libpng build issue.
+- Remove unneeded zipfile patch.
+- Use recommended gtk icon cache scriptlets.
+
 * Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1.1-0.15.20110329svn2873
 - Rebuild for new libpng