From fecd01f368dc7fe2795709072c45cb9f5e454274 Mon Sep 17 00:00:00 2001 From: comzeradd Date: Wed, 16 Nov 2011 11:23:42 +0200 Subject: [PATCH 01/58] Initial import (#716299) --- .gitignore | 1 + clipit-1.4.1-de.po.patch | 11 +++++ clipit.spec | 90 ++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 103 insertions(+) create mode 100644 clipit-1.4.1-de.po.patch create mode 100644 clipit.spec diff --git a/.gitignore b/.gitignore index e69de29..9273fb4 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/clipit-1.4.1.tar.gz diff --git a/clipit-1.4.1-de.po.patch b/clipit-1.4.1-de.po.patch new file mode 100644 index 0000000..bbcf536 --- /dev/null +++ b/clipit-1.4.1-de.po.patch @@ -0,0 +1,11 @@ +--- clipit-1.4.1/po/de.po.orig 2011-07-14 11:43:41.724836682 +0300 ++++ clipit-1.4.1/po/de.po 2011-07-14 11:43:50.402889212 +0300 +@@ -227,7 +227,7 @@ + + #: ../src/preferences.c:582 + msgid "Hotkeys" +-msgstr "Tastenkombinationen" ++msgstr "Tastenkombinationen" + + #: ../src/preferences.c:590 + msgid "Hotkeys" diff --git a/clipit.spec b/clipit.spec new file mode 100644 index 0000000..f45c8c2 --- /dev/null +++ b/clipit.spec @@ -0,0 +1,90 @@ +Name: clipit +Version: 1.4.1 +Release: 3%{?dist} +Summary: A lightweight, fully featured GTK+ clipboard manager + +Group: User Interface/Desktops +License: GPLv3+ +URL: http://clipit.rspwn.com/ +Source0: http://downloads.sourceforge.net/gtk%{name}/%{name}-%{version}.tar.gz +# patch fixing German translation inconsistency +# http://sf.net/tracker/?func=detail&aid=3367028&group_id=369179&atid=1538558 +Patch0: clipit-1.4.1-de.po.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: gtk2-devel +BuildRequires: desktop-file-utils +BuildRequires: intltool +BuildRequires: gettext +Requires: xdotool + +%description +ClipIt is a lightweight, fully featured GTK+ clipboard manager. It was forked +from Parcellite, adding additional features and bug-fixes to the project. +ClipIts main features are: +* Save a history of your last copied items +* Search through the history +* Global hot-keys for most used functions +* Execute actions with clipboard items +* Exclude specific items from history + + +%prep +%setup -q +%patch0 -p1 -b .orig + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +%find_lang %{name} +desktop-file-install --delete-original \ + --remove-category=Application \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/%{name}.desktop +desktop-file-install --delete-original \ + --dir %{buildroot}%{_sysconfdir}/xdg/autostart \ + %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-startup.desktop + + +%clean +rm -rf %{buildroot} + + +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README NEWS +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1.* +%{_datadir}/icons/hicolor/scalable/apps/%{name}-trayicon.svg +%{_datadir}/applications/%{name}.desktop +%config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop + + +%changelog +* Thu Jul 14 2011 Nikos Roussos 1.4.1-3 +- Fixed dependency missing, de translation bug, desktop icon bug + +* Fri Jul 01 2011 Nikos Roussos 1.4.1-2 +- Fixed config warning and more spec errors + +* Wed Jun 01 2011 Nikos Roussos 1.4.1-1 +- Initial Fedora RPM diff --git a/sources b/sources index e69de29..9be368f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +0f255859469dbdf8ad5408556cb610b8 clipit-1.4.1.tar.gz From afc0aa4021a01aad5871788265ef5943d17c61fa Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 17:28:25 -0600 Subject: [PATCH 02/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index f45c8c2..99bb2e8 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -80,6 +80,9 @@ fi %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Jul 14 2011 Nikos Roussos 1.4.1-3 - Fixed dependency missing, de translation bug, desktop icon bug From db51503a3430d5b09aadccffa289f33dc9303120 Mon Sep 17 00:00:00 2001 From: comzeradd Date: Wed, 29 Feb 2012 15:23:49 +0200 Subject: [PATCH 03/58] fixing wrong gtk header inclusion bug --- clipit-1.4.1-glib.patch | 11 +++++++++++ clipit.spec | 10 +++++++++- sources | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 clipit-1.4.1-glib.patch diff --git a/clipit-1.4.1-glib.patch b/clipit-1.4.1-glib.patch new file mode 100644 index 0000000..cc8f550 --- /dev/null +++ b/clipit-1.4.1-glib.patch @@ -0,0 +1,11 @@ +--- clipit-1.4.1/src/keybinder.h.orig 2012-02-28 22:21:53.247549291 +0200 ++++ clipit-1.4.1/src/keybinder.h 2012-02-28 22:26:45.180092101 +0200 +@@ -20,7 +20,7 @@ + #ifndef __KEY_BINDER_H__ + #define __KEY_BINDER_H__ + +-#include ++#include + + G_BEGIN_DECLS + diff --git a/clipit.spec b/clipit.spec index 99bb2e8..68f29b9 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -10,6 +10,10 @@ Source0: http://downloads.sourceforge.net/gtk%{name}/%{name}-%{version}.t # patch fixing German translation inconsistency # http://sf.net/tracker/?func=detail&aid=3367028&group_id=369179&atid=1538558 Patch0: clipit-1.4.1-de.po.patch +# pacth fixing wrong gtk header inclusion +# http://sf.net/tracker/?func=detail&aid=3495659&group_id=369179&atid=1538558 +# https://live.gnome.org/GnomeGoals/CleanupGTKIncludes +Patch1: clipit-1.4.1-glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel @@ -32,6 +36,7 @@ ClipIts main features are: %prep %setup -q %patch0 -p1 -b .orig +%patch1 -p1 -b .orig %build @@ -80,6 +85,9 @@ fi %changelog +* Wed Feb 29 2012 Nikos Roussos 1.4.1-5 +- Fix gtk+ inclusion bug, see patch1 + * Thu Jan 12 2012 Fedora Release Engineering - 1.4.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 9be368f..107070a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f255859469dbdf8ad5408556cb610b8 clipit-1.4.1.tar.gz +05ca90cd2fff4f1636677a30baf8a634 clipit-1.4.1-glib.patch From c3ec813901b97059187e327ad86d34efae8a5ef7 Mon Sep 17 00:00:00 2001 From: comzeradd Date: Wed, 29 Feb 2012 15:38:17 +0200 Subject: [PATCH 04/58] new parch added --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 107070a..9be368f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05ca90cd2fff4f1636677a30baf8a634 clipit-1.4.1-glib.patch +0f255859469dbdf8ad5408556cb610b8 clipit-1.4.1.tar.gz From b5335ff7663e6f13e15ca87f7a7eaddb31bdc138 Mon Sep 17 00:00:00 2001 From: comzeradd Date: Fri, 27 Apr 2012 14:35:01 +0300 Subject: [PATCH 05/58] update to 1.4.2 --- .gitignore | 1 + clipit.spec | 16 +++++----------- sources | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 9273fb4..0f3a4fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /clipit-1.4.1.tar.gz +/clipit-1.4.2.tar.gz diff --git a/clipit.spec b/clipit.spec index 68f29b9..9be5436 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,19 +1,12 @@ Name: clipit -Version: 1.4.1 -Release: 5%{?dist} +Version: 1.4.2 +Release: 1%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops License: GPLv3+ URL: http://clipit.rspwn.com/ Source0: http://downloads.sourceforge.net/gtk%{name}/%{name}-%{version}.tar.gz -# patch fixing German translation inconsistency -# http://sf.net/tracker/?func=detail&aid=3367028&group_id=369179&atid=1538558 -Patch0: clipit-1.4.1-de.po.patch -# pacth fixing wrong gtk header inclusion -# http://sf.net/tracker/?func=detail&aid=3495659&group_id=369179&atid=1538558 -# https://live.gnome.org/GnomeGoals/CleanupGTKIncludes -Patch1: clipit-1.4.1-glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel @@ -35,8 +28,6 @@ ClipIts main features are: %prep %setup -q -%patch0 -p1 -b .orig -%patch1 -p1 -b .orig %build @@ -85,6 +76,9 @@ fi %changelog +* Fri Apr 27 2012 Nikos Roussos 1.4.2-1 +- Update to 1.4.2 + * Wed Feb 29 2012 Nikos Roussos 1.4.1-5 - Fix gtk+ inclusion bug, see patch1 diff --git a/sources b/sources index 9be368f..8921e77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f255859469dbdf8ad5408556cb610b8 clipit-1.4.1.tar.gz +118175f26869adcf04909fdbb5021eff clipit-1.4.2.tar.gz From 236fd49ed25cf950f23b225a6f4b6a4e46d668df Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 14:08:59 -0500 Subject: [PATCH 06/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 9be5436..d61bb44 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -76,6 +76,9 @@ fi %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 1.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Apr 27 2012 Nikos Roussos 1.4.2-1 - Update to 1.4.2 From 6c43563e34578cba8bfa7f000c00441073430901 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 12:37:07 -0600 Subject: [PATCH 07/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index d61bb44..a854bde 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -76,6 +76,9 @@ fi %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 1.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 9c1cb27f10d16041e099b8af749f1ef6da78aa4b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 00:07:17 -0500 Subject: [PATCH 08/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index a854bde..2e40ea3 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -76,6 +76,9 @@ fi %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 1.4.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 19b83f6639e6ad0a4da696e03c0af14f2348d30c Mon Sep 17 00:00:00 2001 From: Nikos Roussos Date: Thu, 12 Sep 2013 14:23:35 +0300 Subject: [PATCH 09/58] Fix MATE autostart. Add appdata. --- clipit-1.4.1-de.po.patch | 11 ----------- clipit-1.4.1-glib.patch | 11 ----------- clipit-1.4.2-mate.patch | 9 +++++++++ clipit.appdata.xml | 27 +++++++++++++++++++++++++++ clipit.spec | 14 ++++++++++++-- 5 files changed, 48 insertions(+), 24 deletions(-) delete mode 100644 clipit-1.4.1-de.po.patch delete mode 100644 clipit-1.4.1-glib.patch create mode 100644 clipit-1.4.2-mate.patch create mode 100644 clipit.appdata.xml diff --git a/clipit-1.4.1-de.po.patch b/clipit-1.4.1-de.po.patch deleted file mode 100644 index bbcf536..0000000 --- a/clipit-1.4.1-de.po.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clipit-1.4.1/po/de.po.orig 2011-07-14 11:43:41.724836682 +0300 -+++ clipit-1.4.1/po/de.po 2011-07-14 11:43:50.402889212 +0300 -@@ -227,7 +227,7 @@ - - #: ../src/preferences.c:582 - msgid "Hotkeys" --msgstr "Tastenkombinationen" -+msgstr "Tastenkombinationen" - - #: ../src/preferences.c:590 - msgid "Hotkeys" diff --git a/clipit-1.4.1-glib.patch b/clipit-1.4.1-glib.patch deleted file mode 100644 index cc8f550..0000000 --- a/clipit-1.4.1-glib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clipit-1.4.1/src/keybinder.h.orig 2012-02-28 22:21:53.247549291 +0200 -+++ clipit-1.4.1/src/keybinder.h 2012-02-28 22:26:45.180092101 +0200 -@@ -20,7 +20,7 @@ - #ifndef __KEY_BINDER_H__ - #define __KEY_BINDER_H__ - --#include -+#include - - G_BEGIN_DECLS - diff --git a/clipit-1.4.2-mate.patch b/clipit-1.4.2-mate.patch new file mode 100644 index 0000000..5c63eb1 --- /dev/null +++ b/clipit-1.4.2-mate.patch @@ -0,0 +1,9 @@ +--- clipit-1.4.2/data/clipit-startup.desktop.in.orig 2013-09-12 10:49:12.700691560 +0300 ++++ clipit-1.4.2/data/clipit-startup.desktop.in 2013-09-12 10:49:23.615723278 +0300 +@@ -5,5 +5,5 @@ + Exec=clipit + Terminal=false + Type=Application +-OnlyShowIn=GNOME;XFCE;LXDE;Unity; ++OnlyShowIn=GNOME;XFCE;LXDE;Unity;MATE; + X-GNOME-Autostart-enabled=true diff --git a/clipit.appdata.xml b/clipit.appdata.xml new file mode 100644 index 0000000..7bff058 --- /dev/null +++ b/clipit.appdata.xml @@ -0,0 +1,27 @@ + + + clipit.desktop + CC0 + ClipIt + A lightweight, fully featured clipboard manager + +

+ ClipIt is a lightweight, fully featured GTK+ clipboard manager. + It was forked from Parcellite, adding additional features and bug-fixes to the project. +

+

ClipIts main features are:

+
    +
  • Save a history of your last copied items
    • +
  • Search through the history
    • +
  • Global hot-keys for most used functions
    • +
  • Execute actions with clipboard items
    • +
  • Exclude specific items from history
    • +
+

+ + + http://clipit.rspwn.com/files/2011/01/screenshot-300x294.jpg + http://clipit.rspwn.com/files/2011/01/screenshot4-300x291.jpg + + http://clipit.rspwn.com/ + diff --git a/clipit.spec b/clipit.spec index 2e40ea3..0d172a5 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,12 +1,16 @@ Name: clipit Version: 1.4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops License: GPLv3+ URL: http://clipit.rspwn.com/ Source0: http://downloads.sourceforge.net/gtk%{name}/%{name}-%{version}.tar.gz +# clipit doesn't autostart in MATE +# Fixed upstream but not yet merged +Source1: %{name}.appdata.xml +Patch0: %{name}-%{version}-mate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel @@ -28,7 +32,7 @@ ClipIts main features are: %prep %setup -q - +%patch0 -p1 -b .orig %build %configure @@ -46,6 +50,8 @@ desktop-file-install --delete-original \ desktop-file-install --delete-original \ --dir %{buildroot}%{_sysconfdir}/xdg/autostart \ %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-startup.desktop +mkdir -p %{buildroot}%{_datarootdir}/appdata/ +install -m 644 %{SOURCE1} %{buildroot}%{_datarootdir}/appdata/%{name}.appdata.xml %clean @@ -73,9 +79,13 @@ fi %{_datadir}/icons/hicolor/scalable/apps/%{name}-trayicon.svg %{_datadir}/applications/%{name}.desktop %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop +%{_datarootdir}/appdata/%{name}.appdata.xml %changelog +* Thu Sep 12 2013 Nikos Roussos 1.4.2-5 +- Fix MATE autostart. Add appdata + * Sat Aug 03 2013 Fedora Release Engineering - 1.4.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From a4b127eb3c7d694d347765db9ee5fdd25d06df1b Mon Sep 17 00:00:00 2001 From: Nikos Roussos Date: Fri, 2 May 2014 12:52:03 +0300 Subject: [PATCH 10/58] new patch added --- clipit-1.4.2-epel.patch | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 clipit-1.4.2-epel.patch diff --git a/clipit-1.4.2-epel.patch b/clipit-1.4.2-epel.patch new file mode 100644 index 0000000..a977b9e --- /dev/null +++ b/clipit-1.4.2-epel.patch @@ -0,0 +1,9 @@ +--- clipit-1.4.2/data/clipit-startup.desktop.in.orig 2013-09-12 10:49:12.700691560 +0300 ++++ clipit-1.4.2/data/clipit-startup.desktop.in 2013-09-12 10:49:23.615723278 +0300 +@@ -5,5 +5,5 @@ + Exec=clipit + Terminal=false + Type=Application +-OnlyShowIn=GNOME;XFCE;LXDE;Unity; ++OnlyShowIn=GNOME;XFCE; + X-GNOME-Autostart-enabled=true From 780baf306a38e038e8aa4df3bc8e6edc063a1a72 Mon Sep 17 00:00:00 2001 From: Nikos Roussos Date: Fri, 2 May 2014 12:52:29 +0300 Subject: [PATCH 11/58] add epel support --- clipit.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/clipit.spec b/clipit.spec index 0d172a5..ff87965 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -9,8 +9,10 @@ URL: http://clipit.rspwn.com/ Source0: http://downloads.sourceforge.net/gtk%{name}/%{name}-%{version}.tar.gz # clipit doesn't autostart in MATE # Fixed upstream but not yet merged -Source1: %{name}.appdata.xml -Patch0: %{name}-%{version}-mate.patch +Source1: %{name}.appdata.xml +Patch0: %{name}-%{version}-mate.patch +Patch1: %{name}-%{version}-epel.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel @@ -32,7 +34,11 @@ ClipIts main features are: %prep %setup -q +%if 0%{?fedora} %patch0 -p1 -b .orig +%else +%patch1 -p1 -b .orig +%endif %build %configure @@ -83,6 +89,9 @@ fi %changelog +* Fri May 02 2014 Nikos Roussos 1.4.2-6 +- Add EPEL support + * Thu Sep 12 2013 Nikos Roussos 1.4.2-5 - Fix MATE autostart. Add appdata From c7e68f07f0849f15ce5fb9f94a1fddea6a4325cb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 23:58:22 -0500 Subject: [PATCH 12/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index ff87965..d4ee701 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -89,6 +89,9 @@ fi %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.4.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 02 2014 Nikos Roussos 1.4.2-6 - Add EPEL support From ffe06f4ebb9a7a0ff972dc1c391912b214bda247 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 00:25:13 +0000 Subject: [PATCH 13/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index d4ee701..b454e3a 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -89,6 +89,9 @@ fi %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 1.4.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.4.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From e7b5125626e03113262eac519ec581f4e6094e2f Mon Sep 17 00:00:00 2001 From: Nikos Roussos Date: Mon, 15 Dec 2014 20:58:06 +0200 Subject: [PATCH 14/58] Fix appdata syntax --- clipit.appdata.xml | 4 +--- clipit.spec | 11 +++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/clipit.appdata.xml b/clipit.appdata.xml index 7bff058..c488c40 100644 --- a/clipit.appdata.xml +++ b/clipit.appdata.xml @@ -17,11 +17,9 @@
  • Execute actions with clipboard items
  • Exclude specific items from history
    • -

    - http://clipit.rspwn.com/files/2011/01/screenshot-300x294.jpg - http://clipit.rspwn.com/files/2011/01/screenshot4-300x291.jpg + https://comzeradd.fedorapeople.org/screenshots/clipit.jpg http://clipit.rspwn.com/ diff --git a/clipit.spec b/clipit.spec index b454e3a..3a66518 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -56,8 +56,8 @@ desktop-file-install --delete-original \ desktop-file-install --delete-original \ --dir %{buildroot}%{_sysconfdir}/xdg/autostart \ %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-startup.desktop -mkdir -p %{buildroot}%{_datarootdir}/appdata/ -install -m 644 %{SOURCE1} %{buildroot}%{_datarootdir}/appdata/%{name}.appdata.xml +mkdir -p %{buildroot}%{_datadir}/appdata/ +install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %clean @@ -85,10 +85,13 @@ fi %{_datadir}/icons/hicolor/scalable/apps/%{name}-trayicon.svg %{_datadir}/applications/%{name}.desktop %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop -%{_datarootdir}/appdata/%{name}.appdata.xml +%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Mon Dec 15 2014 Nikos Roussos 1.4.2-9 +- Fix appdata syntax + * Sat Aug 16 2014 Fedora Release Engineering - 1.4.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 3d39dc32abe43ed01f7d7fb67a9336e84dc3d0bb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 02:46:12 +0000 Subject: [PATCH 15/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 3a66518..43d336f 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -89,6 +89,9 @@ fi %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.4.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Dec 15 2014 Nikos Roussos 1.4.2-9 - Fix appdata syntax From fb78a90e55e19ec035b875a5d8277a90a39ba49a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 17:45:14 +0000 Subject: [PATCH 16/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 43d336f..e992a0b 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -89,6 +89,9 @@ fi %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.4.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.4.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 6a30fd5c8f526e9b36a8fbb77967f62d8ab8a644 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 07:34:54 +0000 Subject: [PATCH 17/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index e992a0b..41fc8f7 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -89,6 +89,9 @@ fi %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.4.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 1.4.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 2294d7ec8df174f746f838cef5b5de3483303df0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 04:58:09 +0000 Subject: [PATCH 18/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 41fc8f7..c5deeb0 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -89,6 +89,9 @@ fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.4.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.4.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 13045b5e6f07217509dfb1277118b120785acf2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 18:51:52 +0000 Subject: [PATCH 19/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index c5deeb0..3e0b162 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -89,6 +89,9 @@ fi %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.4.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.4.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 8e74b3c52a02f8c70bd62a3ece3aa967eef71829 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 7 Jan 2018 20:00:26 +0100 Subject: [PATCH 20/58] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- clipit.spec | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/clipit.spec b/clipit.spec index 3e0b162..8290ef4 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -60,23 +60,6 @@ mkdir -p %{buildroot}%{_datadir}/appdata/ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml -%clean -rm -rf %{buildroot} - - -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README NEWS @@ -89,6 +72,9 @@ fi %changelog +* Sun Jan 07 2018 Igor Gnatenko - 1.4.2-15 +- Remove obsolete scriptlets + * Wed Aug 02 2017 Fedora Release Engineering - 1.4.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From d33ea3f44b545f31fbdc8823414dfd71bd16f70f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 05:06:41 +0000 Subject: [PATCH 21/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 8290ef4..7d726e6 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager Group: User Interface/Desktops @@ -72,6 +72,9 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.4.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Jan 07 2018 Igor Gnatenko - 1.4.2-15 - Remove obsolete scriptlets From 4c17c237cece6cf50c5673a1d42df14779a5ac13 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:09:07 +0100 Subject: [PATCH 22/58] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- clipit.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 7d726e6..8b351d3 100644 --- a/clipit.spec +++ b/clipit.spec @@ -13,7 +13,6 @@ Source1: %{name}.appdata.xml Patch0: %{name}-%{version}-mate.patch Patch1: %{name}-%{version}-epel.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel BuildRequires: desktop-file-utils From 39613dd752aaa4e8cb619115889b5fc4a309b78c Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 19 Feb 2018 11:05:44 +0100 Subject: [PATCH 23/58] AppData fixes, specfile cleanup, add BRs on gcc and make --- clipit.appdata.xml | 11 ++++++----- clipit.spec | 34 +++++++++++++++++----------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/clipit.appdata.xml b/clipit.appdata.xml index c488c40..efcd83a 100644 --- a/clipit.appdata.xml +++ b/clipit.appdata.xml @@ -1,15 +1,16 @@ clipit.desktop - CC0 + CC0 + GPL-3.0+ ClipIt A lightweight, fully featured clipboard manager

    ClipIt is a lightweight, fully featured GTK+ clipboard manager. - It was forked from Parcellite, adding additional features and bug-fixes to the project. + It was forked from Parcellite, adding additional features and bugfixes to the project.

    -

    ClipIts main features are:

    +

    ClipIt's main features are:

    • Save a history of your last copied items
    • Search through the history
      • @@ -19,7 +20,7 @@
    - https://comzeradd.fedorapeople.org/screenshots/clipit.jpg + https://fedoraproject.org/w/uploads/3/3a/ClipIt.jpg - http://clipit.rspwn.com/ + https://github.com/CristianHenzel/ClipIt     diff --git a/clipit.spec b/clipit.spec index 8b351d3..a61eec2 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,24 +1,24 @@ Name: clipit Version: 1.4.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager -Group: User Interface/Desktops License: GPLv3+ -URL: http://clipit.rspwn.com/ +URL: https://github.com/CristianHenzel/ClipIt Source0: http://downloads.sourceforge.net/gtk%{name}/%{name}-%{version}.tar.gz +Source1: %{name}.appdata.xml # clipit doesn't autostart in MATE # Fixed upstream but not yet merged -Source1: %{name}.appdata.xml Patch0: %{name}-%{version}-mate.patch -Patch1: %{name}-%{version}-epel.patch -BuildRequires: gtk2-devel -BuildRequires: desktop-file-utils -BuildRequires: intltool -BuildRequires: gettext -Requires: xdotool +BuildRequires: gcc +BuildRequires: make +BuildRequires: gtk2-devel +BuildRequires: desktop-file-utils +BuildRequires: intltool +BuildRequires: gettext +Requires: xdotool %description ClipIt is a lightweight, fully featured GTK+ clipboard manager. It was forked @@ -33,11 +33,8 @@ ClipIts main features are: %prep %setup -q -%if 0%{?fedora} -%patch0 -p1 -b .orig -%else -%patch1 -p1 -b .orig -%endif + +%patch0 -p1 %build %configure @@ -45,7 +42,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} %find_lang %{name} desktop-file-install --delete-original \ @@ -60,7 +56,6 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %files -f %{name}.lang -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README NEWS %{_bindir}/%{name} %{_mandir}/man1/%{name}.1.* @@ -71,6 +66,11 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Mon Feb 19 2018 Michael Simacek - 1.4.2-17 +- AppData fixes +- Specfile cleanup +- Add BRs on gcc and make + * Wed Feb 07 2018 Fedora Release Engineering - 1.4.2-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e56e88b93b1c4647c13b6d4bc31479b253e230e4 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 29 Jun 2018 10:53:18 +0200 Subject: [PATCH 24/58] Update to upstream version 1.4.4 --- .gitignore | 1 + 0001-Autostart-in-MATE.patch | 23 +++++++++++++++++++++++ clipit-1.4.2-epel.patch | 9 --------- clipit-1.4.2-mate.patch | 9 --------- clipit.spec | 15 ++++++++++----- sources | 2 +- 6 files changed, 35 insertions(+), 24 deletions(-) create mode 100644 0001-Autostart-in-MATE.patch delete mode 100644 clipit-1.4.2-epel.patch delete mode 100644 clipit-1.4.2-mate.patch diff --git a/.gitignore b/.gitignore index 0f3a4fa..fbf84f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /clipit-1.4.1.tar.gz /clipit-1.4.2.tar.gz +/v1.4.4.tar.gz diff --git a/0001-Autostart-in-MATE.patch b/0001-Autostart-in-MATE.patch new file mode 100644 index 0000000..c03b04d --- /dev/null +++ b/0001-Autostart-in-MATE.patch @@ -0,0 +1,23 @@ +From 39179ef368fc104c891ce50fd100c626f06f26b0 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Fri, 29 Jun 2018 10:45:42 +0200 +Subject: [PATCH] Autostart in MATE + +--- + data/clipit-startup.desktop.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/clipit-startup.desktop.in b/data/clipit-startup.desktop.in +index 63d6a72..427de24 100644 +--- a/data/clipit-startup.desktop.in ++++ b/data/clipit-startup.desktop.in +@@ -5,5 +5,5 @@ Icon=clipit-trayicon + Exec=clipit + Terminal=false + Type=Application +-OnlyShowIn=GNOME;XFCE;LXDE;Unity; ++OnlyShowIn=GNOME;XFCE;LXDE;Unity;MATE; + X-GNOME-Autostart-enabled=true +-- +2.17.1 + diff --git a/clipit-1.4.2-epel.patch b/clipit-1.4.2-epel.patch deleted file mode 100644 index a977b9e..0000000 --- a/clipit-1.4.2-epel.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- clipit-1.4.2/data/clipit-startup.desktop.in.orig 2013-09-12 10:49:12.700691560 +0300 -+++ clipit-1.4.2/data/clipit-startup.desktop.in 2013-09-12 10:49:23.615723278 +0300 -@@ -5,5 +5,5 @@ - Exec=clipit - Terminal=false - Type=Application --OnlyShowIn=GNOME;XFCE;LXDE;Unity; -+OnlyShowIn=GNOME;XFCE; - X-GNOME-Autostart-enabled=true diff --git a/clipit-1.4.2-mate.patch b/clipit-1.4.2-mate.patch deleted file mode 100644 index 5c63eb1..0000000 --- a/clipit-1.4.2-mate.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- clipit-1.4.2/data/clipit-startup.desktop.in.orig 2013-09-12 10:49:12.700691560 +0300 -+++ clipit-1.4.2/data/clipit-startup.desktop.in 2013-09-12 10:49:23.615723278 +0300 -@@ -5,5 +5,5 @@ - Exec=clipit - Terminal=false - Type=Application --OnlyShowIn=GNOME;XFCE;LXDE;Unity; -+OnlyShowIn=GNOME;XFCE;LXDE;Unity;MATE; - X-GNOME-Autostart-enabled=true diff --git a/clipit.spec b/clipit.spec index a61eec2..50829b9 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,15 +1,15 @@ Name: clipit -Version: 1.4.2 -Release: 17%{?dist} +Version: 1.4.4 +Release: 1%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ URL: https://github.com/CristianHenzel/ClipIt -Source0: http://downloads.sourceforge.net/gtk%{name}/%{name}-%{version}.tar.gz +Source0: https://github.com/CristianHenzel/ClipIt/archive/v%{version}.tar.gz Source1: %{name}.appdata.xml # clipit doesn't autostart in MATE # Fixed upstream but not yet merged -Patch0: %{name}-%{version}-mate.patch +Patch0: 0001-Autostart-in-MATE.patch BuildRequires: gcc @@ -32,11 +32,13 @@ ClipIts main features are: %prep -%setup -q +%setup -q -n ClipIt-%{version} %patch0 -p1 %build +./autogen.sh + %configure make %{?_smp_mflags} @@ -66,6 +68,9 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Fri Jun 29 2018 Michael Simacek - 1.4.4-1 +- Update to upstream version 1.4.4 + * Mon Feb 19 2018 Michael Simacek - 1.4.2-17 - AppData fixes - Specfile cleanup diff --git a/sources b/sources index 8921e77..8989973 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -118175f26869adcf04909fdbb5021eff clipit-1.4.2.tar.gz +SHA512 (v1.4.4.tar.gz) = 09d83aa6107c85a7fa604bee40cf45b4096b2db316f1e3286b8919d143d04cd2c4ba2293d563ff2b2e03d7e688a217149e24c14acbc9509146479e8532b3a623 From aa347ebd1adf28814859926378958e4d73676006 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 3 Jul 2018 18:00:00 +0200 Subject: [PATCH 25/58] Fix starting outside terminal --- 0001-Autostart-in-MATE.patch | 2 +- 0002-Fix-starting-outside-terminal.patch | 24 ++++++++++++++++++++++++ clipit.spec | 8 ++++++-- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 0002-Fix-starting-outside-terminal.patch diff --git a/0001-Autostart-in-MATE.patch b/0001-Autostart-in-MATE.patch index c03b04d..7a4ccee 100644 --- a/0001-Autostart-in-MATE.patch +++ b/0001-Autostart-in-MATE.patch @@ -1,7 +1,7 @@ From 39179ef368fc104c891ce50fd100c626f06f26b0 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 29 Jun 2018 10:45:42 +0200 -Subject: [PATCH] Autostart in MATE +Subject: [PATCH 1/2] Autostart in MATE --- data/clipit-startup.desktop.in | 2 +- diff --git a/0002-Fix-starting-outside-terminal.patch b/0002-Fix-starting-outside-terminal.patch new file mode 100644 index 0000000..dd0b04a --- /dev/null +++ b/0002-Fix-starting-outside-terminal.patch @@ -0,0 +1,24 @@ +From 84bda7c606fbae7ea2194c85ae109461509f901f Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 3 Jul 2018 17:48:58 +0200 +Subject: [PATCH 2/2] Fix starting outside terminal + +--- + src/main.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/main.c b/src/main.c +index 7e485ec..b44a005 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -1034,7 +1034,6 @@ int main(int argc, char **argv) { + return 0; + } + g_string_free(piped_string, TRUE); +- return -1; + } + } + +-- +2.17.1 + diff --git a/clipit.spec b/clipit.spec index 50829b9..48ee1c5 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -10,7 +10,7 @@ Source1: %{name}.appdata.xml # clipit doesn't autostart in MATE # Fixed upstream but not yet merged Patch0: 0001-Autostart-in-MATE.patch - +Patch1: 0002-Fix-starting-outside-terminal.patch BuildRequires: gcc BuildRequires: make @@ -35,6 +35,7 @@ ClipIts main features are: %setup -q -n ClipIt-%{version} %patch0 -p1 +%patch1 -p1 %build ./autogen.sh @@ -68,6 +69,9 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Tue Jul 03 2018 Michael Simacek - 1.4.4-2 +- Fix starting outside terminal + * Fri Jun 29 2018 Michael Simacek - 1.4.4-1 - Update to upstream version 1.4.4 From a2eea3d3cd89fda83069d0fb46bdeca647f80e57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 21:52:47 +0000 Subject: [PATCH 26/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 48ee1c5..16f491b 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -69,6 +69,9 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 03 2018 Michael Simacek - 1.4.4-2 - Fix starting outside terminal From 090e9e55a252ebb7d6a0cff9b4e667cc890c9c2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 15:44:37 +0000 Subject: [PATCH 27/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 16f491b..4604f3f 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -69,6 +69,9 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.4.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 1.4.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 87aee5785687ac8a3693706d415fae0514aecbcd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 20:24:51 +0000 Subject: [PATCH 28/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 4604f3f..cb03abb 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -69,6 +69,9 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.4.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.4.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 1833993bb4b28cea03c6be07226d92e2b57e2af1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 14:12:48 +0000 Subject: [PATCH 29/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index cb03abb..8bf0225 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -69,6 +69,9 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.4.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1.4.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 5d85f9969e67380e4c68b1e6bf4cbf0290879ece Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 14:05:58 +0000 Subject: [PATCH 30/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 8bf0225..34efb99 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -69,6 +69,9 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.4.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.4.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 51b51d53635110efb8712e479cf1e17730e193dc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 12 Sep 2020 00:11:20 +0900 Subject: [PATCH 31/58] Backport upstream patch to fix history purge time being too short (bug 1640765) --- clipit-1.4.4-config-item-member-fix.patch | 54 +++++++++++++++++++++++ clipit.spec | 9 +++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 clipit-1.4.4-config-item-member-fix.patch diff --git a/clipit-1.4.4-config-item-member-fix.patch b/clipit-1.4.4-config-item-member-fix.patch new file mode 100644 index 0000000..54c3e72 --- /dev/null +++ b/clipit-1.4.4-config-item-member-fix.patch @@ -0,0 +1,54 @@ +From 99d1d57875c5672a1b22e6b8b10786f4ff5cea0b Mon Sep 17 00:00:00 2001 +From: Cristian Henzel +Date: Fri, 29 Jun 2018 14:00:56 +0300 +Subject: [PATCH] Fix bug introduced by "History purge timeout" + +--- + src/main.c | 34 ++++++++++++++++++++++++++-------- + 1 file changed, 26 insertions(+), 8 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 7e485ec..e0e09ab 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -60,14 +60,32 @@ static gboolean status_menu_lock = FALSE; + static gboolean actions_lock = FALSE; + + /* Init preferences structure */ +-prefs_t prefs = {DEF_USE_COPY, DEF_USE_PRIMARY, DEF_SYNCHRONIZE, +- DEF_AUTOMATIC_PASTE, DEF_SHOW_INDEXES, DEF_SAVE_URIS, +- DEF_USE_RMB_MENU, DEF_SAVE_HISTORY, DEF_HISTORY_LIMIT, +- DEF_ITEMS_MENU, DEF_STATICS_SHOW, DEF_STATICS_ITEMS, +- DEF_HYPERLINKS_ONLY, DEF_CONFIRM_CLEAR, DEF_SINGLE_LINE, +- DEF_REVERSE_HISTORY, DEF_ITEM_LENGTH, DEF_ELLIPSIZE, +- INIT_HISTORY_KEY, INIT_ACTIONS_KEY, INIT_MENU_KEY, +- INIT_SEARCH_KEY, INIT_OFFLINE_KEY, DEF_NO_ICON, ++prefs_t prefs = {DEF_USE_COPY, ++ DEF_USE_PRIMARY, ++ DEF_SYNCHRONIZE, ++ DEF_AUTOMATIC_PASTE, ++ DEF_SHOW_INDEXES, ++ DEF_SAVE_URIS, ++ DEF_USE_RMB_MENU, ++ DEF_SAVE_HISTORY, ++ DEF_HISTORY_LIMIT, ++ DEF_HISTORY_TIMEOUT, ++ DEF_HISTORY_TIMEOUT_SECONDS, ++ DEF_ITEMS_MENU, ++ DEF_STATICS_SHOW, ++ DEF_STATICS_ITEMS, ++ DEF_HYPERLINKS_ONLY, ++ DEF_CONFIRM_CLEAR, ++ DEF_SINGLE_LINE, ++ DEF_REVERSE_HISTORY, ++ DEF_ITEM_LENGTH, ++ DEF_ELLIPSIZE, ++ INIT_HISTORY_KEY, ++ INIT_ACTIONS_KEY, ++ INIT_MENU_KEY, ++ INIT_SEARCH_KEY, ++ INIT_OFFLINE_KEY, ++ DEF_NO_ICON, + DEF_OFFLINE_MODE}; + + /* Variables for input buffer used for matching input to menu items */ diff --git a/clipit.spec b/clipit.spec index 34efb99..e80e76c 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -11,6 +11,9 @@ Source1: %{name}.appdata.xml # Fixed upstream but not yet merged Patch0: 0001-Autostart-in-MATE.patch Patch1: 0002-Fix-starting-outside-terminal.patch +# Upstream: https://github.com/CristianHenzel/ClipIt/commit/99d1d57875c5672a1b22e6b8b10786f4ff5cea0b +# Fix bug introduced by "History purge timeout" +Patch2: clipit-1.4.4-config-item-member-fix.patch BuildRequires: gcc BuildRequires: make @@ -36,6 +39,7 @@ ClipIts main features are: %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build ./autogen.sh @@ -69,6 +73,9 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Fri Sep 11 2020 Mamoru TASAKA - 1.4.4-8 +- Backport upstream patch to fix history purge time being too short (bug 1640765) + * Mon Jul 27 2020 Fedora Release Engineering - 1.4.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6a1dc07dd6cb73757066f5d1b622c0e456be68c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:06:00 +0000 Subject: [PATCH 32/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index e80e76c..41edc2a 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -73,6 +73,9 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.4.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Sep 11 2020 Mamoru TASAKA - 1.4.4-8 - Backport upstream patch to fix history purge time being too short (bug 1640765) From 24fcb969c1a6676887dc15b151d5413ac000f819 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 19 Mar 2021 22:12:12 +0900 Subject: [PATCH 33/58] 1.4.5 --- .gitignore | 1 + 0002-Fix-starting-outside-terminal.patch | 24 ---------- clipit-1.4.4-config-item-member-fix.patch | 54 ----------------------- clipit.spec | 51 ++++++++++++--------- sources | 2 +- 5 files changed, 33 insertions(+), 99 deletions(-) delete mode 100644 0002-Fix-starting-outside-terminal.patch delete mode 100644 clipit-1.4.4-config-item-member-fix.patch diff --git a/.gitignore b/.gitignore index fbf84f3..a7cce6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /clipit-1.4.1.tar.gz /clipit-1.4.2.tar.gz /v1.4.4.tar.gz +/v1.4.5.tar.gz diff --git a/0002-Fix-starting-outside-terminal.patch b/0002-Fix-starting-outside-terminal.patch deleted file mode 100644 index dd0b04a..0000000 --- a/0002-Fix-starting-outside-terminal.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 84bda7c606fbae7ea2194c85ae109461509f901f Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Tue, 3 Jul 2018 17:48:58 +0200 -Subject: [PATCH 2/2] Fix starting outside terminal - ---- - src/main.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/main.c b/src/main.c -index 7e485ec..b44a005 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1034,7 +1034,6 @@ int main(int argc, char **argv) { - return 0; - } - g_string_free(piped_string, TRUE); -- return -1; - } - } - --- -2.17.1 - diff --git a/clipit-1.4.4-config-item-member-fix.patch b/clipit-1.4.4-config-item-member-fix.patch deleted file mode 100644 index 54c3e72..0000000 --- a/clipit-1.4.4-config-item-member-fix.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 99d1d57875c5672a1b22e6b8b10786f4ff5cea0b Mon Sep 17 00:00:00 2001 -From: Cristian Henzel -Date: Fri, 29 Jun 2018 14:00:56 +0300 -Subject: [PATCH] Fix bug introduced by "History purge timeout" - ---- - src/main.c | 34 ++++++++++++++++++++++++++-------- - 1 file changed, 26 insertions(+), 8 deletions(-) - -diff --git a/src/main.c b/src/main.c -index 7e485ec..e0e09ab 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -60,14 +60,32 @@ static gboolean status_menu_lock = FALSE; - static gboolean actions_lock = FALSE; - - /* Init preferences structure */ --prefs_t prefs = {DEF_USE_COPY, DEF_USE_PRIMARY, DEF_SYNCHRONIZE, -- DEF_AUTOMATIC_PASTE, DEF_SHOW_INDEXES, DEF_SAVE_URIS, -- DEF_USE_RMB_MENU, DEF_SAVE_HISTORY, DEF_HISTORY_LIMIT, -- DEF_ITEMS_MENU, DEF_STATICS_SHOW, DEF_STATICS_ITEMS, -- DEF_HYPERLINKS_ONLY, DEF_CONFIRM_CLEAR, DEF_SINGLE_LINE, -- DEF_REVERSE_HISTORY, DEF_ITEM_LENGTH, DEF_ELLIPSIZE, -- INIT_HISTORY_KEY, INIT_ACTIONS_KEY, INIT_MENU_KEY, -- INIT_SEARCH_KEY, INIT_OFFLINE_KEY, DEF_NO_ICON, -+prefs_t prefs = {DEF_USE_COPY, -+ DEF_USE_PRIMARY, -+ DEF_SYNCHRONIZE, -+ DEF_AUTOMATIC_PASTE, -+ DEF_SHOW_INDEXES, -+ DEF_SAVE_URIS, -+ DEF_USE_RMB_MENU, -+ DEF_SAVE_HISTORY, -+ DEF_HISTORY_LIMIT, -+ DEF_HISTORY_TIMEOUT, -+ DEF_HISTORY_TIMEOUT_SECONDS, -+ DEF_ITEMS_MENU, -+ DEF_STATICS_SHOW, -+ DEF_STATICS_ITEMS, -+ DEF_HYPERLINKS_ONLY, -+ DEF_CONFIRM_CLEAR, -+ DEF_SINGLE_LINE, -+ DEF_REVERSE_HISTORY, -+ DEF_ITEM_LENGTH, -+ DEF_ELLIPSIZE, -+ INIT_HISTORY_KEY, -+ INIT_ACTIONS_KEY, -+ INIT_MENU_KEY, -+ INIT_SEARCH_KEY, -+ INIT_OFFLINE_KEY, -+ DEF_NO_ICON, - DEF_OFFLINE_MODE}; - - /* Variables for input buffer used for matching input to menu items */ diff --git a/clipit.spec b/clipit.spec index 41edc2a..4d43fa6 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit -Version: 1.4.4 -Release: 9%{?dist} +Version: 1.4.5 +Release: 1%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -10,17 +10,14 @@ Source1: %{name}.appdata.xml # clipit doesn't autostart in MATE # Fixed upstream but not yet merged Patch0: 0001-Autostart-in-MATE.patch -Patch1: 0002-Fix-starting-outside-terminal.patch -# Upstream: https://github.com/CristianHenzel/ClipIt/commit/99d1d57875c5672a1b22e6b8b10786f4ff5cea0b -# Fix bug introduced by "History purge timeout" -Patch2: clipit-1.4.4-config-item-member-fix.patch BuildRequires: gcc BuildRequires: make -BuildRequires: gtk2-devel +BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: desktop-file-utils BuildRequires: intltool BuildRequires: gettext +BuildRequires: %{_bindir}/appstream-util Requires: xdotool %description @@ -38,41 +35,55 @@ ClipIts main features are: %setup -q -n ClipIt-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%build +sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' +sed -i data/clipit-startup.desktop.in -e '\@_Comment.*hr@d' + ./autogen.sh -%configure -make %{?_smp_mflags} - +%build +%configure \ + --with-gtk3 \ + %{nil} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install %find_lang %{name} + desktop-file-install --delete-original \ --remove-category=Application \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop + desktop-file-install --delete-original \ --dir %{buildroot}%{_sysconfdir}/xdg/autostart \ %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-startup.desktop -mkdir -p %{buildroot}%{_datadir}/appdata/ -install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +mkdir -p %{buildroot}%{_metainfodir} +install -c -p -m 644 %{SOURCE1} %{buildroot}%{_metainfodir}/%{name}.appdata.xml + +%check +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml %files -f %{name}.lang -%doc AUTHORS ChangeLog COPYING README NEWS +%license COPYING +%doc AUTHORS +%doc ChangeLog +%doc README.md + %{_bindir}/%{name} %{_mandir}/man1/%{name}.1.* -%{_datadir}/icons/hicolor/scalable/apps/%{name}-trayicon.svg +%{_datadir}/icons/hicolor/scalable/apps/%{name}-trayicon*.svg +%{_metainfodir}/%{name}.appdata.xml + %{_datadir}/applications/%{name}.desktop %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop -%{_datadir}/appdata/%{name}.appdata.xml - %changelog +* Fri Mar 19 2021 Mamoru TASAKA - 1.4.5-1 +- 1.4.5 + * Tue Jan 26 2021 Fedora Release Engineering - 1.4.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 8989973..9e5070a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.4.4.tar.gz) = 09d83aa6107c85a7fa604bee40cf45b4096b2db316f1e3286b8919d143d04cd2c4ba2293d563ff2b2e03d7e688a217149e24c14acbc9509146479e8532b3a623 +SHA512 (v1.4.5.tar.gz) = 2bfa2635be9fd63a8bf41842da5a6a4063b442b4e8d011bb1a696ae1e9883408fb327eb331e220d10569ec72c399ca79ac5a94f7fe5402ae4fae11bacbe87b70 From 5283b848c893369630b3616c8479f09221f92091 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 19 Mar 2021 22:23:51 +0900 Subject: [PATCH 34/58] fix BR, oops.. --- clipit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 4d43fa6..0a91d31 100644 --- a/clipit.spec +++ b/clipit.spec @@ -13,7 +13,7 @@ Patch0: 0001-Autostart-in-MATE.patch BuildRequires: gcc BuildRequires: make -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: desktop-file-utils BuildRequires: intltool BuildRequires: gettext From c758ded1e2faef4cadfe35d6deda74416500dafa Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 30 Mar 2021 00:41:58 +0900 Subject: [PATCH 35/58] Force GDK_BACKEND to x11 (bug 1943480, bug 1943509) --- clipit-1.4.5-force-gdk_backend-x11.patch | 10 ++++++++++ clipit.spec | 10 ++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 clipit-1.4.5-force-gdk_backend-x11.patch diff --git a/clipit-1.4.5-force-gdk_backend-x11.patch b/clipit-1.4.5-force-gdk_backend-x11.patch new file mode 100644 index 0000000..47e3bdc --- /dev/null +++ b/clipit-1.4.5-force-gdk_backend-x11.patch @@ -0,0 +1,10 @@ +--- ClipIt-1.4.5/src/main.c.nowayland 2020-06-11 14:33:56.000000000 +0900 ++++ ClipIt-1.4.5/src/main.c 2021-03-30 00:28:10.301811018 +0900 +@@ -1086,6 +1086,7 @@ int main(int argc, char **argv) { + bindtextdomain(GETTEXT_PACKAGE, CLIPITLOCALEDIR); + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + textdomain(GETTEXT_PACKAGE); ++ setenv("GDK_BACKEND", "x11", 1); + + input_buffer[0] = '\0'; + input_index = 0; diff --git a/clipit.spec b/clipit.spec index 0a91d31..00e32e8 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -10,6 +10,8 @@ Source1: %{name}.appdata.xml # clipit doesn't autostart in MATE # Fixed upstream but not yet merged Patch0: 0001-Autostart-in-MATE.patch +# Force GDK_BACKEND to x11 +Patch1: clipit-1.4.5-force-gdk_backend-x11.patch BuildRequires: gcc BuildRequires: make @@ -34,7 +36,8 @@ ClipIts main features are: %prep %setup -q -n ClipIt-%{version} -%patch0 -p1 +%patch0 -p1 -b .mate +%patch1 -p1 -b .nowayland sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' sed -i data/clipit-startup.desktop.in -e '\@_Comment.*hr@d' @@ -81,6 +84,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Mon Mar 29 2021 Mamoru TASAKA - 1.4.5-2 +- Force GDK_BACKEND to x11 (bug 1943480, bug 1943509) + * Fri Mar 19 2021 Mamoru TASAKA - 1.4.5-1 - 1.4.5 From efbf64decb06f851932678ab1cb5407a821371ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 14:38:04 +0000 Subject: [PATCH 36/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 7d4b91f91ccdbe2443481ee3a3a5dcfaebfb2065 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 19:35:33 +0000 Subject: [PATCH 37/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 00e32e8..d1afde8 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -84,6 +84,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.4.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Mar 29 2021 Mamoru TASAKA - 1.4.5-2 - Force GDK_BACKEND to x11 (bug 1943480, bug 1943509) From 50d70dd54d949cc670377147b3f8294c36f85027 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 22 Sep 2021 18:10:44 +0900 Subject: [PATCH 38/58] Update to the latest git increase POPUP_DELAY to workaround hotkey popup issue --- .gitignore | 1 + clipit.spec | 73 +++++++++++++++++++++++++++++-- create-clipit-git-bare-tarball.sh | 33 ++++++++++++++ sources | 2 +- 4 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 create-clipit-git-bare-tarball.sh diff --git a/.gitignore b/.gitignore index a7cce6f..7be9f10 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /clipit-1.4.2.tar.gz /v1.4.4.tar.gz /v1.4.5.tar.gz +/ClipIt-20210922T1754.tar.gz diff --git a/clipit.spec b/clipit.spec index d1afde8..b25afa7 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,11 +1,41 @@ +%global main_ver 1.4.5 +%global vendor_rel 4 + +%global reponame ClipIt +%global gitdate 20210513 +%global gitcommit e5fa64c216c1b02a43cb3c90e8a151e43e881d96 +%global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) + +%global tarballdate 20210922 +%global tarballtime 1754 + +%global use_release 0 +%global use_gitbare 1 +%global use_gitcommit_as_rel 1 + +%if 0%{?use_gitbare} < 1 +%global use_release 1 +%endif + +%if 0%{?use_gitcommit_as_rel} >= 1 +%global rel %{vendor_rel}.D%{gitdate}git%{shortcommit}%{?dist} +%else +%define rel %{vendor_rel}%{?dist} +%endif + + Name: clipit -Version: 1.4.5 -Release: 3%{?dist} +Version: %{main_ver} +Release: %{rel} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ URL: https://github.com/CristianHenzel/ClipIt +%if 0%{?use_release} >= 1 Source0: https://github.com/CristianHenzel/ClipIt/archive/v%{version}.tar.gz +%else +Source0: %{reponame}-%{tarballdate}T%{tarballtime}.tar.gz +%endif Source1: %{name}.appdata.xml # clipit doesn't autostart in MATE # Fixed upstream but not yet merged @@ -13,6 +43,11 @@ Patch0: 0001-Autostart-in-MATE.patch # Force GDK_BACKEND to x11 Patch1: clipit-1.4.5-force-gdk_backend-x11.patch + +%if 0%{?use_gitbare} >= 1 +BuildRequires: git +%endif +BuildRequires: automake BuildRequires: gcc BuildRequires: make BuildRequires: pkgconfig(gtk+-3.0) @@ -34,7 +69,18 @@ ClipIts main features are: %prep -%setup -q -n ClipIt-%{version} +%if 0%{?use_release} >= 1 +%setup -q -n %{reponame}-%{version} +%endif + +%if 0%{?use_gitbare} >= 1 +%setup -q -c -T -a 0 +git clone ./%{reponame}.git + +cd %{reponame} +git checkout -b fedora-%{version}-head %{gitcommit} +cp -a [A-Z]* .. +%endif %patch0 -p1 -b .mate %patch1 -p1 -b .nowayland @@ -42,16 +88,33 @@ ClipIts main features are: sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' sed -i data/clipit-startup.desktop.in -e '\@_Comment.*hr@d' +%if 0%{?use_gitbare} >= 1 +git commit -m "Apply Fedora specific configuration" -a +%endif + ./autogen.sh %build +%if 0%{?use_gitbare} >= 1 +cd %{reponame} +%endif + %configure \ --with-gtk3 \ %{nil} %make_build %install +%if 0%{?use_gitbare} >= 1 +cd %{reponame} +%endif + %make_install + +%if 0%{?use_gitbare} >= 1 +cd .. +%endif + %find_lang %{name} desktop-file-install --delete-original \ @@ -84,6 +147,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Sep 22 2021 Mamoru TASAKA - 1.4.5-4.D20210513gite5fa64c +- Update to the latest git + - increase POPUP_DELAY to workaround hotkey popup issue + * Wed Jul 21 2021 Fedora Release Engineering - 1.4.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/create-clipit-git-bare-tarball.sh b/create-clipit-git-bare-tarball.sh new file mode 100644 index 0000000..9de0946 --- /dev/null +++ b/create-clipit-git-bare-tarball.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +set -x +set -e + +REPONAME=ClipIt +GITURL=https://github.com/CristianHenzel/${REPONAME}.git + +DATE=$(date '+%Y%m%d') +TIME=$(date '+%H%M') + +TARNAME=${REPONAME}-${DATE}T${TIME}.tar.gz + +PWDDIR=$(pwd) +TMPDIR=$(mktemp -d /var/tmp/${REPONAME}-XXXXXX) +pushd $TMPDIR + +git clone --mirror $GITURL + +mkdir TMP +pushd TMP +git clone ../${REPONAME}.git +cd ${REPONAME} +git log --format=fuller 2>&1 | head -n 8 +#grep version README.md +echo +popd + +tar czf ${TARNAME} ${REPONAME}.git/ + +cp -p ${TARNAME} $PWDDIR +popd +rm -rf $TMPDIR diff --git a/sources b/sources index 9e5070a..7e741c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.4.5.tar.gz) = 2bfa2635be9fd63a8bf41842da5a6a4063b442b4e8d011bb1a696ae1e9883408fb327eb331e220d10569ec72c399ca79ac5a94f7fe5402ae4fae11bacbe87b70 +SHA512 (ClipIt-20210922T1754.tar.gz) = ba3efcaaa935b89f76035ade44cfd93eeb58a0982c48db2486edd6f33aa70c017e0b90017870d36ad5d22e26de470c51ade0ed8ea31766461a6bdd753075aa84 From 629a8c604b1ce9f879b6934304b5a4838464f375 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 22 Sep 2021 18:20:12 +0900 Subject: [PATCH 39/58] git config --- clipit.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/clipit.spec b/clipit.spec index b25afa7..355cf71 100644 --- a/clipit.spec +++ b/clipit.spec @@ -80,6 +80,9 @@ git clone ./%{reponame}.git cd %{reponame} git checkout -b fedora-%{version}-head %{gitcommit} cp -a [A-Z]* .. + +git config user.name "%{name} Fedora maintainer" +git config user.email "%{name}-owner@fedoraproject.org" %endif %patch0 -p1 -b .mate From 1bac9b4508a2ad286e98d6665019c6cae9cac5f2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 22 Sep 2021 18:20:36 +0900 Subject: [PATCH 40/58] s|owner|maintainer --- clipit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 355cf71..b7cec52 100644 --- a/clipit.spec +++ b/clipit.spec @@ -82,7 +82,7 @@ git checkout -b fedora-%{version}-head %{gitcommit} cp -a [A-Z]* .. git config user.name "%{name} Fedora maintainer" -git config user.email "%{name}-owner@fedoraproject.org" +git config user.email "%{name}-maintainer@fedoraproject.org" %endif %patch0 -p1 -b .mate From 8cb95f7cde23c0296f11cf4cca4836e57e138fa7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 23:21:56 +0000 Subject: [PATCH 41/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index b7cec52..83e620b 100644 --- a/clipit.spec +++ b/clipit.spec @@ -26,7 +26,7 @@ Name: clipit Version: %{main_ver} -Release: %{rel} +Release: %{rel}.1 Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -150,6 +150,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Sep 22 2021 Mamoru TASAKA - 1.4.5-4.D20210513gite5fa64c - Update to the latest git - increase POPUP_DELAY to workaround hotkey popup issue From 7cac207a4ad1dd7c0179bb3c1cbd6d285a75febc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:05:48 +0000 Subject: [PATCH 42/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 83e620b..f04b8e0 100644 --- a/clipit.spec +++ b/clipit.spec @@ -26,7 +26,7 @@ Name: clipit Version: %{main_ver} -Release: %{rel}.1 +Release: %{rel}.2 Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -150,6 +150,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f0952b6ce182351a2fa53ea9a1f572c8e9af75ef Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 14 Dec 2022 18:29:56 +0100 Subject: [PATCH 43/58] C99 compatibility fixes Related to: --- clipit-c99.patch | 31 +++++++++++++++++++++++++++++++ clipit.spec | 8 ++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 clipit-c99.patch diff --git a/clipit-c99.patch b/clipit-c99.patch new file mode 100644 index 0000000..70b1102 --- /dev/null +++ b/clipit-c99.patch @@ -0,0 +1,31 @@ +C99 removed implicit function declarations. Include for +the umask function, and init_history_timeout_timer because it is used +in main.c. + +Submitted upstream: + +diff --git a/src/main.c b/src/main.c +index 148753b..089cf39 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + + #define ICON "clipit-trayicon" + #define ICON_OFFLINE "clipit-trayicon-offline" +diff --git a/src/preferences.h b/src/preferences.h +index b022839..2dd0d28 100644 +--- a/src/preferences.h ++++ b/src/preferences.h +@@ -80,6 +80,8 @@ void show_preferences(gint tab); + + void init_purge_timer(); + ++void init_history_timeout_timer(); ++ + G_END_DECLS + + #endif diff --git a/clipit.spec b/clipit.spec index f04b8e0..eeecd57 100644 --- a/clipit.spec +++ b/clipit.spec @@ -26,7 +26,7 @@ Name: clipit Version: %{main_ver} -Release: %{rel}.2 +Release: %{rel}.3 Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -42,7 +42,7 @@ Source1: %{name}.appdata.xml Patch0: 0001-Autostart-in-MATE.patch # Force GDK_BACKEND to x11 Patch1: clipit-1.4.5-force-gdk_backend-x11.patch - +Patch2: clipit-c99.patch %if 0%{?use_gitbare} >= 1 BuildRequires: git @@ -87,6 +87,7 @@ git config user.email "%{name}-maintainer@fedoraproject.org" %patch0 -p1 -b .mate %patch1 -p1 -b .nowayland +%patch2 -p1 sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' sed -i data/clipit-startup.desktop.in -e '\@_Comment.*hr@d' @@ -150,6 +151,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Dec 14 2022 Florian Weimer - 1.4.5-4.D20210513gite5fa64c.3 +- C99 compatibility fixes + * Wed Jul 20 2022 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 4038baf452537458811ddb08124fbb5161421d76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:01:11 +0000 Subject: [PATCH 44/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index eeecd57..7e2b466 100644 --- a/clipit.spec +++ b/clipit.spec @@ -26,7 +26,7 @@ Name: clipit Version: %{main_ver} -Release: %{rel}.3 +Release: %{rel}.4 Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -151,6 +151,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 14 2022 Florian Weimer - 1.4.5-4.D20210513gite5fa64c.3 - C99 compatibility fixes From c1140b63b34a48ad6b3adbb5727df8956a0c6706 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 15:51:43 +0000 Subject: [PATCH 45/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 7e2b466..40570e0 100644 --- a/clipit.spec +++ b/clipit.spec @@ -26,7 +26,7 @@ Name: clipit Version: %{main_ver} -Release: %{rel}.4 +Release: %{rel}.5 Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -151,6 +151,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 62a2e50e3f267acf01d6afe15f219185eda0bd29 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 10 Jan 2024 23:37:13 +0900 Subject: [PATCH 46/58] use hat for version --- clipit.spec | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/clipit.spec b/clipit.spec index 40570e0..bd1e394 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,5 +1,4 @@ %global main_ver 1.4.5 -%global vendor_rel 4 %global reponame ClipIt %global gitdate 20210513 @@ -10,30 +9,33 @@ %global tarballtime 1754 %global use_release 0 -%global use_gitbare 1 -%global use_gitcommit_as_rel 1 +%global use_gitbare 1 +%global use_gitcommit_as_ver 1 %if 0%{?use_gitbare} < 1 %global use_release 1 %endif -%if 0%{?use_gitcommit_as_rel} >= 1 -%global rel %{vendor_rel}.D%{gitdate}git%{shortcommit}%{?dist} +%if 0%{?use_gitcommit_as_ver} >= 1 +%global rpm_ver %{main_ver}^%{gitdate}git%{shortcommit} +%global builddir_ver %{main_ver}-%{gitdate}git%{shortcommit} %else -%define rel %{vendor_rel}%{?dist} +%define rpmver %{main_ver} +%global builddir_ver %{main_ver} %endif Name: clipit -Version: %{main_ver} -Release: %{rel}.5 +Version: %{rpm_ver} +Release: 0.100%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ URL: https://github.com/CristianHenzel/ClipIt %if 0%{?use_release} >= 1 Source0: https://github.com/CristianHenzel/ClipIt/archive/v%{version}.tar.gz -%else +%endif +%if 0%{?use_gitbare} >= 1 Source0: %{reponame}-%{tarballdate}T%{tarballtime}.tar.gz %endif Source1: %{name}.appdata.xml @@ -54,7 +56,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: desktop-file-utils BuildRequires: intltool BuildRequires: gettext -BuildRequires: %{_bindir}/appstream-util +BuildRequires: /usr/bin/appstream-util Requires: xdotool %description @@ -70,24 +72,24 @@ ClipIts main features are: %prep %if 0%{?use_release} >= 1 -%setup -q -n %{reponame}-%{version} +%setup -q -n %{reponame}-%{builddir_ver} %endif %if 0%{?use_gitbare} >= 1 -%setup -q -c -T -a 0 +%setup -q -c -n %{reponame}-%{builddir_ver} -T -a 0 git clone ./%{reponame}.git cd %{reponame} -git checkout -b fedora-%{version}-head %{gitcommit} +git checkout -b fedora-%{builddir_ver}-head %{gitcommit} cp -a [A-Z]* .. git config user.name "%{name} Fedora maintainer" -git config user.email "%{name}-maintainer@fedoraproject.org" +git config user.email "%{name}-maintainers@fedoraproject.org" %endif -%patch0 -p1 -b .mate -%patch1 -p1 -b .nowayland -%patch2 -p1 +%patch -P0 -p1 -b .mate +%patch -P1 -p1 -b .nowayland +%patch -P2 -p1 -b .c99 sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' sed -i data/clipit-startup.desktop.in -e '\@_Comment.*hr@d' From e15b5bf1aaf666f152af5a854b5971e1f4df7e75 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 10 Jan 2024 23:45:55 +0900 Subject: [PATCH 47/58] SPDX migration --- clipit.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/clipit.spec b/clipit.spec index bd1e394..2cbaaec 100644 --- a/clipit.spec +++ b/clipit.spec @@ -27,10 +27,15 @@ Name: clipit Version: %{rpm_ver} -Release: 0.100%{?dist} +Release: 1%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager -License: GPLv3+ +# meson.build says: GPL-3.0-or-later +# src/eggaccelerators.{c,h} LGPL-2.1-or-later +# src/keybinder.{c,h} LGPL-2.1-or-later +# Other source GPL-3.0-or-later +# SPDX confirmed +License: GPL-3.0-or-later AND LGPL-2.1-or-later URL: https://github.com/CristianHenzel/ClipIt %if 0%{?use_release} >= 1 Source0: https://github.com/CristianHenzel/ClipIt/archive/v%{version}.tar.gz @@ -153,6 +158,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jan 10 2024 Mamoru TASAKA - 1.4.5^20210513gite5fa64c-1 +- Use hat for release, change EVR scheme +- SPDX migration + * Wed Jul 19 2023 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From cdef40be188ac691ac691d718b237dc5a6e76ebf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 19 Jan 2024 16:54:51 +0900 Subject: [PATCH 48/58] Change -Wincompatible-pointer-types from error to warning --- clipit.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 2cbaaec..559250b 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,3 +1,6 @@ +# Skip -Werror=incompatilbe-pointer-types +%global build_type_safety_c 2 + %global main_ver 1.4.5 %global reponame ClipIt @@ -27,7 +30,7 @@ Name: clipit Version: %{rpm_ver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -158,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Fri Jan 19 2024 Mamoru TASAKA - 1.4.5^20210513gite5fa64c-2 +- Change -Wincompatible-pointer-types from error to warning + * Wed Jan 10 2024 Mamoru TASAKA - 1.4.5^20210513gite5fa64c-1 - Use hat for release, change EVR scheme - SPDX migration From 478b6fc4641ed014e58fd9328c57e3548c907a41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 15:38:55 +0000 Subject: [PATCH 49/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 559250b..da27b04 100644 --- a/clipit.spec +++ b/clipit.spec @@ -30,7 +30,7 @@ Name: clipit Version: %{rpm_ver} -Release: 2%{?dist} +Release: 3%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -161,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Mamoru TASAKA - 1.4.5^20210513gite5fa64c-2 - Change -Wincompatible-pointer-types from error to warning From aae53c002bc7db4ca76e7b3b07231eff0ff403b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 07:26:37 +0000 Subject: [PATCH 50/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index da27b04..6940458 100644 --- a/clipit.spec +++ b/clipit.spec @@ -30,7 +30,7 @@ Name: clipit Version: %{rpm_ver} -Release: 3%{?dist} +Release: 4%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -161,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ea4fd3ff9338ddabc05e2907e978985bc48d46a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 19:28:16 +0000 Subject: [PATCH 51/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 6940458..5d1cad8 100644 --- a/clipit.spec +++ b/clipit.spec @@ -30,7 +30,7 @@ Name: clipit Version: %{rpm_ver} -Release: 4%{?dist} +Release: 5%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -161,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0753dfca12f32a588d04912491b5dba07dc1a5b0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 8 Oct 2024 11:57:38 +0900 Subject: [PATCH 52/58] Apply debian patch for -Werror=incompatible-pointer-types --- clipit.spec | 11 +++-- incompatible-pointer-types.patch | 79 ++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 incompatible-pointer-types.patch diff --git a/clipit.spec b/clipit.spec index 5d1cad8..2105554 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,3 @@ -# Skip -Werror=incompatilbe-pointer-types -%global build_type_safety_c 2 - %global main_ver 1.4.5 %global reponame ClipIt @@ -30,7 +27,7 @@ Name: clipit Version: %{rpm_ver} -Release: 5%{?dist} +Release: 6%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -53,6 +50,8 @@ Patch0: 0001-Autostart-in-MATE.patch # Force GDK_BACKEND to x11 Patch1: clipit-1.4.5-force-gdk_backend-x11.patch Patch2: clipit-c99.patch +# Fix -Werror=incompatible-pointer-types +Patch3: https://sources.debian.org/data/main/c/clipit/1.4.5%2Bgit20210313-3/debian/patches/incompatible-pointer-types.patch %if 0%{?use_gitbare} >= 1 BuildRequires: git @@ -98,6 +97,7 @@ git config user.email "%{name}-maintainers@fedoraproject.org" %patch -P0 -p1 -b .mate %patch -P1 -p1 -b .nowayland %patch -P2 -p1 -b .c99 +%patch -P3 -p1 -b .c99_cast sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' sed -i data/clipit-startup.desktop.in -e '\@_Comment.*hr@d' @@ -161,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Tue Oct 08 2024 Mamoru TASAKA - 1.4.5^20210513gite5fa64c-6 +- Apply debian patch for -Werror=incompatible-pointer-types + * Wed Jul 17 2024 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/incompatible-pointer-types.patch b/incompatible-pointer-types.patch new file mode 100644 index 0000000..71e52ed --- /dev/null +++ b/incompatible-pointer-types.patch @@ -0,0 +1,79 @@ +Author: Andreas Beckmann +Description: fix building with -Werror=incompatible-pointer-types + +--- a/src/keybinder.c ++++ b/src/keybinder.c +@@ -310,7 +310,7 @@ keybinder_is_modifier (guint keycode) + gboolean retval = FALSE; + + mod_keymap = XGetModifierMapping ( +- GDK_WINDOW_XDISPLAY(gdk_display_get_default())); ++ GDK_DISPLAY_XDISPLAY(gdk_display_get_default())); + + map_size = 8 * mod_keymap->max_keypermod; + +--- a/src/main.c ++++ b/src/main.c +@@ -614,7 +614,7 @@ void underline_match(char* match, GtkMen + PangoAttrList* attr_list = pango_attr_list_new(); + pango_attr_list_insert (attr_list, underline); + +- GtkWidget* gtk_label = gtk_bin_get_child (GTK_BIN (menu_item)); ++ GtkLabel* gtk_label = (GtkLabel *) gtk_bin_get_child (GTK_BIN (menu_item)); + gtk_label_set_attributes (gtk_label, attr_list); + } + +@@ -638,7 +638,7 @@ gboolean selected_by_input(const GtkWidg + append_to_input_buffer(event->string); + + GtkMenuShell* menu = (GtkMenuShell *) history_menu; +- GList* element = gtk_container_get_children(menu); ++ GList* element = gtk_container_get_children((GtkContainer *) menu); + GtkMenuItem *menu_item, *first_match = 0; + + const gchar* menu_label; +@@ -657,9 +657,9 @@ gboolean selected_by_input(const GtkWidg + first_match = menu_item; + match_count++; + underline_match(match, menu_item, menu_label); +- gtk_widget_set_sensitive(menu_item, true); ++ gtk_widget_set_sensitive((GtkWidget *) menu_item, true); + } else { +- gtk_widget_set_sensitive(menu_item, false); ++ gtk_widget_set_sensitive((GtkWidget *) menu_item, false); + } + element = element->next; + count++; +@@ -667,7 +667,7 @@ gboolean selected_by_input(const GtkWidg + + if (first_match && match_count != prefs.items_menu) { + gtk_menu_item_select(first_match); +- gtk_menu_shell_select_item(menu, first_match); ++ gtk_menu_shell_select_item(menu, (GtkWidget *) first_match); + return TRUE; + } + return FALSE; +--- a/src/preferences.c ++++ b/src/preferences.c +@@ -723,7 +723,7 @@ void show_preferences(gint tab) { + *alignment, *hbox, + *vbox; + +- GtkWidget *adjustment, *adjustment_small, *adjustment_statics; ++ GtkAdjustment *adjustment, *adjustment_small, *adjustment_statics; + GtkTreeViewColumn *tree_column; + + /* Create the dialog */ +@@ -898,9 +898,9 @@ void show_preferences(gint tab) { + gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50); + gtk_box_pack_start((GtkBox*)hbox, label, FALSE, FALSE, 0); + ellipsize_combo = gtk_combo_box_text_new(); +- gtk_combo_box_text_append_text((GtkComboBox*)ellipsize_combo, _("Beginning")); +- gtk_combo_box_text_append_text((GtkComboBox*)ellipsize_combo, _("Middle")); +- gtk_combo_box_text_append_text((GtkComboBox*)ellipsize_combo, _("End")); ++ gtk_combo_box_text_append_text((GtkComboBoxText*)ellipsize_combo, _("Beginning")); ++ gtk_combo_box_text_append_text((GtkComboBoxText*)ellipsize_combo, _("Middle")); ++ gtk_combo_box_text_append_text((GtkComboBoxText*)ellipsize_combo, _("End")); + gtk_box_pack_start((GtkBox*)hbox, ellipsize_combo, FALSE, FALSE, 0); + gtk_box_pack_start((GtkBox*)vbox_history, frame, FALSE, FALSE, 0); + From e9038589fd259665818eced264fb12258505710f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:55:45 +0000 Subject: [PATCH 53/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 2105554..4ad0eeb 100644 --- a/clipit.spec +++ b/clipit.spec @@ -27,7 +27,7 @@ Name: clipit Version: %{rpm_ver} -Release: 6%{?dist} +Release: 7%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -161,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Oct 08 2024 Mamoru TASAKA - 1.4.5^20210513gite5fa64c-6 - Apply debian patch for -Werror=incompatible-pointer-types From 63a87183c6feeebff3e80d9a949f0202316ab36c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Jan 2025 00:07:05 +0900 Subject: [PATCH 54/58] Update to the latest git (20241103gitf35db54) --- clipit-c99.patch | 31 ------------------------------- clipit.spec | 16 +++++++++------- 2 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 clipit-c99.patch diff --git a/clipit-c99.patch b/clipit-c99.patch deleted file mode 100644 index 70b1102..0000000 --- a/clipit-c99.patch +++ /dev/null @@ -1,31 +0,0 @@ -C99 removed implicit function declarations. Include for -the umask function, and init_history_timeout_timer because it is used -in main.c. - -Submitted upstream: - -diff --git a/src/main.c b/src/main.c -index 148753b..089cf39 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - - #define ICON "clipit-trayicon" - #define ICON_OFFLINE "clipit-trayicon-offline" -diff --git a/src/preferences.h b/src/preferences.h -index b022839..2dd0d28 100644 ---- a/src/preferences.h -+++ b/src/preferences.h -@@ -80,6 +80,8 @@ void show_preferences(gint tab); - - void init_purge_timer(); - -+void init_history_timeout_timer(); -+ - G_END_DECLS - - #endif diff --git a/clipit.spec b/clipit.spec index 4ad0eeb..cf296f0 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,12 +1,12 @@ %global main_ver 1.4.5 %global reponame ClipIt -%global gitdate 20210513 -%global gitcommit e5fa64c216c1b02a43cb3c90e8a151e43e881d96 +%global gitdate 20241103 +%global gitcommit f35db540c9d3c57b13439d66597736e917e8c9a1 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210922 -%global tarballtime 1754 +%global tarballdate 20250116 +%global tarballtime 2347 %global use_release 0 %global use_gitbare 1 @@ -27,7 +27,7 @@ Name: clipit Version: %{rpm_ver} -Release: 7%{?dist} +Release: 1%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -44,12 +44,12 @@ Source0: https://github.com/CristianHenzel/ClipIt/archive/v%{version}.tar Source0: %{reponame}-%{tarballdate}T%{tarballtime}.tar.gz %endif Source1: %{name}.appdata.xml +Source2: create-clipit-git-bare-tarball.sh # clipit doesn't autostart in MATE # Fixed upstream but not yet merged Patch0: 0001-Autostart-in-MATE.patch # Force GDK_BACKEND to x11 Patch1: clipit-1.4.5-force-gdk_backend-x11.patch -Patch2: clipit-c99.patch # Fix -Werror=incompatible-pointer-types Patch3: https://sources.debian.org/data/main/c/clipit/1.4.5%2Bgit20210313-3/debian/patches/incompatible-pointer-types.patch @@ -96,7 +96,6 @@ git config user.email "%{name}-maintainers@fedoraproject.org" %patch -P0 -p1 -b .mate %patch -P1 -p1 -b .nowayland -%patch -P2 -p1 -b .c99 %patch -P3 -p1 -b .c99_cast sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' @@ -161,6 +160,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Thu Jan 16 2025 Mamoru TASAKA - 1.4.5^20241103gitf35db54-1 +- Update to the latest git (20241103gitf35db54) + * Thu Jan 16 2025 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b3d8fc249c3780d38e00343d8a2e8561649200af Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Jan 2025 00:35:52 +0900 Subject: [PATCH 55/58] support C23 --- clipit-pr211-c23-function-prototype.patch | 55 +++++++++++++++++++++++ clipit.spec | 6 +++ 2 files changed, 61 insertions(+) create mode 100644 clipit-pr211-c23-function-prototype.patch diff --git a/clipit-pr211-c23-function-prototype.patch b/clipit-pr211-c23-function-prototype.patch new file mode 100644 index 0000000..799b2f6 --- /dev/null +++ b/clipit-pr211-c23-function-prototype.patch @@ -0,0 +1,55 @@ +From 46c53082bd81c769d3422f1bedbab57bc73e8007 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Fri, 17 Jan 2025 00:23:31 +0900 +Subject: [PATCH] Fix function prototype for g_timer_add family for C23 + +g_timer_add or g_timeout_add_seconds manual says that +the second argument must have type of GSourceFunc, i.e. +function with one gpointer argument returning gboolean. + +Fixing so, unless compilation fails with C23. +--- + src/manage.c | 2 +- + src/manage.h | 2 +- + src/preferences.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/manage.c b/src/manage.c +index 25f7b75..25ed6d4 100644 +--- a/src/manage.c ++++ b/src/manage.c +@@ -331,7 +331,7 @@ void search_window_response(GtkDialog *dialog, gint response_id, gpointer user_d + } + + /* Shows the search dialog */ +-gboolean show_search() ++gboolean show_search(gpointer user_data) + { + /* Prevent multiple instances */ + if(gtk_grab_get_current()) { +diff --git a/src/manage.h b/src/manage.h +index 8740c0f..b810e74 100644 +--- a/src/manage.h ++++ b/src/manage.h +@@ -24,7 +24,7 @@ + + G_BEGIN_DECLS + +-gboolean show_search(); ++gboolean show_search(gpointer); + void remove_all_selected(gpointer); + + G_END_DECLS +diff --git a/src/preferences.c b/src/preferences.c +index 4e9a9ed..8222758 100644 +--- a/src/preferences.c ++++ b/src/preferences.c +@@ -430,7 +430,7 @@ static void start_purge_timer(gint timeout_seconds); + static void stop_purge_timer(); + + /* Purge history if history_timeout is enabled. This function is called every prefs.history_timeout_seconds */ +-static gboolean purge_history() { ++static gboolean purge_history(gpointer user_data) { + if (prefs.history_timeout) { + g_list_free(history); + history = NULL; diff --git a/clipit.spec b/clipit.spec index cf296f0..816f01d 100644 --- a/clipit.spec +++ b/clipit.spec @@ -52,6 +52,9 @@ Patch0: 0001-Autostart-in-MATE.patch Patch1: clipit-1.4.5-force-gdk_backend-x11.patch # Fix -Werror=incompatible-pointer-types Patch3: https://sources.debian.org/data/main/c/clipit/1.4.5%2Bgit20210313-3/debian/patches/incompatible-pointer-types.patch +# https://github.com/CristianHenzel/ClipIt/pull/211 +# Fix compilation with C23 struct function prototype +Patch4: clipit-pr211-c23-function-prototype.patch %if 0%{?use_gitbare} >= 1 BuildRequires: git @@ -97,6 +100,7 @@ git config user.email "%{name}-maintainers@fedoraproject.org" %patch -P0 -p1 -b .mate %patch -P1 -p1 -b .nowayland %patch -P3 -p1 -b .c99_cast +%patch -P4 -p1 -b .c23 sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' sed -i data/clipit-startup.desktop.in -e '\@_Comment.*hr@d' @@ -106,6 +110,7 @@ git commit -m "Apply Fedora specific configuration" -a %endif ./autogen.sh +%global optflags %optflags -std=gnu23 %build %if 0%{?use_gitbare} >= 1 @@ -162,6 +167,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog * Thu Jan 16 2025 Mamoru TASAKA - 1.4.5^20241103gitf35db54-1 - Update to the latest git (20241103gitf35db54) +- Fix compilation with C23 for struct function prototypes * Thu Jan 16 2025 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 820491fd9cc6c07c55117f5356224483de76cca5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Jan 2025 00:36:29 +0900 Subject: [PATCH 56/58] upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7be9f10..0835745 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /v1.4.4.tar.gz /v1.4.5.tar.gz /ClipIt-20210922T1754.tar.gz +/ClipIt-20250116T2347.tar.gz diff --git a/sources b/sources index 7e741c9..7e089b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ClipIt-20210922T1754.tar.gz) = ba3efcaaa935b89f76035ade44cfd93eeb58a0982c48db2486edd6f33aa70c017e0b90017870d36ad5d22e26de470c51ade0ed8ea31766461a6bdd753075aa84 +SHA512 (ClipIt-20250116T2347.tar.gz) = c99a3b5633018f9a4f168cca8d81f6ec75b398579c4a875fe9ad258410548b3f6c012f0914ea33af7ffb6c40c7cf47732f3420def042a2a5b8976fdf8e011c35 From fe7c35eb4ab927711cfb765c5e34a455a767fd2e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Jan 2025 11:20:34 +0900 Subject: [PATCH 57/58] Remove some debugging code --- clipit.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/clipit.spec b/clipit.spec index 816f01d..b43c5c6 100644 --- a/clipit.spec +++ b/clipit.spec @@ -27,7 +27,7 @@ Name: clipit Version: %{rpm_ver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -110,7 +110,6 @@ git commit -m "Apply Fedora specific configuration" -a %endif ./autogen.sh -%global optflags %optflags -std=gnu23 %build %if 0%{?use_gitbare} >= 1 @@ -165,6 +164,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Fri Jan 24 2025 Mamoru TASAKA - 1.4.5^20241103gitf35db54-2 +- Remove debugging -std= option + * Thu Jan 16 2025 Mamoru TASAKA - 1.4.5^20241103gitf35db54-1 - Update to the latest git (20241103gitf35db54) - Fix compilation with C23 for struct function prototypes From 1b6c09d5d58390ad890caf339f7dc968451b980a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:23:59 +0000 Subject: [PATCH 58/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index b43c5c6..1b52227 100644 --- a/clipit.spec +++ b/clipit.spec @@ -27,7 +27,7 @@ Name: clipit Version: %{rpm_ver} -Release: 2%{?dist} +Release: 3%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -164,6 +164,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.4.5^20241103gitf35db54-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 24 2025 Mamoru TASAKA - 1.4.5^20241103gitf35db54-2 - Remove debugging -std= option