Bring back the cflags patch as actually this is not fixed

master
Christoph Wickert 2011-07-17 23:17:57 +02:00
parent 62749ea719
commit 882b223a08
2 changed files with 20 additions and 4 deletions

11
sakura-2.3.3-cflags.patch Normal file
View File

@ -0,0 +1,11 @@
--- 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})

View File

@ -2,16 +2,17 @@
Name: sakura
Version: 2.4.1
Release: 2%{?dist}
Release: 3%{?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 taken from http://bazaar.launchpad.net/~dabisu/sakura/sakura/diff/353
Patch0: sakura-2.3.3-cflags.patch
# Patch1 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
Patch1: 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
@ -26,7 +27,8 @@ have a decent terminal emulator.
%prep
%setup -q
%patch0 -p0 -b .destroy-config-file
%patch0 -p1 -b .cflags
%patch1 -p0 -b .destroy-config-file
%build
@ -66,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Jul 17 2011 Christoph Wickert <cwickert@fedoraproject.org> - 2.4.1-3
- Bring back the cflags patch as actually this is not fixed
* Sat Jul 16 2011 Christoph Wickert <cwickert@fedoraproject.org> - 2.4.1-2
- Fix crash in (#722686)
- Remove cflags patch, fixed upstream