From 6add4d5eca4232f035f219ca6fd66b11ef8d5e64 Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert@fedoraproject.org>
Date: Thu, 27 Sep 2012 12:14:46 +0200
Subject: [PATCH] Update to 3.0.4 (#860958)

- Build against GTK3 and VTE3
- Change website and source URL to new location at launchpad.net
---
 .gitignore                |  1 +
 sakura-2.3.3-cflags.patch | 11 -----------
 sakura.spec               | 20 ++++++++++++--------
 sources                   |  2 +-
 4 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 sakura-2.3.3-cflags.patch

diff --git a/.gitignore b/.gitignore
index 4cba14c..1b131b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ sakura-2.3.8.tar.bz2
 /sakura-2.4.0.tar.bz2
 /sakura-2.4.1.tar.bz2
 /sakura-2.4.2.tar.bz2
+/sakura-3.0.4.tar.bz2
diff --git a/sakura-2.3.3-cflags.patch b/sakura-2.3.3-cflags.patch
deleted file mode 100644
index e7de038..0000000
--- a/sakura-2.3.3-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sakura-2.3.3.orig/CMakeLists.txt	2009-01-31 09:55:18.000000000 +0100
-+++ sakura-2.3.3/CMakeLists.txt	2009-04-19 02:47:59.000000000 +0200
-@@ -34,8 +34,6 @@
- 
- IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
- 	SET (CMAKE_C_FLAGS "-Wall")
--ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
--	SET (CMAKE_C_FLAGS "-O2")
- ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
- 
- INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})
diff --git a/sakura.spec b/sakura.spec
index ff99920..78e51ee 100644
--- a/sakura.spec
+++ b/sakura.spec
@@ -1,19 +1,19 @@
 # Review at https://bugzilla.redhat.com/show_bug.cgi?id=496166
 
 Name:           sakura
-Version:        2.4.2
-Release:        4%{?dist}
+Version:        3.0.4
+Release:        1%{?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
+URL:            https://launchpad.net/sakura
+Source0:        https://launchpad.net/sakura/trunk/%{version}/+download/sakura-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.16
-BuildRequires:  vte-devel >= 0.26
+BuildRequires:  pkgconfig(glib-2.0) >= 2.20
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(vte-2.90) >= 0.28
 BuildRequires:  cmake desktop-file-utils gettext
 
 %description
@@ -24,7 +24,6 @@ have a decent terminal emulator.
 
 %prep
 %setup -q
-%patch0 -p1 -b .cflags
 
 
 %build
@@ -64,6 +63,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 27 2012 Christoph Wickert <cwickert@fedoraproject.org> - 3.0.4-1
+- Update to 3.0.4 (#860958)
+- Build against GTK3 and VTE3
+- Change website and source URL to new location at launchpad.net
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 948c81a..7b59f0d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46669519c77f7402b2de24cdefe251bb  sakura-2.4.2.tar.bz2
+1e27cd500f090784544ff9ab3fca9cf6  sakura-3.0.4.tar.bz2