raphgro pushed to xfce4-hamster-plugin (epel7). "Merge branch 'master' into f22"

[notifications at fedoraproject.org]

>From ca72705018af196f36972c18fe9b69a9c53dc159 Mon Sep 17 00:00:00 2001
From: Raphael Groner <projects.rg at smart.ms>
Date: Sat, 7 Mar 2015 13:54:17 +0100
Subject: v1.6.1


diff --git a/.gitignore b/.gitignore
index 1157c9b..07761f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /xfce4-hamster-plugin-1.6.tar.gz
 /1e3e1c9bfa33558fa1fbb00ad2288369b0e1d82a.patch
 /95655e22b62c4d26cf22c8769ee4275e09011965.patch
+/xfce4-hamster-plugin-1.6.1.tar.gz
diff --git a/sources b/sources
index 302c4a2..16d96d3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-6a3c0fd152a26b930a48b38f96324ca7  xfce4-hamster-plugin-1.6.tar.gz
-f0c046f6b35b105ae6c62c0bfeb4fccf  1e3e1c9bfa33558fa1fbb00ad2288369b0e1d82a.patch
-d1c25529d73793a3df1529eb9cde9dce  95655e22b62c4d26cf22c8769ee4275e09011965.patch
+cd8df047da3eba44b6ad749b3a5ce5d6  xfce4-hamster-plugin-1.6.1.tar.gz
diff --git a/xfce4-hamster-plugin.spec b/xfce4-hamster-plugin.spec
index 1446dd9..deac711 100644
--- a/xfce4-hamster-plugin.spec
+++ b/xfce4-hamster-plugin.spec
@@ -1,16 +1,12 @@
 Name:           xfce4-hamster-plugin
-Version:        1.6
-Release:        5%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        Time tracker port of the 'hamster project extension' for the xfce4 panel
 
 License:        GPLv2+
 URL:            https://github.com/projecthamster/%{name}
-Source0:        %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-
-# spanish translation, should be included in the next upstream version 1.6.1 or 1.7
-# https://github.com/projecthamster/xfce4-hamster-plugin/issues/28
-Patch0:          %{url}/commit/1e3e1c9bfa33558fa1fbb00ad2288369b0e1d82a.patch
-Patch1:          %{url}/commit/95655e22b62c4d26cf22c8769ee4275e09011965.patch
+#Source0:        %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires:  xfce4-panel-devel xfconf-devel
 BuildRequires:  intltool libtool gettext
@@ -25,8 +21,6 @@ See also the hamster project: <https://github.com/projecthamster>
 
 %prep
 %setup -qn %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
 sh autogen.sh
 
 
@@ -52,6 +46,9 @@ libtool --finish %{buildroot}%{_libdir}/xfce4/panel/plugins
 
 
 %changelog
+* Sat Mar 07 2015 Raphael Groner <projects.rg at smart.ms> - 1.6.1-1
+- v1.6.1
+
 * Fri Mar 06 2015 Raphael Groner <projects.rg at smart.ms> - 1.6-5
 - add spanish translations
 - remove obsolete comments at closed upstream issues
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xfce4-hamster-plugin.git/commit/?h=epel7&id=0659741e1c32518efb6ec3a57de3deb10e9057f2