The package rpms/system76-keyboard-configurator.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/system76-keyboard-configurator.gi.... Change: +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit b4e9233096995680b80a545b9ba58a2493e43026 Author: Link Dupont <link(a)sub-pop.net&gt; Date: Tue Nov 23 20:02:40 2021 -0500 update dependencies diff --git a/disable-static-hidraw.patch b/disable-static-hidraw.patch deleted file mode 100644 index 44c20f7..0000000 --- a/disable-static-hidraw.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/backend/Cargo.toml keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/backend/Cargo.toml ---- keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/backend/Cargo.toml 2021-08-18 21:33:03.000000000 -0400 -+++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/backend/Cargo.toml 2021-11-14 23:25:32.471305228 -0500 -@@ -10,7 +10,7 @@ - futures = "0.3.13" - futures-timer = "3.0.2" - glib = "0.14.0" --hidapi = { version = "1.2", default-features = false, features = ["linux-static-hidraw"] } -+hidapi = { version = "1.2", default-features = false, features = ["linux-shared-hidraw"] } - libc = "0.2" - once_cell = "1.4" - ordered-float = { version = "2.0", features = ["serde"] } diff --git a/fix-target-dependencies.patch b/fix-target-dependencies.patch index c3a54e1..f69ce57 100644 --- a/fix-target-dependencies.patch +++ b/fix-target-dependencies.patch @@ -1,6 +1,6 @@ diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/backend/Cargo.toml keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/backend/Cargo.toml --- keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/backend/Cargo.toml 2021-08-18 21:33:03.000000000 -0400 -+++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/backend/Cargo.toml 2021-11-21 21:16:04.802280072 -0500 ++++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/backend/Cargo.toml 2021-11-22 22:15:12.751674652 -0500 @@ -10,7 +10,7 @@ futures = "0.3.13" futures-timer = "3.0.2" @@ -10,10 +10,33 @@ diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/ba libc = "0.2" once_cell = "1.4" ordered-float = { version = "2.0", features = ["serde"] } +@@ -20,9 +20,9 @@ + serde_json = "1.0" + log = "0.4.0" + uuid = { version = "0.8.2", features = ["v4"] } +-i18n-embed = { version = "0.12.0", features = ["fluent-system", "desktop-requester"] } +-i18n-embed-fl = "0.5.0" +-rust-embed = { version = "5.9.0", features = ["debug-embed"] } ++i18n-embed = { version = "0.13.0", features = ["fluent-system", "desktop-requester"] } ++i18n-embed-fl = "0.6.0" ++rust-embed = { version = "6.2.0", features = ["debug-embed"] } + + [dependencies.system76_ectool] + version = "0.3.6" diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/Cargo.toml keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/Cargo.toml --- keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/Cargo.toml 2021-08-18 21:33:03.000000000 -0400 -+++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/Cargo.toml 2021-11-21 21:16:47.115728697 -0500 -@@ -35,8 +35,5 @@ ++++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/Cargo.toml 2021-11-22 22:15:16.942723371 -0500 +@@ -28,15 +28,12 @@ + widgets = { package = "system76-keyboard-configurator-widgets", path = "widgets" } + + # Translation support +-i18n-embed = { version = "0.12.0", features = ["fluent-system", "desktop-requester"] } +-i18n-embed-fl = "0.5.0" +-rust-embed = { version = "5.9.0", features = ["debug-embed"] } ++i18n-embed = { version = "0.13.0", features = ["fluent-system", "desktop-requester"] } ++i18n-embed-fl = "0.6.0" ++rust-embed = { version = "6.2.0", features = ["debug-embed"] } + [build-dependencies] gio = "0.14.0" @@ -25,8 +48,18 @@ diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/Ca +appimage = [] diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/widgets/Cargo.toml keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/widgets/Cargo.toml --- keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/widgets/Cargo.toml 2021-08-18 21:33:03.000000000 -0400 -+++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/widgets/Cargo.toml 2021-11-21 21:16:58.428840570 -0500 -@@ -29,8 +29,5 @@ ++++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/widgets/Cargo.toml 2021-11-22 22:15:24.255808382 -0500 +@@ -22,15 +22,12 @@ + backend = { package = "system76-keyboard-configurator-backend", path = "../backend" } + + # Translation support +-i18n-embed = { version = "0.12.0", features = ["fluent-system", "desktop-requester"] } +-i18n-embed-fl = "0.5.0" +-rust-embed = { version = "5.9.0", features = ["debug-embed"] } ++i18n-embed = { version = "0.13.0", features = ["fluent-system", "desktop-requester"] } ++i18n-embed-fl = "0.6.0" ++rust-embed = { version = "6.2.0", features = ["debug-embed"] } + [build-dependencies] gio = "0.14.0" diff --git a/system76-keyboard-configurator.spec b/system76-keyboard-configurator.spec index 441eb42..52be20a 100644 --- a/system76-keyboard-configurator.spec +++ b/system76-keyboard-configurator.spec @@ -7,7 +7,7 @@ Version: 1.0.0 %forgemeta Name: system76-keyboard-configurator -Release: 1%{?dist} +Release: 2%{?dist} Summary: System76 Keyboard Configurator License: GPLv3 @@ -72,5 +72,8 @@ appstream-util validate-relax --nonet linux/com.system76.keyboardconfigurator.ap %changelog -* Fri Oct 1 2021 Link Dupont <linkdupont(a)fedoraproject.org) - 1.0.0-1 +* Mon Nov 22 2021 Link Dupont <linkdupont(a)fedoraproject.org&gt; - 1.0.0-2.20211119git38c1c7b +- Updated dependencies + +* Fri Oct 1 2021 Link Dupont <linkdupont(a)fedoraproject.org&gt; - 1.0.0-1 - Initial package commit 92cca542c04a11159863b92123a763e043a50cf1 Author: Link Dupont <link(a)sub-pop.net&gt; Date: Sun Nov 21 22:19:07 2021 -0500 remove manual buildrequires use a hack to temporarily remove workspaces from dependency to work around a cargo-inspector limitation diff --git a/fix-target-windows-dependencies.patch b/fix-target-dependencies.patch similarity index 50% rename from fix-target-windows-dependencies.patch rename to fix-target-dependencies.patch index cf1d6ee..c3a54e1 100644 --- a/fix-target-windows-dependencies.patch +++ b/fix-target-dependencies.patch @@ -1,6 +1,18 @@ +diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/backend/Cargo.toml keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/backend/Cargo.toml +--- keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/backend/Cargo.toml 2021-08-18 21:33:03.000000000 -0400 ++++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/backend/Cargo.toml 2021-11-21 21:16:04.802280072 -0500 +@@ -10,7 +10,7 @@ + futures = "0.3.13" + futures-timer = "3.0.2" + glib = "0.14.0" +-hidapi = { version = "1.2", default-features = false, features = ["linux-static-hidraw"] } ++hidapi = { version = "1.2", default-features = false, features = ["linux-shared-hidraw"] } + libc = "0.2" + once_cell = "1.4" + ordered-float = { version = "2.0", features = ["serde"] } diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/Cargo.toml keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/Cargo.toml --- keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/Cargo.toml 2021-08-18 21:33:03.000000000 -0400 -+++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/Cargo.toml 2021-11-11 13:43:29.348637068 -0500 ++++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/Cargo.toml 2021-11-21 21:16:47.115728697 -0500 @@ -35,8 +35,5 @@ [build-dependencies] gio = "0.14.0" @@ -9,10 +21,11 @@ diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/Ca -winreg = "0.8" - [features] - appimage = ["backend/appimage"] +-appimage = ["backend/appimage"] ++appimage = [] diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/widgets/Cargo.toml keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/widgets/Cargo.toml --- keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/widgets/Cargo.toml 2021-08-18 21:33:03.000000000 -0400 -+++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/widgets/Cargo.toml 2021-11-11 13:47:43.101421558 -0500 ++++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/widgets/Cargo.toml 2021-11-21 21:16:58.428840570 -0500 @@ -29,8 +29,5 @@ [build-dependencies] gio = "0.14.0" @@ -21,4 +34,5 @@ diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/wi -winreg = "0.8" - [features] - appimage = ["backend/appimage"] +-appimage = ["backend/appimage"] ++appimage = [] diff --git a/system76-keyboard-configurator.spec b/system76-keyboard-configurator.spec index 51c61a2..441eb42 100644 --- a/system76-keyboard-configurator.spec +++ b/system76-keyboard-configurator.spec @@ -14,92 +14,14 @@ License: GPLv3 URL: %{forgeurl} Source: %{forgesource} -Patch0: fix-target-windows-dependencies.patch -Patch1: disable-static-hidraw.patch +Patch0: fix-target-dependencies.patch ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging BuildRequires: gtk3-devel BuildRequires: desktop-file-utils - -# cargo-inspector -BR Cargo.toml -BuildRequires: (crate(cairo-rs/default) >= 0.14.0 with crate(cairo-rs/default) < 0.15.0~) -BuildRequires: (crate(cascade/default) >= 1.0.0 with crate(cascade/default) < 2.0.0~) -BuildRequires: (crate(env_logger/default) >= 0.8.3 with crate(env_logger/default) < 0.9.0~) -BuildRequires: (crate(futures/default) >= 0.3.13 with crate(futures/default) < 0.4.0~) -BuildRequires: (crate(gdk/default) >= 0.14.0 with crate(gdk/default) < 0.15.0~) -BuildRequires: (crate(gio/default) >= 0.14.0 with crate(gio/default) < 0.15.0~) -BuildRequires: (crate(glib/default) >= 0.14.0 with crate(glib/default) < 0.15.0~) -BuildRequires: (crate(gtk/default) >= 0.14.0 with crate(gtk/default) < 0.15.0~) -BuildRequires: (crate(gtk/v3_22) >= 0.14.0 with crate(gtk/v3_22) < 0.15.0~) -BuildRequires: (crate(i18n-embed-fl/default) >= 0.5.0 with crate(i18n-embed-fl/default) < 0.6.0~) -BuildRequires: (crate(i18n-embed/default) >= 0.12.0 with crate(i18n-embed/default) < 0.13.0~) -BuildRequires: (crate(i18n-embed/desktop-requester) >= 0.12.0 with crate(i18n-embed/desktop-requester) < 0.13.0~) -BuildRequires: (crate(i18n-embed/fluent-system) >= 0.12.0 with crate(i18n-embed/fluent-system) < 0.13.0~) -BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0~) -BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0~) -BuildRequires: (crate(once_cell/default) >= 1.4.0 with crate(once_cell/default) < 2.0.0~) -BuildRequires: (crate(pango/default) >= 0.14.0 with crate(pango/default) < 0.15.0~) -BuildRequires: (crate(pangocairo/default) >= 0.14.0 with crate(pangocairo/default) < 0.15.0~) -BuildRequires: (crate(rust-embed/debug-embed) >= 5.9.0 with crate(rust-embed/debug-embed) < 6.0.0~) -BuildRequires: (crate(rust-embed/default) >= 5.9.0 with crate(rust-embed/default) < 6.0.0~) -BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0~) -BuildRequires: (crate(serde/derive) >= 1.0.0 with crate(serde/derive) < 2.0.0~) -BuildRequires: (crate(serde_json/default) >= 1.0.0 with crate(serde_json/default) < 2.0.0~) - -# cargo-inspector -BR backend/Cargo.toml -BuildRequires: (crate(cascade/default) >= 1.0.0 with crate(cascade/default) < 2.0.0~) -BuildRequires: (crate(futures-timer/default) >= 3.0.2 with crate(futures-timer/default) < 4.0.0~) -BuildRequires: (crate(futures/default) >= 0.3.13 with crate(futures/default) < 0.4.0~) -BuildRequires: (crate(glib/default) >= 0.14.0 with crate(glib/default) < 0.15.0~) -BuildRequires: (crate(hidapi/linux-shared-hidraw) >= 1.2.0 with crate(hidapi/linux-shared-hidraw) < 2.0.0~) -BuildRequires: (crate(i18n-embed-fl/default) >= 0.5.0 with crate(i18n-embed-fl/default) < 0.6.0~) -BuildRequires: (crate(i18n-embed/default) >= 0.12.0 with crate(i18n-embed/default) < 0.13.0~) -BuildRequires: (crate(i18n-embed/desktop-requester) >= 0.12.0 with crate(i18n-embed/desktop-requester) < 0.13.0~) -BuildRequires: (crate(i18n-embed/fluent-system) >= 0.12.0 with crate(i18n-embed/fluent-system) < 0.13.0~) -BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0~) -BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0~) -BuildRequires: (crate(once_cell/default) >= 1.4.0 with crate(once_cell/default) < 2.0.0~) -BuildRequires: (crate(ordered-float/default) >= 2.0.0 with crate(ordered-float/default) < 3.0.0~) -BuildRequires: (crate(ordered-float/serde) >= 2.0.0 with crate(ordered-float/serde) < 3.0.0~) -BuildRequires: (crate(palette/default) >= 0.5.0 with crate(palette/default) < 0.6.0~) -BuildRequires: (crate(regex/default) >= 1.0.0 with crate(regex/default) < 2.0.0~) -BuildRequires: (crate(rust-embed/debug-embed) >= 5.9.0 with crate(rust-embed/debug-embed) < 6.0.0~) -BuildRequires: (crate(rust-embed/default) >= 5.9.0 with crate(rust-embed/default) < 6.0.0~) -BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0~) -BuildRequires: (crate(serde/derive) >= 1.0.0 with crate(serde/derive) < 2.0.0~) -BuildRequires: (crate(serde_json/default) >= 1.0.0 with crate(serde_json/default) < 2.0.0~) -BuildRequires: (crate(system76_ectool/default) >= 0.3.6 with crate(system76_ectool/default) < 0.4.0~) -BuildRequires: (crate(system76_ectool/hidapi) >= 0.3.6 with crate(system76_ectool/hidapi) < 0.4.0~) -BuildRequires: (crate(system76_ectool/std) >= 0.3.6 with crate(system76_ectool/std) < 0.4.0~) -BuildRequires: (crate(uuid/default) >= 0.8.2 with crate(uuid/default) < 0.9.0~) -BuildRequires: (crate(uuid/v4) >= 0.8.2 with crate(uuid/v4) < 0.9.0~) -BuildRequires: (crate(zbus/default) >= 1.9.1 with crate(zbus/default) < 2.0.0~) - - -# cargo-inspector -BR widgets/Cargo.toml -BuildRequires: (crate(cairo-rs/default) >= 0.14.0 with crate(cairo-rs/default) < 0.15.0~) -BuildRequires: (crate(cascade/default) >= 1.0.0 with crate(cascade/default) < 2.0.0~) -BuildRequires: (crate(futures/default) >= 0.3.13 with crate(futures/default) < 0.4.0~) -BuildRequires: (crate(gdk/default) >= 0.14.0 with crate(gdk/default) < 0.15.0~) -BuildRequires: (crate(gio/default) >= 0.14.0 with crate(gio/default) < 0.15.0~) -BuildRequires: (crate(glib/default) >= 0.14.0 with crate(glib/default) < 0.15.0~) -BuildRequires: (crate(gtk/default) >= 0.14.0 with crate(gtk/default) < 0.15.0~) -BuildRequires: (crate(gtk/v3_22) >= 0.14.0 with crate(gtk/v3_22) < 0.15.0~) -BuildRequires: (crate(i18n-embed-fl/default) >= 0.5.0 with crate(i18n-embed-fl/default) < 0.6.0~) -BuildRequires: (crate(i18n-embed/default) >= 0.12.0 with crate(i18n-embed/default) < 0.13.0~) -BuildRequires: (crate(i18n-embed/desktop-requester) >= 0.12.0 with crate(i18n-embed/desktop-requester) < 0.13.0~) -BuildRequires: (crate(i18n-embed/fluent-system) >= 0.12.0 with crate(i18n-embed/fluent-system) < 0.13.0~) -BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0~) -BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0~) -BuildRequires: (crate(once_cell/default) >= 1.4.0 with crate(once_cell/default) < 2.0.0~) -BuildRequires: (crate(pango/default) >= 0.14.0 with crate(pango/default) < 0.15.0~) -BuildRequires: (crate(rust-embed/debug-embed) >= 5.9.0 with crate(rust-embed/debug-embed) < 6.0.0~) -BuildRequires: (crate(rust-embed/default) >= 5.9.0 with crate(rust-embed/default) < 6.0.0~) -BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0~) -BuildRequires: (crate(serde/derive) >= 1.0.0 with crate(serde/derive) < 2.0.0~) -BuildRequires: (crate(serde_json/default) >= 1.0.0 with crate(serde_json/default) < 2.0.0~) +BuildRequires: /usr/bin/appstream-util %description @@ -109,6 +31,16 @@ Application for configuration of System76 keyboard firmware. %prep %forgeautosetup -p1 %cargo_prep +%generate_buildrequires +# Temporarily remove workspace dependencies from the cargo manifest files before +# generating build requirements with cargo-inspector +for f in Cargo.toml backend/Cargo.toml widgets/Cargo.toml; do + cd $(dirname $f) + sed -i.br -r -e '/=\s*\{[^}]+path\s*=/d' Cargo.toml + %cargo_generate_buildrequires -f default + mv -f Cargo.toml{.br,} + cd - >/dev/null +done %build commit 5956dd1d68fc48b7c79c7713eb78a1efb4ac4fb5 Author: Link Dupont <link(a)sub-pop.net&gt; Date: Sun Nov 21 21:54:08 2021 -0500 remove network validation with appstream-util diff --git a/system76-keyboard-configurator.spec b/system76-keyboard-configurator.spec index 8ce2a21..51c61a2 100644 --- a/system76-keyboard-configurator.spec +++ b/system76-keyboard-configurator.spec @@ -126,8 +126,8 @@ Application for configuration of System76 keyboard firmware. %if %{with check} %check %cargo_test -desktop-file-validate linux/com.system76.keyboardconfigurator.desktop -appstream-util validate-relax linux/com.system76.keyboardconfigurator.appdata.xml +desktop-file-validate linux/com.system76.keyboardconfigurator.desktop +appstream-util validate-relax --nonet linux/com.system76.keyboardconfigurator.appdata.xml %endif commit 9f8773e91147b26f176117f82f96c1d73ddfed82 Author: Link Dupont <link(a)sub-pop.net&gt; Date: Sun Nov 21 20:35:39 2021 -0500 include desktop-file-utils in buildrequires diff --git a/system76-keyboard-configurator.spec b/system76-keyboard-configurator.spec index 6e45383..8ce2a21 100644 --- a/system76-keyboard-configurator.spec +++ b/system76-keyboard-configurator.spec @@ -21,6 +21,7 @@ ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging BuildRequires: gtk3-devel +BuildRequires: desktop-file-utils # cargo-inspector -BR Cargo.toml BuildRequires: (crate(cairo-rs/default) >= 0.14.0 with crate(cairo-rs/default) < 0.15.0~) commit a709cd2282457b439d2ec8c67bfd3f5019b9c163 Author: Link Dupont <link(a)sub-pop.net&gt; Date: Sat Nov 20 22:13:37 2021 -0500 include polkit action diff --git a/system76-keyboard-configurator.spec b/system76-keyboard-configurator.spec index 97ea453..6e45383 100644 --- a/system76-keyboard-configurator.spec +++ b/system76-keyboard-configurator.spec @@ -119,6 +119,7 @@ Application for configuration of System76 keyboard firmware. %__install -D -m 0644 -vp linux/com.system76.keyboardconfigurator.desktop %{buildroot}%{_datadir}/applications/com.system76.keyboardconfigurator.desktop %__install -D -m 0644 -vp linux/com.system76.keyboardconfigurator.appdata.xml %{buildroot}%{_datadir}/metainfo/com.system76.keyboardconfigurator.appdata.xml %__install -D -m 0644 -vp data/icons/scalable/apps/com.system76.keyboardconfigurator.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/com.system76.keyboardconfigurator.svg +%__install -D -m 0644 -vp debian/com.system76.pkexec.keyboardconfigurator.policy %{buildroot}%{_datadir}/polkit-1/actions/com.system76.pkexec.keyboardconfigurator.policy %if %{with check} @@ -134,6 +135,7 @@ appstream-util validate-relax linux/com.system76.keyboardconfigurator.appdata.xm %{_datadir}/applications/com.system76.keyboardconfigurator.desktop %{_datadir}/metainfo/com.system76.keyboardconfigurator.appdata.xml %{_datadir}/icons/hicolor/scalable/apps/com.system76.keyboardconfigurator.svg +%{_datadir}/polkit-1/actions/com.system76.pkexec.keyboardconfigurator.policy %changelog commit a9e3d0b69de6741d090f32a020b9eee3424a81b5 Author: Link Dupont <link(a)sub-pop.net&gt; Date: Sat Nov 20 21:59:39 2021 -0500 include desktop and metainfo files diff --git a/system76-keyboard-configurator.spec b/system76-keyboard-configurator.spec index fe8ee33..97ea453 100644 --- a/system76-keyboard-configurator.spec +++ b/system76-keyboard-configurator.spec @@ -116,16 +116,24 @@ Application for configuration of System76 keyboard firmware. %install %cargo_install +%__install -D -m 0644 -vp linux/com.system76.keyboardconfigurator.desktop %{buildroot}%{_datadir}/applications/com.system76.keyboardconfigurator.desktop +%__install -D -m 0644 -vp linux/com.system76.keyboardconfigurator.appdata.xml %{buildroot}%{_datadir}/metainfo/com.system76.keyboardconfigurator.appdata.xml +%__install -D -m 0644 -vp data/icons/scalable/apps/com.system76.keyboardconfigurator.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/com.system76.keyboardconfigurator.svg %if %{with check} %check %cargo_test +desktop-file-validate linux/com.system76.keyboardconfigurator.desktop +appstream-util validate-relax linux/com.system76.keyboardconfigurator.appdata.xml %endif %files %{_bindir}/%{name} +%{_datadir}/applications/com.system76.keyboardconfigurator.desktop +%{_datadir}/metainfo/com.system76.keyboardconfigurator.appdata.xml +%{_datadir}/icons/hicolor/scalable/apps/com.system76.keyboardconfigurator.svg %changelog commit d387023538e17fb6f10ecde57c033b877103ac5f Author: Link Dupont <link(a)sub-pop.net&gt; Date: Sat Nov 20 21:52:02 2021 -0500 fix typo in description diff --git a/system76-keyboard-configurator.spec b/system76-keyboard-configurator.spec index f493137..fe8ee33 100644 --- a/system76-keyboard-configurator.spec +++ b/system76-keyboard-configurator.spec @@ -102,7 +102,7 @@ BuildRequires: (crate(serde_json/default) >= 1.0.0 with crate(serde_json/default %description -Application for configuration of System76 keyboard firmware.} +Application for configuration of System76 keyboard firmware. %prep commit 1acee50deb826408ced9be14622a85dd06ea8e3b Author: Link Dupont <link(a)sub-pop.net&gt; Date: Fri Nov 19 14:34:41 2021 -0500 initial package Relates: RHBZ#2022176 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b51f696 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.tar.gz diff --git a/disable-static-hidraw.patch b/disable-static-hidraw.patch new file mode 100644 index 0000000..44c20f7 --- /dev/null +++ b/disable-static-hidraw.patch @@ -0,0 +1,12 @@ +diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/backend/Cargo.toml keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/backend/Cargo.toml +--- keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/backend/Cargo.toml 2021-08-18 21:33:03.000000000 -0400 ++++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/backend/Cargo.toml 2021-11-14 23:25:32.471305228 -0500 +@@ -10,7 +10,7 @@ + futures = "0.3.13" + futures-timer = "3.0.2" + glib = "0.14.0" +-hidapi = { version = "1.2", default-features = false, features = ["linux-static-hidraw"] } ++hidapi = { version = "1.2", default-features = false, features = ["linux-shared-hidraw"] } + libc = "0.2" + once_cell = "1.4" + ordered-float = { version = "2.0", features = ["serde"] } diff --git a/fix-target-windows-dependencies.patch b/fix-target-windows-dependencies.patch new file mode 100644 index 0000000..cf1d6ee --- /dev/null +++ b/fix-target-windows-dependencies.patch @@ -0,0 +1,24 @@ +diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/Cargo.toml keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/Cargo.toml +--- keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/Cargo.toml 2021-08-18 21:33:03.000000000 -0400 ++++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/Cargo.toml 2021-11-11 13:43:29.348637068 -0500 +@@ -35,8 +35,5 @@ + [build-dependencies] + gio = "0.14.0" + +-[target.'cfg(target_os = "windows")'.dependencies] +-winreg = "0.8" +- + [features] + appimage = ["backend/appimage"] +diff -urN keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/widgets/Cargo.toml keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/widgets/Cargo.toml +--- keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.orig/widgets/Cargo.toml 2021-08-18 21:33:03.000000000 -0400 ++++ keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157/widgets/Cargo.toml 2021-11-11 13:47:43.101421558 -0500 +@@ -29,8 +29,5 @@ + [build-dependencies] + gio = "0.14.0" + +-[target.'cfg(target_os = "windows")'.dependencies] +-winreg = "0.8" +- + [features] + appimage = ["backend/appimage"] diff --git a/sources b/sources new file mode 100644 index 0000000..5a4e576 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (keyboard-configurator-38c1c7ba2b8da84acc432ab06cf50b174125f157.tar.gz) = 4aa464ab29be25de2a65a45264bafd2c32df26dcc26f4d42af8f74fbb3d5a13fd5f944d30b04871d2db78e7098ea22f7e8df578be406a7a5a451a1068439ef4e diff --git a/system76-keyboard-configurator.spec b/system76-keyboard-configurator.spec new file mode 100644 index 0000000..f493137 --- /dev/null +++ b/system76-keyboard-configurator.spec @@ -0,0 +1,133 @@ +%bcond_without check +%global __cargo_skip_build 0 + +%global commit 38c1c7ba2b8da84acc432ab06cf50b174125f157 +%global forgeurl https://github.com/pop-os/keyboard-configurator +Version: 1.0.0 +%forgemeta + +Name: system76-keyboard-configurator +Release: 1%{?dist} +Summary: System76 Keyboard Configurator + +License: GPLv3 +URL: %{forgeurl} +Source: %{forgesource} + +Patch0: fix-target-windows-dependencies.patch +Patch1: disable-static-hidraw.patch + +ExclusiveArch: %{rust_arches} + +BuildRequires: rust-packaging +BuildRequires: gtk3-devel + +# cargo-inspector -BR Cargo.toml +BuildRequires: (crate(cairo-rs/default) >= 0.14.0 with crate(cairo-rs/default) < 0.15.0~) +BuildRequires: (crate(cascade/default) >= 1.0.0 with crate(cascade/default) < 2.0.0~) +BuildRequires: (crate(env_logger/default) >= 0.8.3 with crate(env_logger/default) < 0.9.0~) +BuildRequires: (crate(futures/default) >= 0.3.13 with crate(futures/default) < 0.4.0~) +BuildRequires: (crate(gdk/default) >= 0.14.0 with crate(gdk/default) < 0.15.0~) +BuildRequires: (crate(gio/default) >= 0.14.0 with crate(gio/default) < 0.15.0~) +BuildRequires: (crate(glib/default) >= 0.14.0 with crate(glib/default) < 0.15.0~) +BuildRequires: (crate(gtk/default) >= 0.14.0 with crate(gtk/default) < 0.15.0~) +BuildRequires: (crate(gtk/v3_22) >= 0.14.0 with crate(gtk/v3_22) < 0.15.0~) +BuildRequires: (crate(i18n-embed-fl/default) >= 0.5.0 with crate(i18n-embed-fl/default) < 0.6.0~) +BuildRequires: (crate(i18n-embed/default) >= 0.12.0 with crate(i18n-embed/default) < 0.13.0~) +BuildRequires: (crate(i18n-embed/desktop-requester) >= 0.12.0 with crate(i18n-embed/desktop-requester) < 0.13.0~) +BuildRequires: (crate(i18n-embed/fluent-system) >= 0.12.0 with crate(i18n-embed/fluent-system) < 0.13.0~) +BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0~) +BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0~) +BuildRequires: (crate(once_cell/default) >= 1.4.0 with crate(once_cell/default) < 2.0.0~) +BuildRequires: (crate(pango/default) >= 0.14.0 with crate(pango/default) < 0.15.0~) +BuildRequires: (crate(pangocairo/default) >= 0.14.0 with crate(pangocairo/default) < 0.15.0~) +BuildRequires: (crate(rust-embed/debug-embed) >= 5.9.0 with crate(rust-embed/debug-embed) < 6.0.0~) +BuildRequires: (crate(rust-embed/default) >= 5.9.0 with crate(rust-embed/default) < 6.0.0~) +BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0~) +BuildRequires: (crate(serde/derive) >= 1.0.0 with crate(serde/derive) < 2.0.0~) +BuildRequires: (crate(serde_json/default) >= 1.0.0 with crate(serde_json/default) < 2.0.0~) + +# cargo-inspector -BR backend/Cargo.toml +BuildRequires: (crate(cascade/default) >= 1.0.0 with crate(cascade/default) < 2.0.0~) +BuildRequires: (crate(futures-timer/default) >= 3.0.2 with crate(futures-timer/default) < 4.0.0~) +BuildRequires: (crate(futures/default) >= 0.3.13 with crate(futures/default) < 0.4.0~) +BuildRequires: (crate(glib/default) >= 0.14.0 with crate(glib/default) < 0.15.0~) +BuildRequires: (crate(hidapi/linux-shared-hidraw) >= 1.2.0 with crate(hidapi/linux-shared-hidraw) < 2.0.0~) +BuildRequires: (crate(i18n-embed-fl/default) >= 0.5.0 with crate(i18n-embed-fl/default) < 0.6.0~) +BuildRequires: (crate(i18n-embed/default) >= 0.12.0 with crate(i18n-embed/default) < 0.13.0~) +BuildRequires: (crate(i18n-embed/desktop-requester) >= 0.12.0 with crate(i18n-embed/desktop-requester) < 0.13.0~) +BuildRequires: (crate(i18n-embed/fluent-system) >= 0.12.0 with crate(i18n-embed/fluent-system) < 0.13.0~) +BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0~) +BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0~) +BuildRequires: (crate(once_cell/default) >= 1.4.0 with crate(once_cell/default) < 2.0.0~) +BuildRequires: (crate(ordered-float/default) >= 2.0.0 with crate(ordered-float/default) < 3.0.0~) +BuildRequires: (crate(ordered-float/serde) >= 2.0.0 with crate(ordered-float/serde) < 3.0.0~) +BuildRequires: (crate(palette/default) >= 0.5.0 with crate(palette/default) < 0.6.0~) +BuildRequires: (crate(regex/default) >= 1.0.0 with crate(regex/default) < 2.0.0~) +BuildRequires: (crate(rust-embed/debug-embed) >= 5.9.0 with crate(rust-embed/debug-embed) < 6.0.0~) +BuildRequires: (crate(rust-embed/default) >= 5.9.0 with crate(rust-embed/default) < 6.0.0~) +BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0~) +BuildRequires: (crate(serde/derive) >= 1.0.0 with crate(serde/derive) < 2.0.0~) +BuildRequires: (crate(serde_json/default) >= 1.0.0 with crate(serde_json/default) < 2.0.0~) +BuildRequires: (crate(system76_ectool/default) >= 0.3.6 with crate(system76_ectool/default) < 0.4.0~) +BuildRequires: (crate(system76_ectool/hidapi) >= 0.3.6 with crate(system76_ectool/hidapi) < 0.4.0~) +BuildRequires: (crate(system76_ectool/std) >= 0.3.6 with crate(system76_ectool/std) < 0.4.0~) +BuildRequires: (crate(uuid/default) >= 0.8.2 with crate(uuid/default) < 0.9.0~) +BuildRequires: (crate(uuid/v4) >= 0.8.2 with crate(uuid/v4) < 0.9.0~) +BuildRequires: (crate(zbus/default) >= 1.9.1 with crate(zbus/default) < 2.0.0~) + + +# cargo-inspector -BR widgets/Cargo.toml +BuildRequires: (crate(cairo-rs/default) >= 0.14.0 with crate(cairo-rs/default) < 0.15.0~) +BuildRequires: (crate(cascade/default) >= 1.0.0 with crate(cascade/default) < 2.0.0~) +BuildRequires: (crate(futures/default) >= 0.3.13 with crate(futures/default) < 0.4.0~) +BuildRequires: (crate(gdk/default) >= 0.14.0 with crate(gdk/default) < 0.15.0~) +BuildRequires: (crate(gio/default) >= 0.14.0 with crate(gio/default) < 0.15.0~) +BuildRequires: (crate(glib/default) >= 0.14.0 with crate(glib/default) < 0.15.0~) +BuildRequires: (crate(gtk/default) >= 0.14.0 with crate(gtk/default) < 0.15.0~) +BuildRequires: (crate(gtk/v3_22) >= 0.14.0 with crate(gtk/v3_22) < 0.15.0~) +BuildRequires: (crate(i18n-embed-fl/default) >= 0.5.0 with crate(i18n-embed-fl/default) < 0.6.0~) +BuildRequires: (crate(i18n-embed/default) >= 0.12.0 with crate(i18n-embed/default) < 0.13.0~) +BuildRequires: (crate(i18n-embed/desktop-requester) >= 0.12.0 with crate(i18n-embed/desktop-requester) < 0.13.0~) +BuildRequires: (crate(i18n-embed/fluent-system) >= 0.12.0 with crate(i18n-embed/fluent-system) < 0.13.0~) +BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0~) +BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0~) +BuildRequires: (crate(once_cell/default) >= 1.4.0 with crate(once_cell/default) < 2.0.0~) +BuildRequires: (crate(pango/default) >= 0.14.0 with crate(pango/default) < 0.15.0~) +BuildRequires: (crate(rust-embed/debug-embed) >= 5.9.0 with crate(rust-embed/debug-embed) < 6.0.0~) +BuildRequires: (crate(rust-embed/default) >= 5.9.0 with crate(rust-embed/default) < 6.0.0~) +BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0~) +BuildRequires: (crate(serde/derive) >= 1.0.0 with crate(serde/derive) < 2.0.0~) +BuildRequires: (crate(serde_json/default) >= 1.0.0 with crate(serde_json/default) < 2.0.0~) + + +%description +Application for configuration of System76 keyboard firmware.} + + +%prep +%forgeautosetup -p1 +%cargo_prep + + +%build +%cargo_build + + +%install +%cargo_install + + +%if %{with check} +%check +%cargo_test +%endif + + +%files +%{_bindir}/%{name} + + +%changelog +* Fri Oct 1 2021 Link Dupont <linkdupont(a)fedoraproject.org) - 1.0.0-1 +- Initial package