From 47a2102c7c0b8f1fe2d959c0eb4158da3f62bb0d Mon Sep 17 00:00:00 2001
From: Dominic Hopf <dmaphy@fedoraproject.org>
Date: Sep 24 2011 15:24:13 +0000
Subject: New upstream release: Terminator 0.96


Conflicts:

	terminator.spec

---

diff --git a/.gitignore b/.gitignore
index 0a464ae..acdf4aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 terminator_0.94.tar.gz
 /terminator_0.95.tar.gz
+/terminator_0.96.tar.gz
diff --git a/sources b/sources
index 1fef6d5..03b30ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ceae5c899c71b9c80e48083c17a631ad  terminator_0.95.tar.gz
+070e3878336b341c9e18339d89ba64fe  terminator_0.96.tar.gz
diff --git a/terminator-fix-NewWindow-issue.patch b/terminator-fix-NewWindow-issue.patch
new file mode 100644
index 0000000..787f748
--- /dev/null
+++ b/terminator-fix-NewWindow-issue.patch
@@ -0,0 +1,11 @@
+--- data/terminator.desktop.in	2011-08-22 20:42:49.000000000 +0200
++++ data/terminator.desktop.in.fedora	2011-09-24 16:08:40.000000000 +0200
+@@ -9,7 +9,7 @@
+ StartupNotify=true
+ X-Ubuntu-Gettext-Domain=terminator
+ X-Ayatana-Desktop-Shortcuts=NewWindow;
+-[NewWindow Shortcut Group]
++[X-NewWindow Shortcut Group]
+ Name=Open a New Window
+ Exec=terminator
+ TargetEnvironment=Unity
diff --git a/terminator.spec b/terminator.spec
index a64324d..c5c461a 100644
--- a/terminator.spec
+++ b/terminator.spec
@@ -1,16 +1,17 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           terminator
-Version:        0.95
-Release:        2%{?dist}
+Version:        0.96
+Release:        1%{?dist}
 Summary:        Store and run multiple GNOME terminals in one window
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.tenshu.net/terminator
 Source0:        http://code.launchpad.net/terminator/trunk/%{version}/+download/terminator_%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         terminator-fix-NewWindow-issue.patch
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel gettext desktop-file-utils intltool
 Requires:       vte gnome-python2-gconf GConf2 gtk2 desktop-file-utils
@@ -28,7 +29,7 @@ arrangements of terminals for different tasks.
 %prep
 %setup -q
 sed -i '/#! \?\/usr.*/d' terminatorlib/*.py
-
+%patch0
 
 %build
 %{__python} setup.py build
@@ -70,6 +71,9 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Sep 24 2011 Dominic Hopf <dmaphy@fedoraproject.org> - 0.96-1
+- New upstream release: Terminator 0.96
+
 * Fri Oct 01 2010 Dominic Hopf <dmaphy@fedoraproject.org> - 0.95-2
 - readd dependency for gnome-python2-bonobo