diff --git a/.gitignore b/.gitignore index ec03acd..0311843 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/xfce4-timer-plugin-*.tar.bz2 -/xfce4-timer-plugin-*.tar.xz +xfce4-timer-plugin-0.6.1.tar.bz2 +/xfce4-timer-plugin-1.6.0.tar.bz2 diff --git a/changelog b/changelog deleted file mode 100644 index 9407b5e..0000000 --- a/changelog +++ /dev/null @@ -1,138 +0,0 @@ -* Sat Jan 21 2023 Fedora Release Engineering - 1.7.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.7.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.7.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.7.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 1.7.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Aug 01 2020 Fedora Release Engineering - 1.7.1-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.7.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jul 23 2020 Mukundan Ragavan - 1.7.1-1 -- Update to 1.7.1 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.7.0-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.7.0-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.7.0-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Aug 11 2018 Mukundan Ragavan - 1.7.0-20 -- Rebuilt (xfce 4.13) - -* Sat Jul 14 2018 Fedora Release Engineering - 1.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Feb 10 2018 Filipe Rosset - 1.7.0-1 -- Bump to 1.7.0, drop unneeded patches, spec cleanup - -* Fri Feb 09 2018 Fedora Release Engineering - 1.6.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.6.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Mar 29 2015 Kevin Fenzi 1.6.0-1 -- Update to 1.6.0 now using libxfce4ui - -* Sat Feb 28 2015 Kevin Fenzi 0.6.1-17 -- Rebuild for Xfce 4.12 - -* Mon Aug 18 2014 Fedora Release Engineering - 0.6.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.6.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 0.6.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 0.6.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 0.6.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Apr 15 2012 Kevin Fenzi - 0.6.1-11 -- Rebuild for Xfce 4.10(pre2) - -* Thu Apr 05 2012 Kevin Fenzi - 0.6.1-10 -- Rebuild for Xfce 4.10 - -* Sat Jan 14 2012 Fedora Release Engineering - 0.6.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 0.6.1-8 -- Rebuild for new libpng - -* Sat Mar 05 2011 Christoph Wickert - 0.6.1-7 -- Fix segfault when creating plugin in 4.8 panel (#682458) -- Update translations from Xfce Transifex - -* Mon Feb 07 2011 Fedora Release Engineering - 0.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jan 13 2011 Kevin Fenzi - 0.6.1-5 -- Rebuild for Xfce 4.8 - -* Mon Jul 27 2009 Fedora Release Engineering - 0.6.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jan 18 2009 Christoph Wickert - 0.6.1-2 -- Rebuild for Xfce 4.6 (Beta 3) - -* Thu Nov 27 2008 Christoph Wickert - 0.6.1-1 -- Update to 0.6.1 -- BR intltool - -* Mon Feb 18 2008 Fedora Release Engineering - 0.6-3 -- Autorebuild for GCC 4.3 - -* Sat Dec 29 2007 Christoph Wickert - 0.6-2 -- Bump release due to tag collision - -* Sat Dec 29 2007 Christoph Wickert - 0.6-1 -- Update to 0.6 - -* Sat Aug 25 2007 Christoph Wickert - 0.5.1-3 -- Rebuild for BuildID feature -- Update license tag - -* Sat Apr 28 2007 Christoph Wickert - 0.5.1-2 -- Rebuild for Xfce 4.4.1 - -* Sat Jan 27 2007 Christoph Wickert - 0.5.1-1 -- Update to 0.5.1 on Xfce 4.4. - -* Sat Sep 23 2006 Christoph Wickert - 0.5-1 -- Initial Fedora Extras version. diff --git a/sources b/sources index eff79b2..9b9118d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-timer-plugin-1.8.0.tar.xz) = 9729181248ee3aa6e90be8a6975a76121ce89c26131fc4eadb6840eec7059afb45f06ff9bae5e202e39d081bd898ece2fd236c5d64e1ab07a8c8ecb2c18558f0 +3be2a4ccfb2af20441b1d25c2cea5f28 xfce4-timer-plugin-1.6.0.tar.bz2 diff --git a/xfce4-timer-plugin-1.6.0-format-string.patch b/xfce4-timer-plugin-1.6.0-format-string.patch new file mode 100644 index 0000000..ecd4476 --- /dev/null +++ b/xfce4-timer-plugin-1.6.0-format-string.patch @@ -0,0 +1,12 @@ +diff -Nur xfce4-timer-plugin-1.6.0/src/xfcetimer.c xfce4-timer-plugin-1.6.0.orig/src/xfcetimer.c +--- xfce4-timer-plugin-1.6.0/src/xfcetimer.c 2015-03-29 07:53:22.426521717 -0600 ++++ xfce4-timer-plugin-1.6.0.orig/src/xfcetimer.c 2015-03-29 07:51:50.913218434 -0600 +@@ -192,7 +192,7 @@ + + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, +- GTK_BUTTONS_NONE, dialog_message); ++ GTK_BUTTONS_NONE, "%s", dialog_message); + + gtk_window_set_title ((GtkWindow *) dialog, dialog_title); + diff --git a/xfce4-timer-plugin-1.6.0-improve-timer.patch b/xfce4-timer-plugin-1.6.0-improve-timer.patch new file mode 100644 index 0000000..3adadb8 --- /dev/null +++ b/xfce4-timer-plugin-1.6.0-improve-timer.patch @@ -0,0 +1,12 @@ +diff -Nur xfce4-timer-plugin-1.6.0.orig/src/xfcetimer.c xfce4-timer-plugin-1.6.0/src/xfcetimer.c +--- xfce4-timer-plugin-1.6.0.orig/src/xfcetimer.c 2014-06-04 16:31:03.000000000 -0600 ++++ xfce4-timer-plugin-1.6.0/src/xfcetimer.c 2015-03-10 12:32:18.632908585 -0600 +@@ -167,6 +167,8 @@ + } + + /* Countdown is over, stop timer and free resources */ ++ g_snprintf(tiptext,31,_("%ds left"),0); ++ gtk_tooltips_set_tip(pd->tip,GTK_WIDGET(pd->base),tiptext,NULL); + + if(pd->timer) + g_timer_destroy(pd->timer); diff --git a/xfce4-timer-plugin.spec b/xfce4-timer-plugin.spec index b7f264f..d87ce87 100644 --- a/xfce4-timer-plugin.spec +++ b/xfce4-timer-plugin.spec @@ -1,22 +1,25 @@ -# CVS https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin -%global minorver 1.8 +%global minorver 1.6 -Name: xfce4-timer-plugin -Version: 1.8.0 -Release: %autorelease -Summary: Timer for the Xfce panel -License: GPL-2.0-or-later -URL: https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/start -Source0: https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/%{minorver}/%{name}-%{version}.tar.xz +Name: xfce4-timer-plugin +Version: 1.6.0 +Release: 6%{?dist} +Summary: Timer for the Xfce panel -BuildRequires: gcc-c++ -BuildRequires: gettext -BuildRequires: libxfce4ui-devel -BuildRequires: libxml2-devel -BuildRequires: meson -BuildRequires: xfce4-panel-devel +Group: User Interface/Desktops +License: GPLv2+ +URL: http://goodies.xfce.org/projects/panel-plugins/%{name} +Source0: http://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/%{minorver}/%{name}-%{version}.tar.bz2 -Requires: xfce4-panel +# Improve the timer countdown +Patch0: xfce4-timer-plugin-1.6.0-improve-timer.patch +# Fix compile with format-strings +# https://bugzilla.xfce.org/show_bug.cgi?id=10110 +Patch1: xfce4-timer-plugin-1.6.0-format-string.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: xfce4-panel-devel >= 4.3.20, libxfce4ui-devel >= 4.3.0 +BuildRequires: libxml2-devel, gettext, intltool, perl(XML::Parser) +Requires: xfce4-panel >= 4.4.0 %description A timer for the Xfce panel. It supports countdown periods and alarms at @@ -24,32 +27,123 @@ certain times. %prep -%autosetup +%setup -q +%patch0 -p1 +%patch1 -p1 %build -%meson -%meson_build +%configure --disable-static +make %{?_smp_mflags} %install -%meson_install - -# Rename non-standard hye locale to hy -if [ -d %{buildroot}%{_datadir}/locale/hye ]; then - mv %{buildroot}%{_datadir}/locale/hye %{buildroot}%{_datadir}/locale/hy -fi - +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} -%files -f %{name}.lang -%doc AUTHORS NEWS README.md -%license COPYING -%{_libdir}/xfce4/panel/plugins/libxfcetimer.so -%{_datadir}/xfce4/panel/plugins/xfce4-timer-plugin.desktop -%{_datadir}/icons/hicolor/*/apps/xfce4-timer-plugin.*g +%clean +rm -rf $RPM_BUILD_ROOT +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog README TODO +%{_libexecdir}/xfce4/panel-plugins/xfce4-timer +%{_datadir}/xfce4/panel-plugins/*.desktop +%{_datadir}/icons/hicolor/48x48/apps/xfce4-timer.png + %changelog -%autochangelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Mar 29 2015 Kevin Fenzi 1.6.0-1 +- Update to 1.6.0 now using libxfce4ui + +* Sat Feb 28 2015 Kevin Fenzi 0.6.1-17 +- Rebuild for Xfce 4.12 + +* Mon Aug 18 2014 Fedora Release Engineering - 0.6.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.6.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 0.6.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 0.6.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 0.6.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Apr 15 2012 Kevin Fenzi - 0.6.1-11 +- Rebuild for Xfce 4.10(pre2) + +* Thu Apr 05 2012 Kevin Fenzi - 0.6.1-10 +- Rebuild for Xfce 4.10 + +* Sat Jan 14 2012 Fedora Release Engineering - 0.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Adam Jackson - 0.6.1-8 +- Rebuild for new libpng + +* Sat Mar 05 2011 Christoph Wickert - 0.6.1-7 +- Fix segfault when creating plugin in 4.8 panel (#682458) +- Update translations from Xfce Transifex + +* Mon Feb 07 2011 Fedora Release Engineering - 0.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jan 13 2011 Kevin Fenzi - 0.6.1-5 +- Rebuild for Xfce 4.8 + +* Mon Jul 27 2009 Fedora Release Engineering - 0.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 0.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Jan 18 2009 Christoph Wickert - 0.6.1-2 +- Rebuild for Xfce 4.6 (Beta 3) + +* Thu Nov 27 2008 Christoph Wickert - 0.6.1-1 +- Update to 0.6.1 +- BR intltool + +* Mon Feb 18 2008 Fedora Release Engineering - 0.6-3 +- Autorebuild for GCC 4.3 + +* Sat Dec 29 2007 Christoph Wickert - 0.6-2 +- Bump release due to tag collision + +* Sat Dec 29 2007 Christoph Wickert - 0.6-1 +- Update to 0.6 + +* Sat Aug 25 2007 Christoph Wickert - 0.5.1-3 +- Rebuild for BuildID feature +- Update license tag + +* Sat Apr 28 2007 Christoph Wickert - 0.5.1-2 +- Rebuild for Xfce 4.4.1 + +* Sat Jan 27 2007 Christoph Wickert - 0.5.1-1 +- Update to 0.5.1 on Xfce 4.4. + +* Sat Sep 23 2006 Christoph Wickert - 0.5-1 +- Initial Fedora Extras version.