raphgro pushed to xfce4-hamster-plugin (epel7). "fix icon and libxfcegui4 deprecation"

[notifications at fedoraproject.org]

>From 00d6af6a1830cc1109f4fa5caf4980f2108f38ca Mon Sep 17 00:00:00 2001
From: Raphael Groner <projects.rg at smart.ms>
Date: Fri, 14 Nov 2014 20:39:31 +0100
Subject: fix icon and libxfcegui4 deprecation


diff --git a/xfce4-hamster-plugin.spec b/xfce4-hamster-plugin.spec
index d48bd0f..7986a8c 100644
--- a/xfce4-hamster-plugin.spec
+++ b/xfce4-hamster-plugin.spec
@@ -1,34 +1,41 @@
-%global project hamster
-%global bname   xfce4-popup-%{project}menu
+%global bname   xfce4-popup-hamstermenu
 
-Name:           xfce4-%{project}-plugin
+##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.5
-Release:        1%{?dist}
-Summary:        Time tracker port of the '%{project} project extension' for the xfce4 panel
+Release:        2%{?dist}
+Summary:        Time tracker port of the 'hamster project extension' for the xfce4 panel
 
 License:        GPLv2+
-URL:            https://github.com/project%{project}/%{name}/
-Source0:        https://github.com/project%{project}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+URL:            https://github.com/projecthamster/%{name}/
+Source0:        https://github.com/projecthamster/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-BuildRequires:  xfce4-panel-devel xfconf-devel libxfcegui4-devel
+BuildRequires:  xfce4-panel-devel xfconf-devel
 BuildRequires:  intltool libtool gettext
 
-##hamster-applet has dead upstream, hamster-time-tracker is the new hope
-##see https://github.com/projecthamster/xfce4-hamster-plugin/issues/11
-Requires:       %{project}-time-tracker   
+##libxfcegui4 is deprecated and replaced with libxfce4ui
+BuildRequires:  libxfce4ui-devel
+#https://github.com/projecthamster/xfce4-hamster-plugin/issues/21
+Patch0:         xfce4-hamster-plugin-libxfce4ui.patch
+
+Requires:       %{tracker}
 
 %description
-This is a recreation of the gnome-shell %{project} extension
+This is a recreation of the gnome-shell hamster extension
 as a xfce4 panel plugin.
-See also the %{project} project: <https://github.com/project%{project}>
+See also the hamster project: <https://github.com/projecthamster>
 
 %prep
 %setup -qn %{name}-%{version}
+%patch0 -p1
 sh autogen.sh
 
 
 %build
-%configure
+%configure --with-icon_name=%{tracker} --enable-debug=yes --enable-debug_trace=yes
 make %{?_smp_mflags}
 
 
@@ -36,22 +43,25 @@ make %{?_smp_mflags}
 %make_install
 %find_lang %{name}
 ##la file is not needed, see https://github.com/projecthamster/xfce4-hamster-plugin/issues/12
-rm %{buildroot}%{_libdir}/xfce4/panel/plugins/lib%{project}.la
+rm %{buildroot}%{_libdir}/xfce4/panel/plugins/libhamster.la
 libtool --finish %{buildroot}%{_libdir}/xfce4/panel/plugins
 
 
 %files -f %{name}.lang
 %doc COPYING README README.md ChangeLog AUTHORS ABOUT-NLS NEWS
 %{_bindir}/%{bname}
-%{_libdir}/xfce4/panel/plugins/lib%{project}.so
-%{_datadir}/xfce4/panel/plugins/%{project}.desktop
+%{_libdir}/xfce4/panel/plugins/libhamster.so
+%{_datadir}/xfce4/panel/plugins/hamster.desktop
 
 
 %changelog
+* Fri Nov 14 2014 Raphael Groner <projects.rg [AT] smart.ms> - 1.5-2
+- fix icon
+- fix libxfcegui4 deprecation
+
 * Sun Nov 02 2014 Raphael Groner <projects.rg [AT] smart.ms> - 1.5-1
 - rebuilt for SCM
 - new upstream release 1.5
-- add project macro
 
 * Wed Oct 29 2014 Raphael Groner <projects.rg [AT] smart.ms> - 1.4-0.2
 - proper usage of find_lang macro
-- 
cgit v0.10.2


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