raphgro pushed to xfce4-hamster-plugin (epel7). "Merge branch 'master' into f22"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Mar 26 16:04:54 UTC 2015
>From c4dc63818d18be0783314749bab3977a77c334e9 Mon Sep 17 00:00:00 2001
From: Raphael Groner <projects.rg at smart.ms>
Date: Fri, 6 Mar 2015 21:26:28 +0100
Subject: add spanish translations and polish spec file
diff --git a/.gitignore b/.gitignore
index 8610642..1157c9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/xfce4-hamster-plugin-1.5.tar.gz
/xfce4-hamster-plugin-libxfce4ui.patch
/xfce4-hamster-plugin-1.6.tar.gz
+/1e3e1c9bfa33558fa1fbb00ad2288369b0e1d82a.patch
+/95655e22b62c4d26cf22c8769ee4275e09011965.patch
diff --git a/sources b/sources
index b684ee0..302c4a2 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
6a3c0fd152a26b930a48b38f96324ca7 xfce4-hamster-plugin-1.6.tar.gz
+f0c046f6b35b105ae6c62c0bfeb4fccf 1e3e1c9bfa33558fa1fbb00ad2288369b0e1d82a.patch
+d1c25529d73793a3df1529eb9cde9dce 95655e22b62c4d26cf22c8769ee4275e09011965.patch
diff --git a/xfce4-hamster-plugin.spec b/xfce4-hamster-plugin.spec
index c44f256..1446dd9 100644
--- a/xfce4-hamster-plugin.spec
+++ b/xfce4-hamster-plugin.spec
@@ -1,26 +1,22 @@
-%global bname xfce4-popup-hamstermenu
-
-##hamster-applet has dead upstream, hamster-time-tracker is the new hope
-##see https://github.com/projecthamster/xfce4-hamster-plugin/issues/11
-%global tracker hamster-time-tracker
-
Name: xfce4-hamster-plugin
Version: 1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Time tracker port of the 'hamster project extension' for the xfce4 panel
License: GPLv2+
-URL: https://github.com/projecthamster/%{name}/
-Source0: https://github.com/projecthamster/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+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
BuildRequires: xfce4-panel-devel xfconf-devel
BuildRequires: intltool libtool gettext
-
-##libxfcegui4 is deprecated and replaced with libxfce4ui
BuildRequires: libxfce4ui-devel
-#https://github.com/projecthamster/xfce4-hamster-plugin/issues/21
-Requires: %{tracker}
+Requires: hamster-time-tracker
%description
This is a recreation of the gnome-shell hamster extension
@@ -29,18 +25,20 @@ See also the hamster project: <https://github.com/projecthamster>
%prep
%setup -qn %{name}-%{version}
+%patch0 -p1
+%patch1 -p1
sh autogen.sh
%build
-%configure --with-icon_name=%{tracker} --enable-debug=yes --enable-debug_trace=yes
+%configure --with-icon_name=hamster-time-tracker --enable-debug=yes --enable-debug_trace=yes
make %{?_smp_mflags}
%install
%make_install
%find_lang %{name}
-##la file is not needed, see https://github.com/projecthamster/xfce4-hamster-plugin/issues/12
+# la file is not needed, see https://github.com/projecthamster/xfce4-hamster-plugin/issues/12
rm %{buildroot}%{_libdir}/xfce4/panel/plugins/libhamster.la
libtool --finish %{buildroot}%{_libdir}/xfce4/panel/plugins
@@ -48,12 +46,17 @@ libtool --finish %{buildroot}%{_libdir}/xfce4/panel/plugins
%files -f %{name}.lang
%license COPYING
%doc README* ChangeLog AUTHORS ABOUT-NLS NEWS
-%{_bindir}/%{bname}
+%{_bindir}/xfce4-popup-hamstermenu
%{_libdir}/xfce4/panel/plugins/libhamster.so
%{_datadir}/xfce4/panel/plugins/hamster.desktop
%changelog
+* Fri Mar 06 2015 Raphael Groner <projects.rg at smart.ms> - 1.6-5
+- add spanish translations
+- remove obsolete comments at closed upstream issues
+- remove some ridiculous globals and use shortifying URL macro
+
* Sun Mar 01 2015 Raphael Groner <projects.rg at smart.ms> - 1.6-4
- bump again due to wrong Release logic in f22
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xfce4-hamster-plugin.git/commit/?h=epel7&id=bf9e1094dcd5b6fc4689d3c9276d29347c6351ba
More information about the scm-commits
mailing list