From 54bbc87a3d4f7b2716ec0ce414f8489ed0983193 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 24 May 2023 18:01:57 -0400 Subject: [PATCH 01/12] Simpler slicing of short commit hash [skip changelog] --- appeditor.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appeditor.spec b/appeditor.spec index 087aa0b..851ef4f 100644 --- a/appeditor.spec +++ b/appeditor.spec @@ -7,7 +7,7 @@ Name: appeditor Summary: Edit application menu -Version: 1.1.4^%{snapdate}git%(echo '%{commit}' | cut -b -7) +Version: 1.1.4^%{snapdate}git%(c='%{commit}'; echo "${c:0:7}") Release: %autorelease # The entire source is GPL-3.0-only, except: # - data/com.github.donadigo.appeditor.appdata.xml.in is CC0-1.0, which is From 38aa4f7b22f60f3e30f0c02184f407bcbe8edcf1 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 26 May 2023 10:35:46 -0400 Subject: [PATCH 02/12] Do not number the sole Source [skip changelog] --- appeditor.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appeditor.spec b/appeditor.spec index 851ef4f..68ee070 100644 --- a/appeditor.spec +++ b/appeditor.spec @@ -15,7 +15,7 @@ Release: %autorelease License: GPL-3.0-only AND CC0-1.0 URL: https://github.com/donadigo/appeditor -Source0: %{url}/archive/%{commit}/appeditor-%{commit}.tar.gz +Source: %{url}/archive/%{commit}/appeditor-%{commit}.tar.gz # https://github.com/donadigo/appeditor/issues/103#issuecomment-756924055 Patch: appeditor-1.1.3-fix-flickering-titlebar.patch From bd40eec9edb625a4d349b5f938dc591823a4a6df Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 11:08:55 -0500 Subject: [PATCH 03/12] Correct appstreamcli invocation (--nonet no longer works) --- appeditor.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appeditor.spec b/appeditor.spec index 68ee070..76cb195 100644 --- a/appeditor.spec +++ b/appeditor.spec @@ -203,7 +203,7 @@ desktop-file-validate \ appstream-util validate-relax --nonet \ %{buildroot}/%{_metainfodir}/%{app_id}.appdata.xml # Matches what gnome-software and others use: -appstreamcli validate --nonet \ +appstreamcli validate --no-net \ %{buildroot}/%{_metainfodir}/%{app_id}.appdata.xml From 409aded6e00e050855233470e6fc505dc74ea4b9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 11:19:05 -0500 Subject: [PATCH 04/12] Fix deprecated top-level developer_name in AppData XML --- 135.patch | 25 +++++++++++++++++++++++++ appeditor.spec | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 135.patch diff --git a/135.patch b/135.patch new file mode 100644 index 0000000..6d340b6 --- /dev/null +++ b/135.patch @@ -0,0 +1,25 @@ +From 9160b997e28bb46731220bf966465bc521dc49bf Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Thu, 9 Nov 2023 11:14:43 -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.donadigo.appeditor.appdata.xml.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/data/com.github.donadigo.appeditor.appdata.xml.in b/data/com.github.donadigo.appeditor.appdata.xml.in +index 94e6c5c..567e86a 100644 +--- a/data/com.github.donadigo.appeditor.appdata.xml.in ++++ b/data/com.github.donadigo.appeditor.appdata.xml.in +@@ -20,7 +20,9 @@ + + com.github.donadigo.appeditor + +- Adam Bieńkowski ++ ++ Adam Bieńkowski ++ + https://github.com/donadigo/appeditor + https://github.com/donadigo/appeditor/issues + https://github.com/donadigo/appeditor diff --git a/appeditor.spec b/appeditor.spec index 76cb195..94b48dd 100644 --- a/appeditor.spec +++ b/appeditor.spec @@ -23,6 +23,9 @@ Patch: appeditor-1.1.3-fix-flickering-titlebar.patch # https://github.com/donadigo/appeditor/issues/121 # https://github.com/donadigo/appeditor/pull/122 Patch: %{url}/pull/122.patch +# Fix deprecated top-level developer_name in AppData XML +# https://github.com/donadigo/appeditor/pull/135 +Patch: %{url}/pull/135.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} From bdf3bee5623406f3f00bea024eba481cc50cd625 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 11:19:27 -0500 Subject: [PATCH 05/12] Ask appstreamcli to explain validation findings --- appeditor.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appeditor.spec b/appeditor.spec index 94b48dd..e27f92a 100644 --- a/appeditor.spec +++ b/appeditor.spec @@ -206,7 +206,7 @@ desktop-file-validate \ appstream-util validate-relax --nonet \ %{buildroot}/%{_metainfodir}/%{app_id}.appdata.xml # Matches what gnome-software and others use: -appstreamcli validate --no-net \ +appstreamcli validate --no-net --explain \ %{buildroot}/%{_metainfodir}/%{app_id}.appdata.xml From 29954f0ab8547d651eecd4074a79a7c7a9ee8f2b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 11:32:34 -0500 Subject: [PATCH 06/12] Remove bundled glib in %prep --- appeditor.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/appeditor.spec b/appeditor.spec index e27f92a..0952fbd 100644 --- a/appeditor.spec +++ b/appeditor.spec @@ -184,6 +184,7 @@ Uygulama menüsünde gösterilen uygulama girişlerini ve özelliklerini düzenl %prep %autosetup -n appeditor-%{commit} -p1 +rm -rv external %build From 070a32ef2e33d4405ecef1a4a2ee477182e78a48 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 11:39:26 -0500 Subject: [PATCH 07/12] Open an upstream PR for the flickering-titlebar patch --- 139.patch | 22 +++++++++++++++++++ appeditor-1.1.3-fix-flickering-titlebar.patch | 18 --------------- appeditor.spec | 4 +++- 3 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 139.patch delete mode 100644 appeditor-1.1.3-fix-flickering-titlebar.patch diff --git a/139.patch b/139.patch new file mode 100644 index 0000000..91f5e28 --- /dev/null +++ b/139.patch @@ -0,0 +1,22 @@ +From 4ce39aaa7bef42289ed3d2799b60a551da55a865 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Thu, 9 Nov 2023 11:37:45 -0500 +Subject: [PATCH] Fix flickering titlebar (fix #103) + +https://github.com/donadigo/appeditor/issues/103#issuecomment-756924055 +--- + data/application.css | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/application.css b/data/application.css +index 348573a..4723c80 100644 +--- a/data/application.css ++++ b/data/application.css +@@ -36,7 +36,6 @@ window { + + .titlebar:backdrop { + border: none; +- background-image: none; + background-color: @bg_color; + box-shadow: + inset 1px 0 0 0 alpha (@bg_highlight_color, 0.2), diff --git a/appeditor-1.1.3-fix-flickering-titlebar.patch b/appeditor-1.1.3-fix-flickering-titlebar.patch deleted file mode 100644 index 832a031..0000000 --- a/appeditor-1.1.3-fix-flickering-titlebar.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur appeditor-1.1.3-original/data/application.css appeditor-1.1.3/data/application.css ---- appeditor-1.1.3-original/data/application.css 2021-12-18 16:27:48.000000000 -0500 -+++ appeditor-1.1.3/data/application.css 2021-12-19 09:20:43.060355988 -0500 -@@ -26,7 +26,6 @@ - - .titlebar { - border: none; -- background-image: none; - background-color: @bg_color; - box-shadow: - inset 1px 0 0 0 alpha (@bg_highlight_color, 0.2), -@@ -52,4 +51,4 @@ - - entry { - border-bottom-color: rgba(0, 0, 0, 0.2); --} -\ No newline at end of file -+} diff --git a/appeditor.spec b/appeditor.spec index 0952fbd..c147540 100644 --- a/appeditor.spec +++ b/appeditor.spec @@ -17,8 +17,10 @@ License: GPL-3.0-only AND CC0-1.0 URL: https://github.com/donadigo/appeditor Source: %{url}/archive/%{commit}/appeditor-%{commit}.tar.gz +# Fix flickering titlebar (fix #103) # https://github.com/donadigo/appeditor/issues/103#issuecomment-756924055 -Patch: appeditor-1.1.3-fix-flickering-titlebar.patch +# https://github.com/donadigo/appeditor/pull/139 +Patch: %{url}/pull/139.patch # Fails to compile with vala 0.55.1 # https://github.com/donadigo/appeditor/issues/121 # https://github.com/donadigo/appeditor/pull/122 From 79a1fbe52adb7d1ac59f2d879ca03ebab789b9cc Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 11:40:47 -0500 Subject: [PATCH 08/12] Fix missing terminal newline and bogus executable permissions --- 136.patch | 148 +++++++++++++++++++++++++++++++++++++++++++++++++ 138.patch | 48 ++++++++++++++++ appeditor.spec | 6 ++ 3 files changed, 202 insertions(+) create mode 100644 136.patch create mode 100644 138.patch diff --git a/136.patch b/136.patch new file mode 100644 index 0000000..78b2254 --- /dev/null +++ b/136.patch @@ -0,0 +1,148 @@ +From 7e36d18893d678a6852fa63e7dfd20e6e012d780 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Thu, 9 Nov 2023 11:26:26 -0500 +Subject: [PATCH] Ensure all text files have terminal newlines + +While some tools support text files without these, proper POSIX text +files should have them. +--- + .travis.yml | 2 +- + data/application.css | 2 +- + data/com.github.donadigo.appeditor.appdata.xml.in | 2 +- + data/com.github.donadigo.appeditor.contract | 2 +- + data/com.github.donadigo.appeditor.gresource.xml | 2 +- + data/com.github.donadigo.appeditor.gschema.xml | 2 +- + meson/post_install.py | 2 +- + meson_options.txt | 2 +- + po/meson.build | 2 +- + src/AppDirectoryScanner.vala | 2 +- + src/IconChooserDialog.vala | 2 +- + src/IconListBox.vala | 2 +- + 12 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index db1c04a..0151138 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -21,4 +21,4 @@ install: + - npm i -g @elementaryos/houston + + script: +- - houston ci +\ No newline at end of file ++ - houston ci +diff --git a/data/application.css b/data/application.css +index 348573a..0d96a53 100644 +--- a/data/application.css ++++ b/data/application.css +@@ -52,4 +52,4 @@ window { + + entry { + border-bottom-color: rgba(0, 0, 0, 0.2); +-} +\ No newline at end of file ++} +diff --git a/data/com.github.donadigo.appeditor.appdata.xml.in b/data/com.github.donadigo.appeditor.appdata.xml.in +index 94e6c5c..64d9703 100644 +--- a/data/com.github.donadigo.appeditor.appdata.xml.in ++++ b/data/com.github.donadigo.appeditor.appdata.xml.in +@@ -195,4 +195,4 @@ + #0A332D + 5 + +- +\ No newline at end of file ++ +diff --git a/data/com.github.donadigo.appeditor.contract b/data/com.github.donadigo.appeditor.contract +index fab6d62..6a0180d 100644 +--- a/data/com.github.donadigo.appeditor.contract ++++ b/data/com.github.donadigo.appeditor.contract +@@ -3,4 +3,4 @@ Name=Create a Menu Entry + Description=Create a new menu entry for executing this file + Icon=com.github.donadigo.appeditor + MimeType=application/x-executable;text/x-python;application/x-shellscript +-Exec=com.github.donadigo.appeditor -c %f +\ No newline at end of file ++Exec=com.github.donadigo.appeditor -c %f +diff --git a/data/com.github.donadigo.appeditor.gresource.xml b/data/com.github.donadigo.appeditor.gresource.xml +index 68c0271..814b522 100644 +--- a/data/com.github.donadigo.appeditor.gresource.xml ++++ b/data/com.github.donadigo.appeditor.gresource.xml +@@ -3,4 +3,4 @@ + + application.css + +- +\ No newline at end of file ++ +diff --git a/data/com.github.donadigo.appeditor.gschema.xml b/data/com.github.donadigo.appeditor.gschema.xml +index 4fab585..6896576 100644 +--- a/data/com.github.donadigo.appeditor.gschema.xml ++++ b/data/com.github.donadigo.appeditor.gschema.xml +@@ -22,4 +22,4 @@ + Whether entries with NoDisplay set to true should show + + +- +\ No newline at end of file ++ +diff --git a/meson/post_install.py b/meson/post_install.py +index 9eaefa9..76ed255 100644 +--- a/meson/post_install.py ++++ b/meson/post_install.py +@@ -7,4 +7,4 @@ + + if not os.environ.get('DESTDIR'): + print('Compiling gsettings schemas...') +- subprocess.call(['glib-compile-schemas', schemadir]) +\ No newline at end of file ++ subprocess.call(['glib-compile-schemas', schemadir]) +diff --git a/meson_options.txt b/meson_options.txt +index de6c8e3..7dce56d 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1 +1 @@ +-option('flatpak', type : 'boolean', value : 'false', description : 'Disables some defunct features when building with Flatpak') +\ No newline at end of file ++option('flatpak', type : 'boolean', value : 'false', description : 'Disables some defunct features when building with Flatpak') +diff --git a/po/meson.build b/po/meson.build +index 5eab52e..e9b77d7 100644 +--- a/po/meson.build ++++ b/po/meson.build +@@ -1 +1 @@ +-i18n.gettext(meson.project_name(), preset: 'glib') +\ No newline at end of file ++i18n.gettext(meson.project_name(), preset: 'glib') +diff --git a/src/AppDirectoryScanner.vala b/src/AppDirectoryScanner.vala +index 9b0d69e..fad3d7f 100644 +--- a/src/AppDirectoryScanner.vala ++++ b/src/AppDirectoryScanner.vala +@@ -56,4 +56,4 @@ public class AppEditor.AppDirectoryScanner : Object { + + return apps_dir; + } +-} +\ No newline at end of file ++} +diff --git a/src/IconChooserDialog.vala b/src/IconChooserDialog.vala +index 2ce0faf..abf24c9 100644 +--- a/src/IconChooserDialog.vala ++++ b/src/IconChooserDialog.vala +@@ -90,4 +90,4 @@ public class AppEditor.IconChooserDialog : Gtk.Dialog { + icon_list_box.search (search_entry.text); + icon_list_box.invalidate_filter (); + } +-} +\ No newline at end of file ++} +diff --git a/src/IconListBox.vala b/src/IconListBox.vala +index dcbade6..77e6dea 100644 +--- a/src/IconListBox.vala ++++ b/src/IconListBox.vala +@@ -161,4 +161,4 @@ public class AppEditor.IconListBox : Gtk.ListBox { + private static bool query_matches_name (string query, string icon_name) { + return query.down () in icon_name.down (); + } +-} +\ No newline at end of file ++} diff --git a/138.patch b/138.patch new file mode 100644 index 0000000..340fc1b --- /dev/null +++ b/138.patch @@ -0,0 +1,48 @@ +From caa2c26a3de12b78f2b2f1d7fe82585ae2ba2ed3 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Thu, 9 Nov 2023 11:34:00 -0500 +Subject: [PATCH] Remove executable bit from files that are not script-like + +--- + meson.build | 0 + src/AppItem.vala | 0 + src/AppSourceList.vala | 0 + src/Application.vala | 0 + src/CategoryItem.vala | 0 + src/Constants.vala | 0 + src/DesktopAppManager.vala | 0 + src/MainWindow.vala | 0 + 8 files changed, 0 insertions(+), 0 deletions(-) + mode change 100755 => 100644 meson.build + mode change 100755 => 100644 src/AppItem.vala + mode change 100755 => 100644 src/AppSourceList.vala + mode change 100755 => 100644 src/Application.vala + mode change 100755 => 100644 src/CategoryItem.vala + mode change 100755 => 100644 src/Constants.vala + mode change 100755 => 100644 src/DesktopAppManager.vala + mode change 100755 => 100644 src/MainWindow.vala + +diff --git a/meson.build b/meson.build +old mode 100755 +new mode 100644 +diff --git a/src/AppItem.vala b/src/AppItem.vala +old mode 100755 +new mode 100644 +diff --git a/src/AppSourceList.vala b/src/AppSourceList.vala +old mode 100755 +new mode 100644 +diff --git a/src/Application.vala b/src/Application.vala +old mode 100755 +new mode 100644 +diff --git a/src/CategoryItem.vala b/src/CategoryItem.vala +old mode 100755 +new mode 100644 +diff --git a/src/Constants.vala b/src/Constants.vala +old mode 100755 +new mode 100644 +diff --git a/src/DesktopAppManager.vala b/src/DesktopAppManager.vala +old mode 100755 +new mode 100644 +diff --git a/src/MainWindow.vala b/src/MainWindow.vala +old mode 100755 +new mode 100644 diff --git a/appeditor.spec b/appeditor.spec index c147540..e62c583 100644 --- a/appeditor.spec +++ b/appeditor.spec @@ -28,6 +28,12 @@ Patch: %{url}/pull/122.patch # Fix deprecated top-level developer_name in AppData XML # https://github.com/donadigo/appeditor/pull/135 Patch: %{url}/pull/135.patch +# Ensure all text files have terminal newlines +# https://github.com/donadigo/appeditor/pull/136 +Patch: %{url}/pull/136.patch +# Remove executable bit from files that are not script-like +# https://github.com/donadigo/appeditor/pull/138 +Patch: %{url}/pull/138.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} From 61bad8ce99e66be98ccccccf5306875247039730 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 11:43:58 -0500 Subject: [PATCH 09/12] Update to 1.1.5 --- .gitignore | 1 + 122.patch | 24 ------------------------ appeditor.spec | 19 ++++++++++--------- sources | 2 +- 4 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 122.patch diff --git a/.gitignore b/.gitignore index 4869015..5c54dd8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /appeditor-1.1.1.tar.gz /appeditor-1.1.3.tar.gz /appeditor-aeb0b13e5dfd2dfde951e8f18d9075eee5054f71.tar.gz +/appeditor-8612fc8f8f812bc50002d4086afa304228a72cae.tar.gz diff --git a/122.patch b/122.patch deleted file mode 100644 index eabfe86..0000000 --- a/122.patch +++ /dev/null @@ -1,24 +0,0 @@ -From bd27f269bde4fee617506f5f869842cc8ceab827 Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Sun, 16 Jan 2022 19:49:21 -0500 -Subject: [PATCH] Fix #121 (failure to compile with vala 0.55.1) - -Make create_exec_filename public so it is not less accessible than -OPTIONS, the value of which contains it. ---- - src/Application.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Application.vala b/src/Application.vala -index 118e88d..45212a1 100755 ---- a/src/Application.vala -+++ b/src/Application.vala -@@ -26,7 +26,7 @@ public class AppEditor.Application : Gtk.Application { - return Gtk.check_version (3, 22, 0) == null; - } - -- private static string? create_exec_filename; -+ public static string? create_exec_filename; - - private MainWindow? window = null; - diff --git a/appeditor.spec b/appeditor.spec index e62c583..da1c7d5 100644 --- a/appeditor.spec +++ b/appeditor.spec @@ -1,13 +1,18 @@ %global app_id com.github.donadigo.appeditor -# Upstream failed to tag release 1.1.4, but the commit message makes it clear a +# Upstream failed to tag release 1.1.5, but the commit message makes it clear a # release was intended. -%global commit aeb0b13e5dfd2dfde951e8f18d9075eee5054f71 -%global snapdate 20220103 +# +# Please push tags for recent releases +# https://github.com/donadigo/appeditor/issues/137 +# +# We don’t use snapshot versioning because we are confident this is the exact +# commit for the release. +%global commit 8612fc8f8f812bc50002d4086afa304228a72cae Name: appeditor Summary: Edit application menu -Version: 1.1.4^%{snapdate}git%(c='%{commit}'; echo "${c:0:7}") +Version: 1.1.5 Release: %autorelease # The entire source is GPL-3.0-only, except: # - data/com.github.donadigo.appeditor.appdata.xml.in is CC0-1.0, which is @@ -21,10 +26,6 @@ Source: %{url}/archive/%{commit}/appeditor-%{commit}.tar.gz # https://github.com/donadigo/appeditor/issues/103#issuecomment-756924055 # https://github.com/donadigo/appeditor/pull/139 Patch: %{url}/pull/139.patch -# Fails to compile with vala 0.55.1 -# https://github.com/donadigo/appeditor/issues/121 -# https://github.com/donadigo/appeditor/pull/122 -Patch: %{url}/pull/122.patch # Fix deprecated top-level developer_name in AppData XML # https://github.com/donadigo/appeditor/pull/135 Patch: %{url}/pull/135.patch @@ -52,7 +53,7 @@ BuildRequires: vala BuildRequires: gcc BuildRequires: pkgconfig(gee-0.8) -BuildRequires: pkgconfig(granite) +BuildRequires: pkgconfig(granite) >= 5.4.0 BuildRequires: pkgconfig(gtk+-3.0) Requires: contractor diff --git a/sources b/sources index b49350c..57c894f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (appeditor-aeb0b13e5dfd2dfde951e8f18d9075eee5054f71.tar.gz) = dc914149e479797bfdeb6350ba12486a123949bd5b84c63b50c35db310e4974e791b66725a248b06c5af5dc7cdfc070d7c6644b95259d9d12b732410919b0c73 +SHA512 (appeditor-8612fc8f8f812bc50002d4086afa304228a72cae.tar.gz) = 3697ed008e948957b2acb9c5dacd753a763ac04fba7fcbc6cf77bfff5caa531df3b676fa2d6b373e0800d711e4bfaa4d4d9c29b4d48ade84e8ecf68a1092180c From 53603f26f9b450046522d89a5a95ce62766e4c75 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 13:55:28 -0500 Subject: [PATCH 10/12] Use the release tag now that upstream pushed it --- .gitignore | 1 + appeditor.spec | 14 ++------------ sources | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 5c54dd8..b45c766 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /appeditor-1.1.3.tar.gz /appeditor-aeb0b13e5dfd2dfde951e8f18d9075eee5054f71.tar.gz /appeditor-8612fc8f8f812bc50002d4086afa304228a72cae.tar.gz +/appeditor-1.1.5.tar.gz diff --git a/appeditor.spec b/appeditor.spec index da1c7d5..ba62705 100644 --- a/appeditor.spec +++ b/appeditor.spec @@ -1,15 +1,5 @@ %global app_id com.github.donadigo.appeditor -# Upstream failed to tag release 1.1.5, but the commit message makes it clear a -# release was intended. -# -# Please push tags for recent releases -# https://github.com/donadigo/appeditor/issues/137 -# -# We don’t use snapshot versioning because we are confident this is the exact -# commit for the release. -%global commit 8612fc8f8f812bc50002d4086afa304228a72cae - Name: appeditor Summary: Edit application menu Version: 1.1.5 @@ -20,7 +10,7 @@ Release: %autorelease License: GPL-3.0-only AND CC0-1.0 URL: https://github.com/donadigo/appeditor -Source: %{url}/archive/%{commit}/appeditor-%{commit}.tar.gz +Source: %{url}/archive/%{version}/appeditor-%{version}.tar.gz # Fix flickering titlebar (fix #103) # https://github.com/donadigo/appeditor/issues/103#issuecomment-756924055 @@ -192,7 +182,7 @@ Uygulama menüsünde gösterilen uygulama girişlerini ve özelliklerini düzenl %prep -%autosetup -n appeditor-%{commit} -p1 +%autosetup -n appeditor-%{version} -p1 rm -rv external diff --git a/sources b/sources index 57c894f..4da1774 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (appeditor-8612fc8f8f812bc50002d4086afa304228a72cae.tar.gz) = 3697ed008e948957b2acb9c5dacd753a763ac04fba7fcbc6cf77bfff5caa531df3b676fa2d6b373e0800d711e4bfaa4d4d9c29b4d48ade84e8ecf68a1092180c +SHA512 (appeditor-1.1.5.tar.gz) = c7e4e90cc1e5716ce2e7f358d12ba9b38556d69d0531e2ef847a663bcb6fa0a50f77e8a15e808743730fcd4485fb7be0d2f830b56ce3e1204ca9df7ef5e940f1 From cfbb5afa9fd206df6ff5e0038d7086503b9534d2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 8 Mar 2024 09:03:50 -0500 Subject: [PATCH 11/12] Add an rpmlintrc file [skip changelog] --- appeditor.rpmlintrc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 appeditor.rpmlintrc diff --git a/appeditor.rpmlintrc b/appeditor.rpmlintrc new file mode 100644 index 0000000..dd9b2f1 --- /dev/null +++ b/appeditor.rpmlintrc @@ -0,0 +1,3 @@ +# A man page for a GUI executable without interesting command-line options is +# not very useful. +addFilter(r" no-manual-page-for-binary ") From 85e7a47fcf02456f72be0f41a75d9e7e67cc9d92 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 8 Mar 2024 08:50:45 -0500 Subject: [PATCH 12/12] Add developer ID in AppData (fix FTBFS with appstream 1.0.2) --- 135.patch | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/135.patch b/135.patch index 6d340b6..4a21e89 100644 --- a/135.patch +++ b/135.patch @@ -1,7 +1,7 @@ From 9160b997e28bb46731220bf966465bc521dc49bf Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 11:14:43 -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 94e6c5c..567e86a 100644 https://github.com/donadigo/appeditor https://github.com/donadigo/appeditor/issues https://github.com/donadigo/appeditor + +From 0b90d07e39f0e8dccad175dd31d929f5f56b2db1 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Fri, 8 Mar 2024 08:44:48 -0500 +Subject: [PATCH 2/2] Add developer ID com.donadigo in AppData + +--- + data/com.github.donadigo.appeditor.appdata.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/com.github.donadigo.appeditor.appdata.xml.in b/data/com.github.donadigo.appeditor.appdata.xml.in +index 567e86a..52a3cb1 100644 +--- a/data/com.github.donadigo.appeditor.appdata.xml.in ++++ b/data/com.github.donadigo.appeditor.appdata.xml.in +@@ -20,7 +20,7 @@ + + com.github.donadigo.appeditor + +- ++ + Adam Bieńkowski + + https://github.com/donadigo/appeditor