From 433c1e8f0d48d906385bb634b2733cca9935251b Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 18 Feb 2013 12:51:50 +0100 Subject: [PATCH] Use upsteam patch instead of hack to fix #861451 - BR /usr/bin/pod2man for manpage generation - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- sakura.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sakura.spec b/sakura.spec index 69c77d1..34f8608 100644 --- a/sakura.spec +++ b/sakura.spec @@ -9,12 +9,16 @@ Group: User Interface/X License: GPLv2 URL: https://launchpad.net/sakura Source0: https://launchpad.net/sakura/trunk/%{version}/+download/sakura-%{version}.tar.bz2 +# Fedora bug: https://bugzilla.redhat.com/861451 +# Upstream bug: https://bugs.launchpad.net/sakura/+bug/1058717 +# Upstream fix: http://bazaar.launchpad.net/~dabisu/sakura/sakura/revision/425 +Patch0: sakura-3.0.4-honor-cflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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 +BuildRequires: cmake desktop-file-utils gettext /usr/bin/pod2man %description Sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator @@ -24,8 +28,9 @@ have a decent terminal emulator. %prep %setup -q +%patch0 -p0 -b .cflags # dirty hack as cmake files no longer honor CMAKE_C_FLAGS -sed -i 's|CMAKE_C_FLAGS ".*"|CMAKE_C_FLAGS "%{optflags}"|g' CMakeLists.txt +#sed -i 's|CMAKE_C_FLAGS ".*"|CMAKE_C_FLAGS "%{optflags}"|g' CMakeLists.txt %build @@ -65,7 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Feb 14 2013 Fedora Release Engineering - 3.0.4-3 +* Mon Feb 19 2013 Christoph Wickert - 3.0.4-3 +- Use upsteam patch instead of hack to fix #861451 +- BR /usr/bin/pod2man for manpage generation - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild * Sat Sep 29 2012 Christoph Wickert - 3.0.4-2