From fe9d99223b7b474fc62ba7a642a5ec332be23ca4 Mon Sep 17 00:00:00 2001
From: Oliver Haessler <oliver@redhat.com>
Date: Nov 23 2016 16:40:59 +0000
Subject: New Upstream Release: Terminator 1.90


- changed Require of python-psutils to seperate Fedora and EPEL
  (as python2-psutils is only available in Fedora)

---

diff --git a/.gitignore b/.gitignore
index 33974e1..aa1b858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ terminator_0.94.tar.gz
 /terminator_0.96.tar.gz
 /terminator-0.97.tar.gz
 /terminator-0.98.tar.gz
+/terminator-1.90.tar.gz
diff --git a/sources b/sources
index a7c8ec6..e0027ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-241af292fe16bed290052b86adb30b80  terminator-0.98.tar.gz
+7159b1e63e44184ddabdca023d41f763  terminator-1.90.tar.gz
diff --git a/terminator.spec b/terminator.spec
index 56b193b..022b6b5 100644
--- a/terminator.spec
+++ b/terminator.spec
@@ -1,23 +1,17 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           terminator
-Version:        0.98
-Release:        3%{?dist}
+Version:        1.90
+Release:        2%{?dist}
 Summary:        Store and run multiple GNOME terminals in one window
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://gnometerminator.blogspot.com/p/introduction.html
-Source0:        http://code.launchpad.net/terminator/trunk/%{version}/+download/%{name}-%{version}.tar.gz
-Patch0:         0000-terminator-fix-desktop-file.patch
-# Upstream patch for LP#1494606 obtained as diff between v0.98 and r1647
-# of branch lp:terminator, excluding *.po files. Fixes RHBZ#1268289
-Patch1:         0001-terminator-fix-RHBZ#1268289.patch
+Source0:        https://launchpad.net/terminator/gtk3/1.9/+download/terminator-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  python-devel gettext desktop-file-utils intltool
-Requires:       vte gnome-python2-gconf GConf2 gtk2 desktop-file-utils
-Requires:       gnome-python2-bonobo python-keybinder
 
 %if 0%{?rhel}
 Requires:	python-psutil
@@ -25,6 +19,10 @@ Requires:	python-psutil
 Requires:	python2-psutil
 %endif
 
+Requires:       vte3 gnome-python2-gconf GConf2 gtk3 desktop-file-utils
+Requires:       gnome-python2-bonobo python-keybinder
+Patch0:         terminator-fix-NewWindow-issue.patch
+
 
 %description
 Multiple GNOME terminals in one window.  This is a project to produce
@@ -37,8 +35,7 @@ arrangements of terminals for different tasks.
 %prep
 %setup -q
 sed -i '/#! \?\/usr.*/d' terminatorlib/*.py
-%patch0
-%patch1 -p1
+%patch0 -p0
 
 
 %build
@@ -61,7 +58,7 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README COPYING ChangeLog
-%{_datadir}/doc/%{name}/*
+#%{_datadir}/doc/%{name}/*
 %{_mandir}/man1/%{name}.*
 %{_mandir}/man5/%{name}_config.*
 %{_bindir}/%{name}*
@@ -88,10 +85,20 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
-* Wed Oct 21 2015 Oliver Haessler <oliver@redhat.com> - 0.98-3
+* Wed Nov 23 2016 Oliver Haessler <oliver@redhat.com> - 1.90-2
+- New Upstream Release: Terminator 1.90
 - changed Require of python-psutils to seperate Fedora and EPEL
   (as python2-psutils is only available in Fedora)
 
+* Wed Nov 23 2016 Dominic Hopf <dmaphy@fedoraproject.org> - 1.90-1
+- New Upstream Release: Terminator 1.90
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.98-4
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.98-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Sat Oct 10 2015 Marco Driusso <marcodriusso@gmail.com> - 0.98-2
 - apply patch from upstream for fixing RHBZ#1268289 and add dependency to
   python-psutils