diff --git a/.gitignore b/.gitignore index 07511a9..0fecafa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,16 +2,3 @@ xfce4-taskmanager-1.0.0.tar.bz2 /xfce4-taskmanager-1.0.1.tar.bz2 /xfce4-taskmanager-1.1.0.tar.bz2 /xfce4-taskmanager-1.2.0.tar.bz2 -/xfce4-taskmanager-1.2.1.tar.bz2 -/xfce4-taskmanager-1.2.2.tar.bz2 -/xfce4-taskmanager-1.2.3.tar.bz2 -/xfce4-taskmanager-1.4.0.tar.bz2 -/xfce4-taskmanager-1.4.1.tar.bz2 -/xfce4-taskmanager-1.4.2.tar.bz2 -/xfce4-taskmanager-1.5.2.tar.bz2 -/xfce4-taskmanager-1.5.4.tar.bz2 -/xfce4-taskmanager-1.5.5.tar.bz2 -/xfce4-taskmanager-1.5.6.tar.bz2 -/xfce4-taskmanager-1.5.7.tar.bz2 -/xfce4-taskmanager-1.5.8.tar.bz2 -/xfce4-taskmanager-1.6.0.tar.xz diff --git a/changelog b/changelog deleted file mode 100644 index 44e2dc9..0000000 --- a/changelog +++ /dev/null @@ -1,185 +0,0 @@ -* Sat Jul 23 2022 Fedora Release Engineering - 1.5.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue May 31 2022 Mukundan Ragavan - 1.5.4-1 -- Update to 1.5.4 - -* Tue Mar 1 2022 Ali Erdinc Koroglu - 1.5.2-1 -- Upstream update to 1.5.2 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.4.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Feb 09 2021 Mukundan Ragavan - 1.4.2-1 -- Update to 1.4.2 - -* Sun Feb 07 2021 Mukundan Ragavan - 1.4.1-1 -- Update to 1.4.1 - -* Thu Jan 28 2021 Fedora Release Engineering - 1.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Dec 28 2020 Mukundan Ragavan - 1.4.0-1 -- Update to 1.4.0 - -* Wed Jul 29 2020 Fedora Release Engineering - 1.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Apr 10 2020 - 1.2.3-1 -- Update to 1.2.3 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Dec 19 2018 Mukundan Ragavan - 1.2.2-1 -- Update to 1.2.2 - -* Sat Aug 11 2018 Mukundan Ragavan - 1.2.1-20 -- Rebuilt (xfce 4.13) - -* Sat Jul 14 2018 Fedora Release Engineering - 1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Jun 03 2018 Mukundan Ragavan - 1.2.1-1 -- Update to 1.2.1 - -* Fri Feb 09 2018 Igor Gnatenko - 1.2.0-5 -- Escape macros in %%changelog - -* Thu Aug 03 2017 Fedora Release Engineering - 1.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Feb 12 2017 Mukundan Ragavan - 1.2.0-2 -- Add icon files -- Fix buildrequires - -* Sun Feb 12 2017 Mukundan Ragavan - 1.2.0-1 --Update to 1.2.0 - -* Sat Feb 11 2017 Fedora Release Engineering - 1.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun May 03 2015 Mukundan Ragavan - 1.1.0-3 -- Removed libxfcegui4 build requires -- Fixes 1209549 - -* Sat Feb 21 2015 Till Maas - 1.1.0-2 -- Rebuilt for Fedora 23 Change - https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code - -* Fri Dec 26 2014 Kevin Fenzi 1.1.0-1 -- Update to 1.1.0 - -* Mon Aug 18 2014 Fedora Release Engineering - 1.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jan 09 2014 Christoph Wickert - 1.0.1-1 -- Update to 1.0.1 -- Remove aarch64 patch, no longer needed -- Add patch to fix some German translations (submitted upstream via Transifex) - -* Sun Aug 04 2013 Fedora Release Engineering - 1.0.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun May 19 2013 Christoph Wickert - 1.0.0-7 -- Make desktop vendor conditional -- Add aarch64 support (#926791) - -* Sun Feb 10 2013 Parag Nemade - 1.0.0-6 -- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 -- Cleanup spec as per recently changed packaging guidelines - -* Sun Jul 22 2012 Fedora Release Engineering - 1.0.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.0.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 1.0.0-3 -- Rebuild for new libpng - -* Mon Feb 07 2011 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jun 15 2010 Christoph Wickert - 1.0.0-1 -- Update to 1.0.0 final - -* Sun Jun 06 2010 Christoph Wickert - 0.5.92-1 -- Update to 0.5.91 (0.6 Beta 3) - -* Tue May 25 2010 Christoph Wickert - 0.5.91-1 -- Update to 0.5.91 (0.6 Beta 2) - -* Thu Jul 30 2009 Christoph Wickert - 0.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sat Feb 21 2009 Christoph Wickert - 0.4.1-2 -- Rebuild for i586 and SHA 256 hashes in RPM -- Rework categories of desktop file to allow nested menus - -* Tue Sep 30 2008 Christoph Wickert - 0.4.1-1 -- Update to 0.4.1 -- Remove patches (fixed upstream) - -* Sat May 24 2008 Christoph Wickert - 0.4.0-1 -- Update to 0.4.0 stable which has finally been released -- Add patch to fix 0%%-CPU bug (rebased version of Enrico Tröger's patch) -- Add patch to fix some compiler warnings (also based on Enrico's work) -- Update license tag - -* Mon Feb 18 2008 Fedora Release Engineering - 0.4.0-0.3.rc2 -- Autorebuild for GCC 4.3 - -* Thu Oct 05 2006 Christoph Wickert - 0.4.0-0.2.rc2 -- Bump release for devel checkin. - -* Tue Oct 03 2006 Christoph Wickert - 0.4.0-0.1.rc2 -- Update to 0.4-rc2. -- Add BR on perl(XML::Parser), drop intltool. - -* Mon Oct 02 2006 Christoph Wickert - 0.3.1-6 -- Rebuild for XFCE 4.4. - -* Mon Sep 04 2006 Christoph Wickert - 0.3.1-5 -- Mass rebuild for Fedora Core 6. -- Fix %%defattr. - -* Sat Jun 03 2006 Christoph Wickert - 0.3.1-4 -- Add intltool BR (#193444). - -* Thu Feb 16 2006 Christoph Wickert - 0.3.1-3 -- Rebuild for Fedora Extras 5. - -* Thu Dec 15 2005 Christoph Wickert - 0.3.1-2 -- Initial Fedora Extras version. -- Add xfce4-taskmanager.desktop. -- Remove useless NEWS from %%doc. -- Clean up specfile. - -* Sat Jul 09 2005 Christoph Wickert - 0.3.1-1.fc4.cw -- Updated to version 0.3.1. -- Rebuild for Core 4. - -* Thu Apr 14 2005 Christoph Wickert - 0.2.1-1.fc3.cw -- Initial RPM release. diff --git a/sources b/sources index 72b1d3e..3d61f17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-taskmanager-1.6.0.tar.xz) = 05d5ac1b0f9e15bbbb3cdba3afcc03f1e5bab38ecaf391997e4a29f0ddb267442fd5b191ac5a6689c76f806fbde3c4df0d93f9a5fbf5b0902ddcb9909afb75d5 +SHA512 (xfce4-taskmanager-1.2.0.tar.bz2) = 45a496dc406eb825b9829a9cd0b76250566df0bf57dd39413112512209936b52cd3271fd1933dd972582178d897ef40ab8e106b2980db6963d29373940fdcc2d diff --git a/xfce4-taskmanager-1.0.1-fix-german-translation.patch b/xfce4-taskmanager-1.0.1-fix-german-translation.patch new file mode 100644 index 0000000..2afa5f0 --- /dev/null +++ b/xfce4-taskmanager-1.0.1-fix-german-translation.patch @@ -0,0 +1,26 @@ +--- xfce4-taskmanager-1.0.1/po/de.po.orig 2014-01-09 19:28:27.828771108 +0100 ++++ xfce4-taskmanager-1.0.1/po/de.po 2014-01-09 19:30:21.306620590 +0100 +@@ -40,12 +40,12 @@ + + #: ../src/exec-tool-button.c:164 + msgid "Run Task Manager as root" +-msgstr "Taskmanager mit Administratorrechten starten" ++msgstr "Taskmanager als Administrator ausführen" + + #: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 + #: ../src/exec-tool-button.c:179 + msgid "Run Program..." +-msgstr "Befehl ausführen..." ++msgstr "Befehl ausführen…" + + #: ../src/exec-tool-button.c:182 + msgid "Application Finder" +@@ -329,7 +329,7 @@ + + #: ../src/settings-tool-button.c:178 + msgid "Private Bytes" +-msgstr "Virtuelle Bytes" ++msgstr "Private Bytes" + + #: ../src/task-manager.c:229 + #, c-format diff --git a/xfce4-taskmanager.spec b/xfce4-taskmanager.spec index 551e233..aff0123 100644 --- a/xfce4-taskmanager.spec +++ b/xfce4-taskmanager.spec @@ -1,22 +1,18 @@ -%global majorversion 1.6 +%global majorversion 1.2 Name: xfce4-taskmanager -Version: 1.6.0 -Release: %autorelease +Version: 1.2.0 +Release: 2%{?dist} Summary: Taskmanager for the Xfce desktop environment -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +Group: User Interface/Desktops +License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/%{name} -Source0: http://archive.xfce.org/src/apps/%{name}/%{majorversion}/%{name}-%{version}.tar.xz +Source0: http://archive.xfce.org/src/apps/%{name}/%{majorversion}/%{name}-%{version}.tar.bz2 -BuildRequires: make -BuildRequires: gcc-c++ BuildRequires: libxfce4ui-devel -BuildRequires: libXmu-devel -BuildRequires: meson -BuildRequires: desktop-file-utils -BuildRequires: libwnck3-devel +BuildRequires: libXmu-devel +BuildRequires: gettext, desktop-file-utils, intltool %description A simple taskmanager for the Xfce desktop environment. @@ -27,16 +23,18 @@ A simple taskmanager for the Xfce desktop environment. %build -%meson -%meson_build +%configure +make %{?_smp_mflags} V=1 %install -%meson_install - +make install DESTDIR=%{buildroot} INSTALL="install -p" %find_lang %{name} desktop-file-install \ + %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) + --vendor fedora \ + %endif --delete-original \ --add-category GTK \ --add-category Monitor \ @@ -48,12 +46,133 @@ desktop-file-install \ %files -f %{name}.lang -%license COPYING -%doc AUTHORS NEWS THANKS +%doc AUTHORS COPYING ChangeLog NEWS README THANKS %{_bindir}/%{name} %{_datadir}/applications/*%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/org.xfce.taskmanager.* -%{_datadir}/icons/hicolor/scalable/actions/xc_crosshair-symbolic.svg +%{_datadir}/icons/hicolor/16x16/apps/xc_crosshair.png +%{_datadir}/icons/hicolor/24x24/actions/xc_crosshair.png +%{_datadir}/icons/hicolor/scalable/actions/xc_crosshair.svg %changelog -%autochangelog +* Sun Feb 12 2017 Mukundan Ragavan - 1.2.0-2 +- Add icon files +- Fix buildrequires + +* Sun Feb 12 2017 Mukundan Ragavan - 1.2.0-1 +-Update to 1.2.0 + +* Sat Feb 11 2017 Fedora Release Engineering - 1.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun May 03 2015 Mukundan Ragavan - 1.1.0-3 +- Removed libxfcegui4 build requires +- Fixes 1209549 + +* Sat Feb 21 2015 Till Maas - 1.1.0-2 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Fri Dec 26 2014 Kevin Fenzi 1.1.0-1 +- Update to 1.1.0 + +* Mon Aug 18 2014 Fedora Release Engineering - 1.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jan 09 2014 Christoph Wickert - 1.0.1-1 +- Update to 1.0.1 +- Remove aarch64 patch, no longer needed +- Add patch to fix some German translations (submitted upstream via Transifex) + +* Sun Aug 04 2013 Fedora Release Engineering - 1.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun May 19 2013 Christoph Wickert - 1.0.0-7 +- Make desktop vendor conditional +- Add aarch64 support (#926791) + +* Sun Feb 10 2013 Parag Nemade - 1.0.0-6 +- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 +- Cleanup spec as per recently changed packaging guidelines + +* Sun Jul 22 2012 Fedora Release Engineering - 1.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Adam Jackson - 1.0.0-3 +- Rebuild for new libpng + +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jun 15 2010 Christoph Wickert - 1.0.0-1 +- Update to 1.0.0 final + +* Sun Jun 06 2010 Christoph Wickert - 0.5.92-1 +- Update to 0.5.91 (0.6 Beta 3) + +* Tue May 25 2010 Christoph Wickert - 0.5.91-1 +- Update to 0.5.91 (0.6 Beta 2) + +* Thu Jul 30 2009 Christoph Wickert - 0.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sat Feb 21 2009 Christoph Wickert - 0.4.1-2 +- Rebuild for i586 and SHA 256 hashes in RPM +- Rework categories of desktop file to allow nested menus + +* Tue Sep 30 2008 Christoph Wickert - 0.4.1-1 +- Update to 0.4.1 +- Remove patches (fixed upstream) + +* Sat May 24 2008 Christoph Wickert - 0.4.0-1 +- Update to 0.4.0 stable which has finally been released +- Add patch to fix 0%-CPU bug (rebased version of Enrico Tröger's patch) +- Add patch to fix some compiler warnings (also based on Enrico's work) +- Update license tag + +* Mon Feb 18 2008 Fedora Release Engineering - 0.4.0-0.3.rc2 +- Autorebuild for GCC 4.3 + +* Thu Oct 05 2006 Christoph Wickert - 0.4.0-0.2.rc2 +- Bump release for devel checkin. + +* Tue Oct 03 2006 Christoph Wickert - 0.4.0-0.1.rc2 +- Update to 0.4-rc2. +- Add BR on perl(XML::Parser), drop intltool. + +* Mon Oct 02 2006 Christoph Wickert - 0.3.1-6 +- Rebuild for XFCE 4.4. + +* Mon Sep 04 2006 Christoph Wickert - 0.3.1-5 +- Mass rebuild for Fedora Core 6. +- Fix %%defattr. + +* Sat Jun 03 2006 Christoph Wickert - 0.3.1-4 +- Add intltool BR (#193444). + +* Thu Feb 16 2006 Christoph Wickert - 0.3.1-3 +- Rebuild for Fedora Extras 5. + +* Thu Dec 15 2005 Christoph Wickert - 0.3.1-2 +- Initial Fedora Extras version. +- Add xfce4-taskmanager.desktop. +- Remove useless NEWS from %%doc. +- Clean up specfile. + +* Sat Jul 09 2005 Christoph Wickert - 0.3.1-1.fc4.cw +- Updated to version 0.3.1. +- Rebuild for Core 4. + +* Thu Apr 14 2005 Christoph Wickert - 0.2.1-1.fc3.cw +- Initial RPM release.