[sakura] Update to 3.1.0
Christoph Wickert
cwickert at fedoraproject.org
Tue Jun 25 09:27:48 UTC 2013
commit 4a01d4c61a3fdf38c6487fa19b2ae57cb6db3d1d
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Tue Jun 25 11:27:38 2013 +0200
Update to 3.1.0
.gitignore | 1 +
sakura-3.0.4-honor-cflags.patch | 16 ----------------
sakura.spec | 32 ++++++++++++++------------------
sources | 2 +-
4 files changed, 16 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1b131b6..4023974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ sakura-2.3.8.tar.bz2
/sakura-2.4.1.tar.bz2
/sakura-2.4.2.tar.bz2
/sakura-3.0.4.tar.bz2
+/sakura-3.1.0.tar.bz2
diff --git a/sakura.spec b/sakura.spec
index 34f8608..57c2158 100644
--- a/sakura.spec
+++ b/sakura.spec
@@ -1,18 +1,14 @@
# Review at https://bugzilla.redhat.com/show_bug.cgi?id=496166
Name: sakura
-Version: 3.0.4
-Release: 3%{?dist}
+Version: 3.1.0
+Release: 1%{?dist}
Summary: Terminal emulator based on GTK and VTE
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
@@ -28,9 +24,6 @@ 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
%build
@@ -40,16 +33,16 @@ make VERBOSE=1 %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install \
- --delete-original \
- --remove-category=Utility \
- --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+desktop-file-install \
+ --delete-original \
+ --remove-category=Utility \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
# location of the docs is hardcoded, so we remove them
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/
+rm -rf %{buildroot}%{_datadir}/doc/
#%check
@@ -57,7 +50,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -f %{name}.lang
@@ -70,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jun 25 2013 Christoph Wickert <cwickert at fedoraproject.org> - 3.1.0-1
+- Update to 3.1.0
+
* Mon Feb 19 2013 Christoph Wickert <cwickert at fedoraproject.org> - 3.0.4-3
- Use upsteam patch instead of hack to fix #861451
- BR /usr/bin/pod2man for manpage generation
diff --git a/sources b/sources
index 7b59f0d..eecb4ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e27cd500f090784544ff9ab3fca9cf6 sakura-3.0.4.tar.bz2
+3c4404df2757fd34d57ad00094126433 sakura-3.1.0.tar.bz2
More information about the scm-commits
mailing list