diff --git a/.gitignore b/.gitignore index 0ccfc27..280d84a 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,3 @@ /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/changelog b/changelog index ee88889..ce8dd17 100644 --- a/changelog +++ b/changelog @@ -1,33 +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+ @@ -153,3 +123,4 @@ * Wed Jan 03 2018 Fabio Valentini - 0.4.1-1 - Initial package for fedora. + diff --git a/sequeler.rpmlintrc b/sequeler.rpmlintrc index 1206d66..fcc4f67 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 \S+\.sequeler$") -# Not real spelling errors: -# - "ctrl" is from keyboard shortcuts, like "ctrl+q" -addFilter(r" spelling-error \('ctrl',") +# 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*") diff --git a/sequeler.spec b/sequeler.spec index 63a08a2..2be94c1 100644 --- a/sequeler.spec +++ b/sequeler.spec @@ -1,49 +1,34 @@ -%global appname io.github.ellie_commons.sequeler +%global appname com.github.alecaddd.sequeler Name: sequeler -Summary: Easily connect to your local or remote database -Version: 0.9.0 +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 +# The entire source is GPLv3+ (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: +# indicate GPLv3+ is intended), except: # - the Vala sources (all .vala files under src/ or its subdirectories), -# 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: %{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/ellie-commons/sequeler -Source: %{url}/archive/v%{version}/sequeler-%{version}.tar.gz +# 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+ -# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: %{ix86} +URL: https://github.com/Alecaddd/%{name} +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 >= 0.59.0 +BuildRequires: meson BuildRequires: vala -BuildRequires: gcc BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(granite) >= 5.3.0 +BuildRequires: pkgconfig(granite) >= 5.2.0 BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(gtksourceview-4) +BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: pkgconfig(libgda-5.0) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libssh2) @@ -51,9 +36,9 @@ BuildRequires: pkgconfig(libxml-2.0) Requires: hicolor-icon-theme -Recommends: libgda5-mysql -Recommends: libgda5-postgres -Recommends: libgda5-sqlite +Recommends: libgda-mysql +Recommends: libgda-postgres +Recommends: libgda-sqlite Summary(de): Benutzerfreundlicher SQL-Client Summary(fr): Un simple client SQL @@ -142,14 +127,11 @@ Ypatybės: %prep -%autosetup -p1 - - -%conf -%meson +%autosetup %build +%meson %meson_build @@ -163,13 +145,8 @@ 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}.metainfo.xml -# Matches what gnome-software and others use: -appstreamcli validate --no-net --explain \ - %{buildroot}/%{_metainfodir}/%{appname}.metainfo.xml + %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml %files -f %{appname}.lang @@ -182,7 +159,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}.metainfo.xml +%{_datadir}/metainfo/%{appname}.appdata.xml %changelog diff --git a/sources b/sources index 8f7ab17..9a8bc77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sequeler-0.9.0.tar.gz) = 68fd98354f50a078f8814d2f44cd508304be4b61e7ed3015f088e75cc72cc51fa66107fafc17ec5a6494f52ce7c071f5ed3092b3179d89c4f7e705a581ef7785 +SHA512 (sequeler-0.8.2.tar.gz) = b1d5336d84c5cf7343c5fa9ef5a8f4842abdb6f0d42cb9e6fed15157083e8a0d4cf7e3ca0aa0bf9fb390683138336d857ef53440027eae8f15282e4ae75a17b7