From 7c018f453e9b931c1455a19abaafc35e53fc4cd5 Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert@fedoraproject.org>
Date: Sat, 16 Jul 2011 21:28:43 +0200
Subject: [PATCH] Fix crash in  (#722686) Remove cflags patch, fixed upstream
 Remove sed hack for pod2man now that it does understand the -u option Remove
 fix for the icon in the desktop file as it's now upstream, too

---
 .gitignore  |  1 +
 sakura.spec | 24 +++++++++++++++---------
 sources     |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4aabc8b..a63513c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 sakura-2.3.8.tar.bz2
 /sakura-2.4.0.tar.bz2
+/sakura-2.4.1.tar.bz2
diff --git a/sakura.spec b/sakura.spec
index 2897b34..19e0c3f 100644
--- a/sakura.spec
+++ b/sakura.spec
@@ -1,15 +1,17 @@
 # Review at https://bugzilla.redhat.com/show_bug.cgi?id=496166
 
 Name:           sakura
-Version:        2.4.0
-Release:        1%{?dist}
+Version:        2.4.1
+Release:        2%{?dist}
 Summary:        Terminal emulator based on GTK and VTE
 
 Group:          User Interface/X
 License:        GPLv2
 URL:            http://pleyades.net/david/sakura.php
 Source0:        http://pleyades.net/david/projects/sakura/sakura-%{version}.tar.bz2
-Patch0:         sakura-2.3.3-cflags.patch
+# Patch0 taken from http://bazaar.launchpad.net/~dabisu/sakura/sakura/diff/353
+# fixes https://bugs.launchpad.net/sakura/+bug/811525
+Patch0:         sakura-2.4.1-Destroy-config-file-after-deleting-tabs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16
@@ -24,11 +26,7 @@ have a decent terminal emulator.
 
 %prep
 %setup -q
-# pod2man doesn't understand the --utf8 option
-sed -i 's!${POD2MAN} -u!${POD2MAN}!' CMakeLists.txt
-# fix desktop file (icon is svg instead of png)
-sed -i 's!terminal-tango.png!terminal-tango!' sakura.desktop
-%patch0 -p1 -b .cflags
+%patch0 -p0 -b .destroy-config-file
 
 
 %build
@@ -43,7 +41,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install                                       \
   --delete-original                                        \
   --remove-category=Utility                                \
-  --add-category=System                                    \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
@@ -69,6 +66,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 16 2011 Christoph Wickert <cwickert@fedoraproject.org> - 2.4.1-2
+- Fix crash in  (#722686)
+- Remove cflags patch, fixed upstream
+- Remove sed hack for pod2man now that it does understand the -u option
+- Remove fix for the icon in the desktop file as it's now upstream, too
+
+* Sat Jul 16 2011 Christoph Wickert <cwickert@fedoraproject.org> - 2.4.1-1
+- Update to 2.4.1 (fixes #713822)
+
 * Sat Feb 12 2011 Christoph Wickert <cwickert@fedoraproject.org> - 2.4.0-1
 - Update to 2.4.0
 
diff --git a/sources b/sources
index 78c6b60..aa1cd8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ebc9ac2d0559c11863ed957557e95fef  sakura-2.4.0.tar.bz2
+71644561dea46047dd2bc0c8d8bae823  sakura-2.4.1.tar.bz2