From 863efabb3323e038d50f89a858b27c3c97d16276 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 24 Sep 2021 12:10:47 -0400 Subject: [PATCH 01/35] Use %%{_metainfodir} macro in spec file --- sequeler.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sequeler.spec b/sequeler.spec index 2be94c1..bcda3ab 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -146,7 +146,7 @@ desktop-file-validate \ %{buildroot}/%{_datadir}/applications/%{appname}.desktop appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + %{buildroot}/%{_metainfodir}/%{appname}.appdata.xml %files -f %{appname}.lang @@ -159,7 +159,7 @@ appstream-util validate-relax --nonet \ %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %{_datadir}/icons/hicolor/*/*/%{appname}.svg %{_datadir}/icons/hicolor/{16x16,24x24}/{actions,status}/*.svg -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_metainfodir}/%{appname}.appdata.xml %changelog From 688382a8b94022de41723f369189760fc7298d91 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 5 Jan 2022 08:12:07 -0500 Subject: [PATCH 02/35] Also validate AppData with appstreamcli https://pagure.io/packaging-committee/issue/1053 --- sequeler.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sequeler.spec b/sequeler.spec index bcda3ab..0a22c0d 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -19,7 +19,11 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: gettext +# Still required by guidelines for now +# (https://pagure.io/packaging-committee/issue/1053): BuildRequires: libappstream-glib +# Matches what gnome-software and others use: +BuildRequires: appstream BuildRequires: meson BuildRequires: vala @@ -145,8 +149,13 @@ Ypatybės: desktop-file-validate \ %{buildroot}/%{_datadir}/applications/%{appname}.desktop +# Still required by guidelines for now +# (https://pagure.io/packaging-committee/issue/1053): appstream-util validate-relax --nonet \ %{buildroot}/%{_metainfodir}/%{appname}.appdata.xml +# Matches what gnome-software and others use: +appstreamcli validate --nonet \ + %{buildroot}/%{_metainfodir}/%{appname}.appdata.xml %files -f %{appname}.lang From a01feed0044303d71230c58983a28f64a20c9e8c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 13 Jan 2022 12:17:31 -0500 Subject: [PATCH 03/35] Add BR on gcc --- sequeler.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sequeler.spec b/sequeler.spec index 0a22c0d..93e3d91 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -19,13 +19,16 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: gettext + # Still required by guidelines for now # (https://pagure.io/packaging-committee/issue/1053): BuildRequires: libappstream-glib # Matches what gnome-software and others use: BuildRequires: appstream + BuildRequires: meson BuildRequires: vala +BuildRequires: gcc BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(glib-2.0) From 9a9f535a15cfbc76dd2356cf2f3f8c5b4face668 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:41:43 +0000 Subject: [PATCH 04/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From c3869df5b9352b48debfe836b675b1a38f14ee59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:23:23 +0000 Subject: [PATCH 05/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From e29cf2a56324a5b1f540dc7bc7c9395e469b611a Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 4 Aug 2022 15:00:08 -0500 Subject: [PATCH 06/35] libgda rebuild --- changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog b/changelog index ce8dd17..d695d63 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +* Thu Aug 04 2022 Gwyn Ciesla - 0.8.1-3 +- libgda rebuild + * Fri Jul 09 2021 Benjamin A. Beasley - 0.8.1-2 - Switch License field to “effective license” of GPLv3+ From df63f6de0579dcfd83f39921ff412440d833ebd6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 4 Aug 2022 15:59:04 -0500 Subject: [PATCH 07/35] Update BR --- sequeler.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequeler.spec b/sequeler.spec index 93e3d91..b5a0c2c 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -36,7 +36,7 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(granite) >= 5.2.0 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtksourceview-3.0) -BuildRequires: pkgconfig(libgda-5.0) +BuildRequires: pkgconfig(libgda-6.0) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libssh2) BuildRequires: pkgconfig(libxml-2.0) From b0ecc99b870114e897fc4a059897d86e32a51f7d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 4 Aug 2022 16:07:01 -0500 Subject: [PATCH 08/35] Revert "Update BR" This reverts commit df63f6de0579dcfd83f39921ff412440d833ebd6. --- sequeler.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequeler.spec b/sequeler.spec index b5a0c2c..93e3d91 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -36,7 +36,7 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(granite) >= 5.2.0 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtksourceview-3.0) -BuildRequires: pkgconfig(libgda-6.0) +BuildRequires: pkgconfig(libgda-5.0) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libssh2) BuildRequires: pkgconfig(libxml-2.0) From cd442978b013b374bd1a9127a9e42d8f2f5a1e34 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 18 Aug 2022 09:22:57 -0400 Subject: [PATCH 09/35] Fix broken changelogs --- changelog | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/changelog b/changelog index d695d63..ee88889 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,33 @@ -* Thu Aug 04 2022 Gwyn Ciesla - 0.8.1-3 +* Thu Aug 18 2022 Benjamin A. Beasley 0.8.2-10 +- Fix broken changelogs + +* Thu Aug 04 2022 Gwyn Ciesla 0.8.2-9 +- Revert "Update BR" + +* Thu Aug 04 2022 Gwyn Ciesla 0.8.2-8 +- Update BR + +* Thu Aug 04 2022 Gwyn Ciesla - 0.8.2-7 - libgda rebuild +* Sat Jul 23 2022 Fedora Release Engineering 0.8.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering 0.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jan 13 2022 Benjamin A. Beasley 0.8.2-4 +- Add BR on gcc + +* Wed Jan 05 2022 Benjamin A. Beasley 0.8.2-3 +- Also validate AppData with appstreamcli + +* Fri Sep 24 2021 Benjamin A. Beasley 0.8.2-2 +- Use %%{_metainfodir} macro in spec file + +* Thu Aug 12 2021 Benjamin A. Beasley 0.8.2-1 +- Update to 0.8.2 (close RHBZ#1992913) + * Fri Jul 09 2021 Benjamin A. Beasley - 0.8.1-2 - Switch License field to “effective license” of GPLv3+ @@ -126,4 +153,3 @@ * Wed Jan 03 2018 Fabio Valentini - 0.4.1-1 - Initial package for fedora. - From 96ac5f36930d01a6d561279876d494a6f42fb1e1 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 29 Nov 2022 13:50:08 -0500 Subject: [PATCH 10/35] Update License to SPDX --- sequeler.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sequeler.spec b/sequeler.spec index 93e3d91..b59704a 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -4,15 +4,15 @@ Name: sequeler Summary: Friendly SQL Client Version: 0.8.2 Release: %autorelease -# The entire source is GPLv3+ (the LICENSE file is GPLv3, and both +# The entire source is GPL-3.0-or-later (the LICENSE file is GPLv3, and both # data/com.github.alecaddd.sequeler.appdata.xml.in.in and debian/copyright -# indicate GPLv3+ is intended), except: +# indicate GPL-3.0-or-later is intended), except: # - the Vala sources (all .vala files under src/ or its subdirectories), -# which are GPLv2+ -# - vapi/linux.vapi, which is LGPLv2+ -# - data/com.github.alecaddd.sequeler.appdata.xml.in.in, which is CC0. -# This results in an effective license of GPLv3+. -License: GPLv3+ +# which are GPL-2.0-or-later +# - vapi/linux.vapi, which is LGPL-2.1-or-later +# - data/com.github.alecaddd.sequeler.appdata.xml.in.in, which is CC0-1.0 +# (which is approved for content, which this file is). +License: GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND CC0-1.0 URL: https://github.com/Alecaddd/%{name} Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz From b6f79c62c4c3fc01f788998243c96dd80a9ae439 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 21 Dec 2022 18:02:39 -0500 Subject: [PATCH 11/35] Leaf package: remove i686 support --- sequeler.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sequeler.spec b/sequeler.spec index b59704a..afc7906 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -17,6 +17,9 @@ License: GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND URL: https://github.com/Alecaddd/%{name} Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: desktop-file-utils BuildRequires: gettext From a55c454e89344776264c61621381f1b66b05a232 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:00:57 +0000 Subject: [PATCH 12/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 7a8eef3807c6e7ef9084ae130c9255dfebe8871f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 29 May 2023 12:24:31 -0400 Subject: [PATCH 13/35] Do not number the sole Source [skip changelog] --- sequeler.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sequeler.spec b/sequeler.spec index afc7906..c106ddd 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -4,6 +4,7 @@ Name: sequeler Summary: Friendly SQL Client Version: 0.8.2 Release: %autorelease + # The entire source is GPL-3.0-or-later (the LICENSE file is GPLv3, and both # data/com.github.alecaddd.sequeler.appdata.xml.in.in and debian/copyright # indicate GPL-3.0-or-later is intended), except: @@ -13,9 +14,8 @@ Release: %autorelease # - data/com.github.alecaddd.sequeler.appdata.xml.in.in, which is CC0-1.0 # (which is approved for content, which this file is). License: GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND CC0-1.0 - URL: https://github.com/Alecaddd/%{name} -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} From f4fb4df3624329d298f7147909f0ab3c0f7b571d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:25:42 +0000 Subject: [PATCH 14/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From b5409e17b7dac066f166cc73f8b9e5f89f589355 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 29 Oct 2023 15:09:23 -0400 Subject: [PATCH 15/35] Break a long line in the spec file --- sequeler.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sequeler.spec b/sequeler.spec index c106ddd..49854fe 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -13,7 +13,12 @@ Release: %autorelease # - vapi/linux.vapi, which is LGPL-2.1-or-later # - data/com.github.alecaddd.sequeler.appdata.xml.in.in, which is CC0-1.0 # (which is approved for content, which this file is). -License: GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND CC0-1.0 +License: %{shrink: + GPL-3.0-or-later AND + GPL-2.0-or-later AND + LGPL-2.1-or-later AND + CC0-1.0 + } URL: https://github.com/Alecaddd/%{name} Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz From 17deedd3145f63d2989846de66f72108ee07da08 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 11:49:00 -0500 Subject: [PATCH 16/35] Correct appstreamcli invocation (--nonet no longer works) --- sequeler.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequeler.spec b/sequeler.spec index 49854fe..75672a7 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -165,7 +165,7 @@ desktop-file-validate \ appstream-util validate-relax --nonet \ %{buildroot}/%{_metainfodir}/%{appname}.appdata.xml # Matches what gnome-software and others use: -appstreamcli validate --nonet \ +appstreamcli validate --no-net \ %{buildroot}/%{_metainfodir}/%{appname}.appdata.xml From fab7521cf527aea0217fc8671103b7ef9361e2f2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 11:49:27 -0500 Subject: [PATCH 17/35] Ask appstreamcli to explain validation findings --- sequeler.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequeler.spec b/sequeler.spec index 75672a7..595a98e 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -165,7 +165,7 @@ desktop-file-validate \ appstream-util validate-relax --nonet \ %{buildroot}/%{_metainfodir}/%{appname}.appdata.xml # Matches what gnome-software and others use: -appstreamcli validate --no-net \ +appstreamcli validate --no-net --explain \ %{buildroot}/%{_metainfodir}/%{appname}.appdata.xml From a925ebeaa756c063a4ae05ed412452a34595cc55 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 12:04:44 -0500 Subject: [PATCH 18/35] Reduce macro indirection in the spec file [skip changelog] --- sequeler.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sequeler.spec b/sequeler.spec index 595a98e..96a2b6e 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -19,8 +19,8 @@ License: %{shrink: LGPL-2.1-or-later AND CC0-1.0 } -URL: https://github.com/Alecaddd/%{name} -Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +URL: https://github.com/Alecaddd/sequeler +Source: %{url}/archive/v%{version}/sequeler-%{version}.tar.gz # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} From e8dfec0ad597ca191efafc6235e97bf2b35e57ba Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 12:10:08 -0500 Subject: [PATCH 19/35] Fix deprecated top-level developer_name in AppData XML --- 387.patch | 25 +++++++++++++++++++++++++ sequeler.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 387.patch diff --git a/387.patch b/387.patch new file mode 100644 index 0000000..785d941 --- /dev/null +++ b/387.patch @@ -0,0 +1,25 @@ +From 4ea9b15ab43828cc3753fa812c24affbfd40ad48 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Thu, 9 Nov 2023 12:06:59 -0500 +Subject: [PATCH] Fix deprecated top-level developer_name in AppData XML + +Use the name element in a developer block instead, as recommended by appstreamcli 1.0.0. +--- + data/com.github.alecaddd.sequeler.appdata.xml.in.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/data/com.github.alecaddd.sequeler.appdata.xml.in.in b/data/com.github.alecaddd.sequeler.appdata.xml.in.in +index 97314ff..2d25a3c 100644 +--- a/data/com.github.alecaddd.sequeler.appdata.xml.in.in ++++ b/data/com.github.alecaddd.sequeler.appdata.xml.in.in +@@ -510,7 +510,9 @@ + https://raw.githubusercontent.com/Alecaddd/sequeler/master/data/assets/screenshots/sequeler-screenshot2.png + + +- Alessandro Castellani ++ ++ Alessandro Castellani ++ + @appid@.desktop + https://github.com/Alecaddd/sequeler + https://www.paypal.me/alecaddd diff --git a/sequeler.spec b/sequeler.spec index 96a2b6e..ac5498b 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -22,6 +22,10 @@ License: %{shrink: URL: https://github.com/Alecaddd/sequeler Source: %{url}/archive/v%{version}/sequeler-%{version}.tar.gz +# Fix deprecated top-level developer_name in AppData XML +# https://github.com/Alecaddd/sequeler/pull/387 +Patch: %{url}/pull/387.patch + # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -142,7 +146,7 @@ Ypatybės: %prep -%autosetup +%autosetup -p1 %build From 0c4d8cf923d6f8b530cb01670220c39fb2af6e5e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 13:00:00 -0500 Subject: [PATCH 20/35] Hardlink duplicate icons to save space --- sequeler.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sequeler.spec b/sequeler.spec index ac5498b..5ccea34 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -38,6 +38,8 @@ BuildRequires: libappstream-glib # Matches what gnome-software and others use: BuildRequires: appstream +BuildRequires: hardlink + BuildRequires: meson BuildRequires: vala BuildRequires: gcc @@ -159,6 +161,11 @@ Ypatybės: %find_lang %{appname} +# Upstream installs the same SVG icon in many size-specific directories like +# /usr/share/icons/hicolor/64x64@2/; we can save space by hardlinking these +# together. +hardlink -c -v '%{buildroot}%{_datadir}/icons/hicolor' + %check desktop-file-validate \ From f1753da4bb9ca9bab3b6c1630d8fdd3bff001133 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:36:21 +0000 Subject: [PATCH 21/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a07a97c3990f1d92e871a0b625b3045798f90e53 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 3 Apr 2024 15:11:57 -0400 Subject: [PATCH 22/35] Update the rpmlintrc file [skip changelog] --- sequeler.rpmlintrc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sequeler.rpmlintrc b/sequeler.rpmlintrc index fcc4f67..c11737d 100644 --- a/sequeler.rpmlintrc +++ b/sequeler.rpmlintrc @@ -1,6 +1,8 @@ -# false positives -addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*") -addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*") - -# don't care about manpages -addFilter("W: no-manual-page-for-binary com.github.alecaddd.sequeler*") +# There is no reason to have a man page for a GUI program with no meaningful +# command-line options. +addFilter(r" no-manual-page-for-binary com\.github\.alecaddd\.sequeler$") +# Not real spelling errors: +# - "ctrl" is from keyboard shortcuts, like "ctrl+q" +addFilter(r" spelling-error \('ctrl',") +# Hardlinks within directories owned by a single package are safe. +addFilter(r" cross-directory-hard-link /\S+/icons/hicolor/\S+ /\S+/icons/hicolor/") From f2010df5c6c159e9c4edff14b483e1b2b1275146 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 3 Apr 2024 15:02:09 -0400 Subject: [PATCH 23/35] Add developer ID to AppStream metadata - Fixes failure to build/validate with appstream 1.0.2 --- 387.patch | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/387.patch b/387.patch index 785d941..402ed17 100644 --- a/387.patch +++ b/387.patch @@ -1,7 +1,7 @@ -From 4ea9b15ab43828cc3753fa812c24affbfd40ad48 Mon Sep 17 00:00:00 2001 +From a75bf78b106a4c751b18d4f4d82005c7ad5ae0f1 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 12:06:59 -0500 -Subject: [PATCH] Fix deprecated top-level developer_name in AppData XML +Subject: [PATCH 1/2] Fix deprecated top-level developer_name in AppData XML Use the name element in a developer block instead, as recommended by appstreamcli 1.0.0. --- @@ -23,3 +23,26 @@ index 97314ff..2d25a3c 100644 @appid@.desktop https://github.com/Alecaddd/sequeler https://www.paypal.me/alecaddd + +From b7d70ba2f8551e6f7007efa620b5694d52ff0352 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Wed, 3 Apr 2024 15:00:20 -0400 +Subject: [PATCH 2/2] Add a developer ID to the AppData XML file + +--- + data/com.github.alecaddd.sequeler.appdata.xml.in.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/com.github.alecaddd.sequeler.appdata.xml.in.in b/data/com.github.alecaddd.sequeler.appdata.xml.in.in +index 2d25a3c..4ee0733 100644 +--- a/data/com.github.alecaddd.sequeler.appdata.xml.in.in ++++ b/data/com.github.alecaddd.sequeler.appdata.xml.in.in +@@ -510,7 +510,7 @@ + https://raw.githubusercontent.com/Alecaddd/sequeler/master/data/assets/screenshots/sequeler-screenshot2.png + + +- ++ + Alessandro Castellani + + @appid@.desktop From 8f1ae81aa21623343c4022d85251d3ad4ba6351d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 2 Jul 2024 08:53:33 -0400 Subject: [PATCH 24/35] Fix libgda backend weak dependencies (fix RHBZ#2295154) --- sequeler.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sequeler.spec b/sequeler.spec index 5ccea34..8252699 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -57,9 +57,9 @@ BuildRequires: pkgconfig(libxml-2.0) Requires: hicolor-icon-theme -Recommends: libgda-mysql -Recommends: libgda-postgres -Recommends: libgda-sqlite +Recommends: libgda5-mysql +Recommends: libgda5-postgres +Recommends: libgda5-sqlite Summary(de): Benutzerfreundlicher SQL-Client Summary(fr): Un simple client SQL From 90db075eb1ac221ec8dedcb2104ebfe55754a4e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:15:51 +0000 Subject: [PATCH 25/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b3d5fcb1f9b3fdaad6c8e06e06727fc30b892c87 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 3 Nov 2024 06:20:27 -0500 Subject: [PATCH 26/35] Invoke %meson in %conf rather than in %build --- sequeler.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sequeler.spec b/sequeler.spec index 8252699..a3c1308 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -151,8 +151,11 @@ Ypatybės: %autosetup -p1 -%build +%conf %meson + + +%build %meson_build From 8bb99fdff127b754aef30865588412719c70d497 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:25:28 +0000 Subject: [PATCH 27/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f15e0d476f0b6bd76378c52f9e439b4b8dc0ca2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:09:23 +0000 Subject: [PATCH 28/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 9f75564dd5e3133b5f260968ad4826dfa15f67ec Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 26 Dec 2025 12:17:50 +0000 Subject: [PATCH 29/35] Update to 0.9.0 (close RHBZ#2425377) --- .gitignore | 1 + 387.patch | 48 ---------------------------------------------- sequeler.rpmlintrc | 2 +- sequeler.spec | 22 +++++++++------------ sources | 2 +- 5 files changed, 12 insertions(+), 63 deletions(-) delete mode 100644 387.patch diff --git a/.gitignore b/.gitignore index 280d84a..0ccfc27 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /sequeler-0.8.0.tar.gz /sequeler-0.8.1.tar.gz /sequeler-0.8.2.tar.gz +/sequeler-0.9.0.tar.gz diff --git a/387.patch b/387.patch deleted file mode 100644 index 402ed17..0000000 --- a/387.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a75bf78b106a4c751b18d4f4d82005c7ad5ae0f1 Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Thu, 9 Nov 2023 12:06:59 -0500 -Subject: [PATCH 1/2] Fix deprecated top-level developer_name in AppData XML - -Use the name element in a developer block instead, as recommended by appstreamcli 1.0.0. ---- - data/com.github.alecaddd.sequeler.appdata.xml.in.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/data/com.github.alecaddd.sequeler.appdata.xml.in.in b/data/com.github.alecaddd.sequeler.appdata.xml.in.in -index 97314ff..2d25a3c 100644 ---- a/data/com.github.alecaddd.sequeler.appdata.xml.in.in -+++ b/data/com.github.alecaddd.sequeler.appdata.xml.in.in -@@ -510,7 +510,9 @@ - https://raw.githubusercontent.com/Alecaddd/sequeler/master/data/assets/screenshots/sequeler-screenshot2.png - - -- Alessandro Castellani -+ -+ Alessandro Castellani -+ - @appid@.desktop - https://github.com/Alecaddd/sequeler - https://www.paypal.me/alecaddd - -From b7d70ba2f8551e6f7007efa620b5694d52ff0352 Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Wed, 3 Apr 2024 15:00:20 -0400 -Subject: [PATCH 2/2] Add a developer ID to the AppData XML file - ---- - data/com.github.alecaddd.sequeler.appdata.xml.in.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/com.github.alecaddd.sequeler.appdata.xml.in.in b/data/com.github.alecaddd.sequeler.appdata.xml.in.in -index 2d25a3c..4ee0733 100644 ---- a/data/com.github.alecaddd.sequeler.appdata.xml.in.in -+++ b/data/com.github.alecaddd.sequeler.appdata.xml.in.in -@@ -510,7 +510,7 @@ - https://raw.githubusercontent.com/Alecaddd/sequeler/master/data/assets/screenshots/sequeler-screenshot2.png - - -- -+ - Alessandro Castellani - - @appid@.desktop diff --git a/sequeler.rpmlintrc b/sequeler.rpmlintrc index c11737d..0b63875 100644 --- a/sequeler.rpmlintrc +++ b/sequeler.rpmlintrc @@ -1,6 +1,6 @@ # There is no reason to have a man page for a GUI program with no meaningful # command-line options. -addFilter(r" no-manual-page-for-binary com\.github\.alecaddd\.sequeler$") +addFilter(r" no-manual-page-for-binary \S+\.sequeler$") # Not real spelling errors: # - "ctrl" is from keyboard shortcuts, like "ctrl+q" addFilter(r" spelling-error \('ctrl',") diff --git a/sequeler.spec b/sequeler.spec index a3c1308..7b0b496 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -1,8 +1,8 @@ -%global appname com.github.alecaddd.sequeler +%global appname io.github.ellie_commons.sequeler Name: sequeler -Summary: Friendly SQL Client -Version: 0.8.2 +Summary: Easily connect to your local or remote database +Version: 0.9.0 Release: %autorelease # The entire source is GPL-3.0-or-later (the LICENSE file is GPLv3, and both @@ -22,10 +22,6 @@ License: %{shrink: URL: https://github.com/Alecaddd/sequeler Source: %{url}/archive/v%{version}/sequeler-%{version}.tar.gz -# Fix deprecated top-level developer_name in AppData XML -# https://github.com/Alecaddd/sequeler/pull/387 -Patch: %{url}/pull/387.patch - # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -40,16 +36,16 @@ BuildRequires: appstream BuildRequires: hardlink -BuildRequires: meson +BuildRequires: meson >= 0.59.0 BuildRequires: vala BuildRequires: gcc BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(granite) >= 5.2.0 +BuildRequires: pkgconfig(granite) >= 5.3.0 BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(gtksourceview-3.0) +BuildRequires: pkgconfig(gtksourceview-4) BuildRequires: pkgconfig(libgda-5.0) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libssh2) @@ -177,10 +173,10 @@ desktop-file-validate \ # Still required by guidelines for now # (https://pagure.io/packaging-committee/issue/1053): appstream-util validate-relax --nonet \ - %{buildroot}/%{_metainfodir}/%{appname}.appdata.xml + %{buildroot}/%{_metainfodir}/%{appname}.metainfo.xml # Matches what gnome-software and others use: appstreamcli validate --no-net --explain \ - %{buildroot}/%{_metainfodir}/%{appname}.appdata.xml + %{buildroot}/%{_metainfodir}/%{appname}.metainfo.xml %files -f %{appname}.lang @@ -193,7 +189,7 @@ appstreamcli validate --no-net --explain \ %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %{_datadir}/icons/hicolor/*/*/%{appname}.svg %{_datadir}/icons/hicolor/{16x16,24x24}/{actions,status}/*.svg -%{_metainfodir}/%{appname}.appdata.xml +%{_metainfodir}/%{appname}.metainfo.xml %changelog diff --git a/sources b/sources index 9a8bc77..8f7ab17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sequeler-0.8.2.tar.gz) = b1d5336d84c5cf7343c5fa9ef5a8f4842abdb6f0d42cb9e6fed15157083e8a0d4cf7e3ca0aa0bf9fb390683138336d857ef53440027eae8f15282e4ae75a17b7 +SHA512 (sequeler-0.9.0.tar.gz) = 68fd98354f50a078f8814d2f44cd508304be4b61e7ed3015f088e75cc72cc51fa66107fafc17ec5a6494f52ce7c071f5ed3092b3179d89c4f7e705a581ef7785 From 7888c02d7f7a32f6e5ff778b11cc55a488b61745 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 26 Dec 2025 12:31:32 +0000 Subject: [PATCH 30/35] Update URL --- sequeler.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequeler.spec b/sequeler.spec index 7b0b496..9ecf270 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -19,7 +19,7 @@ License: %{shrink: LGPL-2.1-or-later AND CC0-1.0 } -URL: https://github.com/Alecaddd/sequeler +URL: https://github.com/ellie-commons/sequeler Source: %{url}/archive/v%{version}/sequeler-%{version}.tar.gz # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval From 1e83631cf7d1f140cfff92908a6776d46e499897 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 7 Jan 2026 23:15:05 +0000 Subject: [PATCH 31/35] Update .rpmlintrc file [skip changelog] --- sequeler.rpmlintrc | 2 -- 1 file changed, 2 deletions(-) diff --git a/sequeler.rpmlintrc b/sequeler.rpmlintrc index 0b63875..1206d66 100644 --- a/sequeler.rpmlintrc +++ b/sequeler.rpmlintrc @@ -4,5 +4,3 @@ addFilter(r" no-manual-page-for-binary \S+\.sequeler$") # Not real spelling errors: # - "ctrl" is from keyboard shortcuts, like "ctrl+q" addFilter(r" spelling-error \('ctrl',") -# Hardlinks within directories owned by a single package are safe. -addFilter(r" cross-directory-hard-link /\S+/icons/hicolor/\S+ /\S+/icons/hicolor/") From ca8655cf6b99d3fc4846183fac6ef3df69683793 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 17:54:02 +0000 Subject: [PATCH 32/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From e79fc4d2655df7925bd467bd51558aed65e95ea2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 19 May 2026 21:37:56 +0100 Subject: [PATCH 33/35] No longer manually hardlink identical files in the examples https://fedoraproject.org/wiki/Changes/Hardlink_identical_files_in_packages_by_default --- sequeler.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sequeler.spec b/sequeler.spec index 9ecf270..9d15860 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -34,8 +34,6 @@ BuildRequires: libappstream-glib # Matches what gnome-software and others use: BuildRequires: appstream -BuildRequires: hardlink - BuildRequires: meson >= 0.59.0 BuildRequires: vala BuildRequires: gcc @@ -160,11 +158,6 @@ Ypatybės: %find_lang %{appname} -# Upstream installs the same SVG icon in many size-specific directories like -# /usr/share/icons/hicolor/64x64@2/; we can save space by hardlinking these -# together. -hardlink -c -v '%{buildroot}%{_datadir}/icons/hicolor' - %check desktop-file-validate \ From eebe4aad9041e64c2fb5e0729d1ee4caaea6c547 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 23 May 2026 23:50:32 +0100 Subject: [PATCH 34/35] Trivial whitespace adjustments [skip changelog] --- sequeler.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sequeler.spec b/sequeler.spec index 9d15860..63a08a2 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -14,11 +14,11 @@ Release: %autorelease # - data/com.github.alecaddd.sequeler.appdata.xml.in.in, which is CC0-1.0 # (which is approved for content, which this file is). License: %{shrink: - GPL-3.0-or-later AND - GPL-2.0-or-later AND - LGPL-2.1-or-later AND - CC0-1.0 - } + GPL-3.0-or-later AND + GPL-2.0-or-later AND + LGPL-2.1-or-later AND + CC0-1.0 + } URL: https://github.com/ellie-commons/sequeler Source: %{url}/archive/v%{version}/sequeler-%{version}.tar.gz From 1506f4fdd2525335e3d2d05a1546764eb6d5d3cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 06:24:26 +0000 Subject: [PATCH 35/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild