From 3f790c8d705729397d2403c6768b541c014dac29 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 19 Mar 2023 15:36:21 +0000 Subject: [PATCH 01/82] bump: iosevka-fusion --- anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec index 6398424943..6a78abb18a 100644 --- a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec +++ b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: iosevka-fusion-fonts -Version: 21.1.0 +Version: 21.1.1 Release: 1%{?dist} Summary: A custom font based on iosevka From 7c7406f61ffcd8260ca4a154c5268f9c16751f52 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 20 Mar 2023 04:44:47 +0800 Subject: [PATCH 02/82] fix(ci): autobuild (#292) --- .github/workflows/autobuild.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 3136297f64..e85e849721 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -72,9 +72,15 @@ jobs: extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}" andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo + - id: art + run: | + NAME=${{ matrix.pkg.pkg }}-${{ matrix.pkg.arch }}-${{ matrix.version }} + x=${NAME//\//@} + echo "name=$x" >> $GITHUB_OUTPUT + - uses: actions/upload-artifact@v3 with: - name: ${{ matrix.pkg.pkg }}-${{ matrix.pkg.arch }}-${{ matrix.version }} + name: ${{ steps.art.outputs.name }} path: anda-build/rpm/rpms/* - name: Upload packages to subatomic From b6403756eb2d2422dd517dea675865b6faf0afe2 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 20 Mar 2023 04:45:04 +0800 Subject: [PATCH 03/82] fix: libappimage (#294) --- anda/lib/libappimage/libappimage.spec | 5 ++++- anda/lib/libappimage/update.rhai | 2 ++ anda/lib/libappimage/update.rhai.bak | 2 -- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 anda/lib/libappimage/update.rhai delete mode 100644 anda/lib/libappimage/update.rhai.bak diff --git a/anda/lib/libappimage/libappimage.spec b/anda/lib/libappimage/libappimage.spec index 28e4d78215..b9fb71dc07 100644 --- a/anda/lib/libappimage/libappimage.spec +++ b/anda/lib/libappimage/libappimage.spec @@ -42,6 +42,9 @@ developing applications that use %{name}. %prep %autosetup -n %{name}-%{libver} +echo "#include " > a.h +cat src/libappimage/utils/hashlib.h >> a.h +mv a.h src/libappimage/utils/hashlib.h %build @@ -80,4 +83,4 @@ developing applications that use %{name}. %changelog * Tue Oct 25 2022 Cappy Ishihara -- +- Initial package. diff --git a/anda/lib/libappimage/update.rhai b/anda/lib/libappimage/update.rhai new file mode 100644 index 0000000000..0199954768 --- /dev/null +++ b/anda/lib/libappimage/update.rhai @@ -0,0 +1,2 @@ +let v = gh("AppImageCommunity/libappimage"); +rpm.global("libver", v); diff --git a/anda/lib/libappimage/update.rhai.bak b/anda/lib/libappimage/update.rhai.bak deleted file mode 100644 index 98da1463f0..0000000000 --- a/anda/lib/libappimage/update.rhai.bak +++ /dev/null @@ -1,2 +0,0 @@ -let v = gh("AppImageCommunity/libappimage"); -rpm.f = sub("%global libver(\\s+)(.+)", `%global libver$1${v}`, rpm.f); From 964ad7d03784029fde4eefb572e055cc03f4ea14 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 20 Mar 2023 04:45:13 +0800 Subject: [PATCH 04/82] fix: marble-gtk (#297) --- anda/lib/marble-gtk/marble-gtk.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anda/lib/marble-gtk/marble-gtk.spec b/anda/lib/marble-gtk/marble-gtk.spec index 879471450d..6bb9e2eb22 100644 --- a/anda/lib/marble-gtk/marble-gtk.spec +++ b/anda/lib/marble-gtk/marble-gtk.spec @@ -8,7 +8,9 @@ BuildRequires: vala pkgconfig(gtk4) meson >= 0.50.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.24 BuildRequires: pkgconfig(gio-2.0) >= 2.50 -Source0: %{url}/-/archive/v%{version}/marble-v%{version}.tar.gz +Provides: pkgconfig(marble) = 42 + +Source0: %{url}/-/archive/v%{version}/marble-v%{version}.tar.gz %description %summary. From 6d70ea6bbc5daa088dcc985ed0c0060ce6be5e41 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 20 Mar 2023 04:45:22 +0800 Subject: [PATCH 05/82] bump: libappimageupdate (#298) --- .../libappimageupdate/libappimageupdate.spec | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/anda/lib/libappimageupdate/libappimageupdate.spec b/anda/lib/libappimageupdate/libappimageupdate.spec index 5c96ba5de8..1487a335a6 100644 --- a/anda/lib/libappimageupdate/libappimageupdate.spec +++ b/anda/lib/libappimageupdate/libappimageupdate.spec @@ -1,8 +1,8 @@ -%global git_commit af298b7aebfab4bcee7490a86f0471cc22db248b +%global git_commit 0b200115d33257ea0ceab1d03cc25f5b52c6ad77 %global commit_short %(c=%{git_commit}; echo ${c:0:7}) -%global libver 2.0.0-alpha-1-20220124.git%{commit_short} +%global libver 2.0.0-alpha-1-20220304.git%{commit_short} # replace - with ~ %global libver_format %(v=%{libver}; sed 's/-/~/g' <<< $v) @@ -71,10 +71,26 @@ git submodule update --init --recursive %{_libdir}/*.a # what is this? %exclude %{_bindir}/validate +%exclude %{_bindir}/curl-config +%exclude %{_bindir}/zsync2 +%exclude %{_bindir}/zsyncmake2 %files devel %{_includedir}/* %{_prefix}/lib/cmake/AppImageUpdate/ +/usr/lib/debug/usr/bin/zsync*.debug +/usr/lib/debug/usr/bin/zsyncmake*.debug +/usr/lib64/cmake/CURL/CURLConfig.cmake +/usr/lib64/cmake/CURL/CURLConfigVersion.cmake +/usr/lib64/cmake/CURL/CURLTargets-debug.cmake +/usr/lib64/cmake/CURL/CURLTargets.cmake +/usr/lib64/cmake/zsync2/zsync2Config.cmake +/usr/lib64/cmake/zsync2/zsync2ConfigVersion.cmake +/usr/lib64/cmake/zsync2/zsync2Targets-debug.cmake +/usr/lib64/cmake/zsync2/zsync2Targets.cmake +/usr/lib64/pkgconfig/args.pc +/usr/lib64/pkgconfig/libcurl.pc +/usr/lib64/pkgconfig/zlib.pc %changelog * Tue Oct 25 2022 Cappy Ishihara From d47c0da30983dd9617bdd00f16330d8387e3b635 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 20 Mar 2023 04:48:07 +0800 Subject: [PATCH 06/82] fix: iosevka-fusion-fonts blackbox-terminal (#289) --- anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec | 2 +- anda/fonts/iosevka-fusion/iosevka-fusion.toml | 13 ++++++------- .../others/blackbox-terminal/blackbox-terminal.spec | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec index 6a78abb18a..e8732750d5 100644 --- a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec +++ b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec @@ -14,7 +14,7 @@ Source1: iosevka-fusion.toml BuildArch: noarch BuildRequires: clang -BuildRequires: npm +BuildRequires: nodejs-npm BuildRequires: ttfautohint %description diff --git a/anda/fonts/iosevka-fusion/iosevka-fusion.toml b/anda/fonts/iosevka-fusion/iosevka-fusion.toml index 4025f9910f..0a427f9373 100644 --- a/anda/fonts/iosevka-fusion/iosevka-fusion.toml +++ b/anda/fonts/iosevka-fusion/iosevka-fusion.toml @@ -16,7 +16,7 @@ cv09 = 1 # I cap long serifs cv10 = 2 # J cap serified cv11 = 2 # K cap curly cv12 = 1 # L cap serifless -cv13 = 3 # M cap short middle leg slanted sides +cv13 = 1 # M cap short middle leg cv14 = 1 # N cap symmetric cv15 = 1 # P cap straight cv16 = 4 # Q cap crossing tail @@ -63,12 +63,11 @@ cv91 = 2 # $ dollar strike through cv92 = 2 # ¢ cent strike through cv93 = 1 # % percent dots cv94 = 1 # | bar natural slope -cv95 = 2 # ≥ equal-or-{higher,lower} slanted -cv96 = 1 # ' single quote straight -cv97 = 1 # ` grave/backtick straight -cv98 = 1 # ? smooth -cv99 = 2 # .:; square punctuation marks -VXDD = 2 # ijäöü square diacretics +cv95 = 1 # ' single quote straight +cv96 = 1 # ` grave/backtick straight +cv97 = 1 # ? smooth +cv98 = 2 # .:; square punctuation marks +cv99 = 2 # ijäöü square diacretics [buildPlans.iosevka-fusion.variants.upright] cv26 = 3 # a double storey rounded diff --git a/anda/others/blackbox-terminal/blackbox-terminal.spec b/anda/others/blackbox-terminal/blackbox-terminal.spec index 2920a6c8cd..0239b50b09 100644 --- a/anda/others/blackbox-terminal/blackbox-terminal.spec +++ b/anda/others/blackbox-terminal/blackbox-terminal.spec @@ -8,7 +8,7 @@ BuildRequires: vala meson gettext BuildRequires: pkgconfig(gtk4) >= 4.6.2 BuildRequires: pkgconfig(gio-2.0) >= 2.50 BuildRequires: pkgconfig(libadwaita-1) >= 1.1 -BuildRequires: marble-gtk >= 42 +BuildRequires: marble-gtk BuildRequires: pkgconfig(vte-2.91-gtk4) >= 0.69.0 BuildRequires: pkgconfig(json-glib-1.0) >= 1.4.4 BuildRequires: pkgconfig(libxml-2.0) >= 2.9.12 From fb81413ee1c3bd09e393174e74215c327a4d0dda Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 20 Mar 2023 04:49:35 +0800 Subject: [PATCH 07/82] feat(ci): Add sync workflow (#288) --- .github/workflows/sync.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/sync.yml diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml new file mode 100644 index 0000000000..3c59a8caa6 --- /dev/null +++ b/.github/workflows/sync.yml @@ -0,0 +1,37 @@ +name: Sync PR to other branches +on: + pull_request: + types: + - closed + branches: + - main + +jobs: + sync: + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + steps: + - name: Setup Git + run: | + mkdir -p ${{ runner.temp }} + echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key + chmod 0700 ${{ runner.temp }}/signing_key + git config --global --add safe.directory "$GITHUB_WORKSPACE" + git config user.name "Raboneko" + git config user.email "raboneko@fyralabs.com" + git config gpg.format "ssh" + git config user.signingkey "${{ runner.temp }}/signing_key" + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }} + - name: Download patches + run: | + curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch + - name: Apply patches + run: | + git checkout f38 + git am --keep-cr --signoff < pr.patch + - name: Push + run: git push origin -u --all From d6a04356f375c7155afd3444de5d32b1c4510f01 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 20 Mar 2023 01:27:02 +0000 Subject: [PATCH 08/82] bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly --- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 2 +- .../prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 85acb36f8e..84aa3fb5cb 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 45b0367d14f38d40af5cc8603f7daab05d83af5f +%global commit 6dcf34acdc8ec3dcbb094e4981ef136cd6a99913 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index d145693ac3..1eed3d2dc3 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 45b0367d14f38d40af5cc8603f7daab05d83af5f +%global commit 6dcf34acdc8ec3dcbb094e4981ef136cd6a99913 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 From f158164d4007c72f3da58c1784f2f6cd0a260b1b Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 19 Mar 2023 23:20:58 -0400 Subject: [PATCH 09/82] feat: prismlauncher recommend flite (#300) --- .../games/prismlauncher-nightly/prismlauncher-nightly.spec | 5 +++++ .../prismlauncher-qt5-nightly.spec | 5 +++++ anda/games/prismlauncher-qt5/prismlauncher-qt5.spec | 7 ++++++- anda/games/prismlauncher/prismlauncher.spec | 7 ++++++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 84aa3fb5cb..7dc1d76eaa 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -87,6 +87,8 @@ Requires: java-1.8.0-openjdk # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 Recommends: xrandr +# libflite needed for using narrator in minecraft +Recommends: flite # Prism supports enabling gamemode Suggests: gamemode @@ -183,6 +185,9 @@ fi %changelog +* Mon Mar 20 2023 seth - 7.0^20230319.6dcf34a-1 +- recommend flite to support narrator in minecraft + * Fri Feb 03 2023 seth flynn - 7.0^20230203.58d9ced-1 - disable tests and explicitly require cmark diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index 1eed3d2dc3..5aa465a71a 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -87,6 +87,8 @@ Requires: java-1.8.0-openjdk # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 Recommends: xrandr +# libflite needed for using narrator in minecraft +Recommends: flite # Prism supports enabling gamemode Suggests: gamemode @@ -184,6 +186,9 @@ fi %changelog +* Mon Mar 20 2023 seth - 7.0^20230319.6dcf34a-1 +- recommend flite to support narrator in minecraft + * Fri Feb 03 2023 seth flynn - 7.0^20230203.58d9ced-1 - disable tests and explicitly require cmark diff --git a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec index bb90e80d5c..21158e0409 100644 --- a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec +++ b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec @@ -30,7 +30,7 @@ Name: prismlauncher-qt5 Version: 6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minecraft launcher with ability to manage multiple instances License: GPL-3.0-only Group: Amusements/Games @@ -74,6 +74,8 @@ Requires: java-1.8.0-openjdk # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 Recommends: xrandr +# libflite needed for using narrator in minecraft +Recommends: flite # Prism supports enabling gamemode Suggests: gamemode @@ -159,6 +161,9 @@ fi %changelog +* Mon Mar 20 2023 seth - 6.3-2 +- recommend flite to support narrator in minecraft + * Sat Feb 04 2023 seth - 6.3-1 - update to 6.3 diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index 655c647f40..7fb6a02b25 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -29,7 +29,7 @@ Name: prismlauncher Version: 6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minecraft launcher with ability to manage multiple instances License: GPL-3.0-only Group: Amusements/Games @@ -73,6 +73,8 @@ Requires: java-1.8.0-openjdk # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 Recommends: xrandr +# libflite needed for using narrator in minecraft +Recommends: flite # Prism supports enabling gamemode Suggests: gamemode @@ -156,6 +158,9 @@ fi %changelog +* Mon Mar 20 2023 seth - 6.3-2 +- recommend flite to support narrator in minecraft + * Sat Feb 04 2023 seth - 6.3-1 - update to 6.3 From 7f562561b438f59e4b377f7edaacb9da84b97982 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sun, 19 Mar 2023 20:23:58 -0700 Subject: [PATCH 10/82] feat: add lomirir-url-dispatcher (#301) --- anda/lib/lomiri-url-dispatcher/anda.hcl | 5 ++ .../lomiri-url-dispatcher.spec | 88 +++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 anda/lib/lomiri-url-dispatcher/anda.hcl create mode 100644 anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec diff --git a/anda/lib/lomiri-url-dispatcher/anda.hcl b/anda/lib/lomiri-url-dispatcher/anda.hcl new file mode 100644 index 0000000000..52493410a7 --- /dev/null +++ b/anda/lib/lomiri-url-dispatcher/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "lomiri-url-dispatcher.spec" + } +} diff --git a/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec b/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec new file mode 100644 index 0000000000..2499def02a --- /dev/null +++ b/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec @@ -0,0 +1,88 @@ +%global forgeurl https://gitlab.com/ubports/development/core/lomiri-url-dispatcher +%global commit 6164af4dac5ed8f166429c9476831997a470f58a +%forgemeta + +Name: lomiri-url-dispatcher +Version: 0.1.0 +Release: %autorelease +Summary: A small library for handling URLs over dbus + +License: LGPLv3 +URL: https://gitlab.com/ubports/development/core/lomiri-url-dispatcher +Source0: %{url}/-/archive/%commit/lomiri-url-dispatcher-%commit.tar.gz + +BuildRequires: systemd-rpm-macros +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: pkgconfig +BuildRequires: g++ +BuildRequires: gcc +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(lomiri-app-launch-0) +BuildRequires: pkgconfig(json-glib-1.0) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dbustest-1) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(libapparmor) +Requires: lomiri-ui-toolkit + +%description +Lomiri-url-dispatcher is a small handler to take URLs and do what is appropriate with them. +That could be anything from launching a web browser to just starting an +application. This is done over DBus because application confinement doesn't +allow for doing it from a confined application otherwise. It's important +the that applications can't know about each other, so this is a fire and forget +type operation. + +%package devel +Summary: Lomiri-url-dispatcher development files +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package contains development files needed for lomiri-url-dispatcher. + +%prep +%autosetup -n lomiri-url-dispatcher-%commit +# Tests require static gtest library +sed -i '/add_subdirectory(tests)/d' ./CMakeLists.txt + +%build +%cmake -Denable_mirclient=off + +%cmake_build + +%install +%cmake_install + +%find_lang %{name} + +%files -f %{name}.lang +%license COPYING +%{_libdir}/liblomiri-url-dispatcher.so.* +%{_bindir}/lomiri-url-* +%dir %{_libexecdir}/lomiri-app-launch/bad-url +%{_libexecdir}/lomiri-app-launch/bad-url/exec-tool +%dir %{_libexecdir}/lomiri-app-launch/url-overlay +%{_libexecdir}/lomiri-app-launch/url-overlay/exec-tool +%dir %{_libexecdir}/lomiri-url-dispatcher +%{_libexecdir}/lomiri-url-dispatcher/lomiri-* +%{_datadir}/applications/lomiri-url-dispatcher-gui.desktop +%{_datadir}/dbus-1/services/*.service +%{_datadir}/dbus-1/interfaces/*.xml +%dir %{_datadir}/lomiri-url-dispatcher +%{_datadir}/lomiri-url-dispatcher/*.qml +%dir %{_datadir}/lomiri-url-dispatcher/gui +%{_datadir}/lomiri-url-dispatcher/gui/*.qml +%{_datadir}/lomiri-url-dispatcher/gui/*.svg +%{_userunitdir}/*.path +%{_userunitdir}/*.service + +%files devel +%{_libdir}/liblomiri-url-dispatcher.so +%{_libdir}/pkgconfig/*.pc +%dir %{_includedir}/liblomiri-url-dispatcher +%{_includedir}/liblomiri-url-dispatcher/*.h + +%changelog +%autochangelog From 82cf392e617abd3f5e1e532831d1ad1c09a9a43f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 20 Mar 2023 06:20:50 +0000 Subject: [PATCH 11/82] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index 19c2f484ed..361ae3cedc 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -1,4 +1,4 @@ -%define osuresver 2023.317.1 +%define osuresver 2023.320.0 %global debug_package %{nil} Name: osu-lazer From 102593c2d127e0a49c8d56483b11848a24e0a5eb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 20 Mar 2023 23:14:25 +0000 Subject: [PATCH 12/82] bump: orjson --- anda/python/orjson/python3-orjson.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/python/orjson/python3-orjson.spec b/anda/python/orjson/python3-orjson.spec index 0a354af4bd..60f35f6b37 100644 --- a/anda/python/orjson/python3-orjson.spec +++ b/anda/python/orjson/python3-orjson.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: python3-orjson -Version: 3.8.7 +Version: 3.8.8 Release: 1%{?dist} Summary: Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy License: MIT or APACHE-2.0 From f0829024fadc4513bb5ed8f42a807d5bdcb1c5fa Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 21 Mar 2023 09:15:35 +0000 Subject: [PATCH 13/82] bump: bat-extras --- anda/rust/bat-extras/bat-extras.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/rust/bat-extras/bat-extras.spec b/anda/rust/bat-extras/bat-extras.spec index 9af7971b79..e99e57e298 100644 --- a/anda/rust/bat-extras/bat-extras.spec +++ b/anda/rust/bat-extras/bat-extras.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: bat-extras -Version: 2022.07.27 +Version: 2023.03.21 Release: 1%{?dist} Summary: Bash scripts that integrate bat with various command line tools From 2adf438d73fb60576ea22ac70a663c0ce3f0c7f9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 21 Mar 2023 10:36:57 +0000 Subject: [PATCH 14/82] bump: sccache --- anda/rust/sccache/rust-sccache.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/rust/sccache/rust-sccache.spec b/anda/rust/sccache/rust-sccache.spec index 97a39e7020..cfcf34cbd5 100644 --- a/anda/rust/sccache/rust-sccache.spec +++ b/anda/rust/sccache/rust-sccache.spec @@ -6,7 +6,7 @@ %global crate sccache Name: rust-sccache -Version: 0.3.3 +Version: 0.4.0 Release: 1%{?dist} Summary: Ccache-like tool From a42a5194c147db391231b784371f3731397630c0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 21 Mar 2023 20:15:42 +0000 Subject: [PATCH 15/82] bump: hyperfine --- anda/rust/hyperfine/rust-hyperfine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/rust/hyperfine/rust-hyperfine.spec b/anda/rust/hyperfine/rust-hyperfine.spec index 2e0d9374c6..2eaec87a27 100644 --- a/anda/rust/hyperfine/rust-hyperfine.spec +++ b/anda/rust/hyperfine/rust-hyperfine.spec @@ -4,7 +4,7 @@ %global crate hyperfine Name: rust-hyperfine -Version: 1.16.0 +Version: 1.16.1 Release: 1%{?dist} Summary: Command-line benchmarking tool From 14b9b60ff25cf51010eb146004d000ae24f624c8 Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 22 Mar 2023 04:48:47 +0800 Subject: [PATCH 16/82] Update sync.yml (#303) Signed-off-by: madomado --- .github/workflows/sync.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 3c59a8caa6..ec47db5e55 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -11,21 +11,23 @@ jobs: if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: - - name: Setup Git + - name: Install SSH key run: | mkdir -p ${{ runner.temp }} echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key chmod 0700 ${{ runner.temp }}/signing_key - git config --global --add safe.directory "$GITHUB_WORKSPACE" - git config user.name "Raboneko" - git config user.email "raboneko@fyralabs.com" - git config gpg.format "ssh" - git config user.signingkey "${{ runner.temp }}/signing_key" - name: Checkout uses: actions/checkout@v3 with: fetch-depth: 0 ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }} + - name: Setup Git + run: | + git config --global --add safe.directory "$GITHUB_WORKSPACE" + git config user.name "Raboneko" + git config user.email "raboneko@fyralabs.com" + git config gpg.format "ssh" + git config user.signingkey "${{ runner.temp }}/signing_key" - name: Download patches run: | curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch From f7c1331684db322d740222bc5038f4aa34aadfef Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Tue, 21 Mar 2023 13:49:19 -0700 Subject: [PATCH 17/82] feat: add lomiri-schemas (#302) --- anda/others/lomiri-schemas/anda.hcl | 5 + .../others/lomiri-schemas/lomiri-schemas.spec | 329 ++++++++++++++++++ 2 files changed, 334 insertions(+) create mode 100644 anda/others/lomiri-schemas/anda.hcl create mode 100644 anda/others/lomiri-schemas/lomiri-schemas.spec diff --git a/anda/others/lomiri-schemas/anda.hcl b/anda/others/lomiri-schemas/anda.hcl new file mode 100644 index 0000000000..190195570c --- /dev/null +++ b/anda/others/lomiri-schemas/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "lomiri-schemas.spec" + } +} diff --git a/anda/others/lomiri-schemas/lomiri-schemas.spec b/anda/others/lomiri-schemas/lomiri-schemas.spec new file mode 100644 index 0000000000..39d6e0dd60 --- /dev/null +++ b/anda/others/lomiri-schemas/lomiri-schemas.spec @@ -0,0 +1,329 @@ +%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas +%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 +%forgemeta + +Name: lomiri-schemas +Version: 0.1.3 +Release: %autorelease +Summary: Configuration schemas for lomiri +License: LGPLv2+ +URL: https://gitlab.com/ubports/development/core/lomiri-schemas +Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz +BuildArch: noarch + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: glib2-devel +BuildRequires: gettext +BuildRequires: intltool + +%description +Configuration schemas for lomiri desktop enviroment. + +%prep +%autosetup -n %{name}-%commit + +%build +%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true +%cmake_build + +%install +%cmake_install + +%files +%{_datadir}/accountsservice/interfaces/*.xml +%{_datadir}/dbus-1/interfaces/*.xml +%{_datadir}/glib-2.0/schemas/*.xml +%{_datadir}/pkgconfig/lomiri-schemas.pc +%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy +%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla + +%changelog +%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas +%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 +%forgemeta + +Name: lomiri-schemas +Version: 0.1.3 +Release: %autorelease +Summary: Configuration schemas for lomiri +License: LGPLv2+ +URL: https://gitlab.com/ubports/development/core/lomiri-schemas +Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz +BuildArch: noarch + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: glib2-devel +BuildRequires: gettext +BuildRequires: intltool + +%description +Configuration schemas for lomiri desktop enviroment. + +%prep +%autosetup -n %{name}-%commit + +%build +%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true +%cmake_build + +%install +%cmake_install + +%files +%{_datadir}/accountsservice/interfaces/*.xml +%{_datadir}/dbus-1/interfaces/*.xml +%{_datadir}/glib-2.0/schemas/*.xml +%{_datadir}/pkgconfig/lomiri-schemas.pc +%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy +%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla + +%changelog +%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas +%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 +%forgemeta + +Name: lomiri-schemas +Version: 0.1.3 +Release: %autorelease +Summary: Configuration schemas for lomiri +License: LGPLv2+ +URL: https://gitlab.com/ubports/development/core/lomiri-schemas +Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz +BuildArch: noarch + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: glib2-devel +BuildRequires: gettext +BuildRequires: intltool + +%description +Configuration schemas for lomiri desktop enviroment. + +%prep +%autosetup -n %{name}-%commit + +%build +%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true +%cmake_build + +%install +%cmake_install + +%files +%{_datadir}/accountsservice/interfaces/*.xml +%{_datadir}/dbus-1/interfaces/*.xml +%{_datadir}/glib-2.0/schemas/*.xml +%{_datadir}/pkgconfig/lomiri-schemas.pc +%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy +%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla + +%changelog +%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas +%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 +%forgemeta + +Name: lomiri-schemas +Version: 0.1.3 +Release: %autorelease +Summary: Configuration schemas for lomiri +License: LGPLv2+ +URL: https://gitlab.com/ubports/development/core/lomiri-schemas +Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz +BuildArch: noarch + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: glib2-devel +BuildRequires: gettext +BuildRequires: intltool + +%description +Configuration schemas for lomiri desktop enviroment. + +%prep +%autosetup -n %{name}-%commit + +%build +%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true +%cmake_build + +%install +%cmake_install + +%files +%{_datadir}/accountsservice/interfaces/*.xml +%{_datadir}/dbus-1/interfaces/*.xml +%{_datadir}/glib-2.0/schemas/*.xml +%{_datadir}/pkgconfig/lomiri-schemas.pc +%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy +%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla + +%changelog +%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas +%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 +%forgemeta + +Name: lomiri-schemas +Version: 0.1.3 +Release: %autorelease +Summary: Configuration schemas for lomiri +License: LGPLv2+ +URL: https://gitlab.com/ubports/development/core/lomiri-schemas +Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz +BuildArch: noarch + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: glib2-devel +BuildRequires: gettext +BuildRequires: intltool + +%description +Configuration schemas for lomiri desktop enviroment. + +%prep +%autosetup -n %{name}-%commit + +%build +%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true +%cmake_build + +%install +%cmake_install + +%files +%{_datadir}/accountsservice/interfaces/*.xml +%{_datadir}/dbus-1/interfaces/*.xml +%{_datadir}/glib-2.0/schemas/*.xml +%{_datadir}/pkgconfig/lomiri-schemas.pc +%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy +%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla + +%changelog +%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas +%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 +%forgemeta + +Name: lomiri-schemas +Version: 0.1.3 +Release: %autorelease +Summary: Configuration schemas for lomiri +License: LGPLv2+ +URL: https://gitlab.com/ubports/development/core/lomiri-schemas +Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz +BuildArch: noarch + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: glib2-devel +BuildRequires: gettext +BuildRequires: intltool + +%description +Configuration schemas for lomiri desktop enviroment. + +%prep +%autosetup -n %{name}-%commit + +%build +%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true +%cmake_build + +%install +%cmake_install + +%files +%{_datadir}/accountsservice/interfaces/*.xml +%{_datadir}/dbus-1/interfaces/*.xml +%{_datadir}/glib-2.0/schemas/*.xml +%{_datadir}/pkgconfig/lomiri-schemas.pc +%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy +%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla + +%changelog +%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas +%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 +%forgemeta + +Name: lomiri-schemas +Version: 0.1.3 +Release: %autorelease +Summary: Configuration schemas for lomiri +License: LGPLv2+ +URL: https://gitlab.com/ubports/development/core/lomiri-schemas +Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz +BuildArch: noarch + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: glib2-devel +BuildRequires: gettext +BuildRequires: intltool + +%description +Configuration schemas for lomiri desktop enviroment. + +%prep +%autosetup -n %{name}-%commit + +%build +%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true +%cmake_build + +%install +%cmake_install + +%files +%{_datadir}/accountsservice/interfaces/*.xml +%{_datadir}/dbus-1/interfaces/*.xml +%{_datadir}/glib-2.0/schemas/*.xml +%{_datadir}/pkgconfig/lomiri-schemas.pc +%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy +%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla + +%changelog +%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas +%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 +%forgemeta + +Name: lomiri-schemas +Version: 0.1.3 +Release: %autorelease +Summary: Configuration schemas for lomiri +License: LGPLv2+ +URL: https://gitlab.com/ubports/development/core/lomiri-schemas +Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz +BuildArch: noarch + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: glib2-devel +BuildRequires: gettext +BuildRequires: intltool + +%description +Configuration schemas for lomiri desktop enviroment. + +%prep +%autosetup -n %{name}-%commit + +%build +%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true +%cmake_build + +%install +%cmake_install + +%files +%{_datadir}/accountsservice/interfaces/*.xml +%{_datadir}/dbus-1/interfaces/*.xml +%{_datadir}/glib-2.0/schemas/*.xml +%{_datadir}/pkgconfig/lomiri-schemas.pc +%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy +%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla + +%changelog +%autochangelog From 4b309e6275321d6014f9bb9e5e428a278c2566bc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 22 Mar 2023 12:29:20 +0000 Subject: [PATCH 18/82] bump: dart --- anda/dart/dart.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/dart/dart.spec b/anda/dart/dart.spec index f1ec48c698..9c6bb7f9e4 100644 --- a/anda/dart/dart.spec +++ b/anda/dart/dart.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: dart -Version: 2.19.4 +Version: 2.19.5 Release: 1%{?dist} Summary: The Dart Language License: BSD-3-Clause From 9b7dac0964c86213ce863f360adb354831a49de7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 22 Mar 2023 13:21:39 +0000 Subject: [PATCH 19/82] bump: moby-compose --- anda/moby-extras/moby-compose/moby-compose.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/moby-extras/moby-compose/moby-compose.spec b/anda/moby-extras/moby-compose/moby-compose.spec index 672a2c615c..ea23bc6ee0 100644 --- a/anda/moby-extras/moby-compose/moby-compose.spec +++ b/anda/moby-extras/moby-compose/moby-compose.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: moby-compose -Version: 2.16.0 +Version: 2.17.0 Release: 1%{?dist} Summary: Define and run multi-container applications with Docker From ad0474b215c7be442e2cf70b5fff8f749d792bc4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 22 Mar 2023 20:37:00 +0000 Subject: [PATCH 20/82] bump: ruff --- anda/python/ruff/python3-ruff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/python/ruff/python3-ruff.spec b/anda/python/ruff/python3-ruff.spec index 6e5d0fc859..589c941d38 100644 --- a/anda/python/ruff/python3-ruff.spec +++ b/anda/python/ruff/python3-ruff.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: python3-ruff -Version: 0.0.257 +Version: 0.0.258 Release: 1%{?dist} Summary: An extremely fast Python linter, written in Rust License: MIT From 8763bda266b7fe356fd6ec9848a226e5f6b1c99f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 23 Mar 2023 07:13:33 +0000 Subject: [PATCH 21/82] bump: fuc --- anda/tools/fuc/fuc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/fuc/fuc.spec b/anda/tools/fuc/fuc.spec index 85c5d83052..fde69f8768 100644 --- a/anda/tools/fuc/fuc.spec +++ b/anda/tools/fuc/fuc.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: fuc -Version: 1.1.4 +Version: 1.1.5 Release: 1%{?dist} Summary: Modern, performance focused unix commands URL: https://github.com/SUPERCILEX/fuc From 056c3d2842e7a15a721ff3262b27d677a67c5b4f Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Thu, 23 Mar 2023 08:36:49 -0700 Subject: [PATCH 22/82] feat: add ubuntu-sdk (#304) * feat: add ubuntu-sdk * chore: use the latest version as latest sdk Co-authored-by: madomado Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --------- Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> Co-authored-by: madomado --- anda/others/ubuntu-sdk/anda.hcl | 5 +++ anda/others/ubuntu-sdk/ubuntu-sdk.spec | 42 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 anda/others/ubuntu-sdk/anda.hcl create mode 100644 anda/others/ubuntu-sdk/ubuntu-sdk.spec diff --git a/anda/others/ubuntu-sdk/anda.hcl b/anda/others/ubuntu-sdk/anda.hcl new file mode 100644 index 0000000000..548d0ebb99 --- /dev/null +++ b/anda/others/ubuntu-sdk/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "ubuntu-sdk.spec" + } +} diff --git a/anda/others/ubuntu-sdk/ubuntu-sdk.spec b/anda/others/ubuntu-sdk/ubuntu-sdk.spec new file mode 100644 index 0000000000..b9af4dc400 --- /dev/null +++ b/anda/others/ubuntu-sdk/ubuntu-sdk.spec @@ -0,0 +1,42 @@ +%global forgeurl https://gitlab.com/ubports/development/core/ubuntu-touch-meta +%global commit d1dc3b7f6c508cc2e803db3b72fcf1dc0a019afa +%forgemeta + +Name: ubuntu-sdk +Summary: Assets and icons for Unity +Version: 20.04 +Release: %autorelease + +License: GPLv3+ +URL: https://gitlab.com/ubports/development/core/ubuntu-touch-meta +Source0: %{url}/-/archive/%commit/ubuntu-touch-meta-%commit.tar.gz +BuildArch: noarch + +BuildRequires: binutils +Recommends: python3-lomiri-click + +%description +Theme and icons for Unity. + +%prep +%autosetup -n ubuntu-touch-meta-%commit + +%build +true + +%install +mkdir -m 0755 -p %{buildroot}%{_datadir}/ubports/changelogs %{buildroot}%{_datadir}/click/frameworks + +install -Dm644 changelogs/* %{buildroot}%{_datadir}/ubports/changelogs +install -Dm644 frameworks/* %{buildroot}%{_datadir}/click/frameworks + +ln -s %{buildroot}%{_datadir}/click/frameworks/ubuntu-sdk-%{version}.framework %{buildroot}%{_datadir}/click/frameworks/current +ln -s %{buildroot}%{_datadir}/ubports/changelogs/%{version} %{buildroot}%{_datadir}/ubports/changelogs/current + +%files +%license COPYING +%{_datadir}/ubports/changelogs/ +%{_datadir}/click/frameworks/ + +%changelog +%autochangelog From 9776d71b66a1c67612ecf99686bfe07b581f6f5b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 23 Mar 2023 19:36:11 +0000 Subject: [PATCH 23/82] bump: ruff --- anda/python/ruff/python3-ruff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/python/ruff/python3-ruff.spec b/anda/python/ruff/python3-ruff.spec index 589c941d38..dfd3af166e 100644 --- a/anda/python/ruff/python3-ruff.spec +++ b/anda/python/ruff/python3-ruff.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: python3-ruff -Version: 0.0.258 +Version: 0.0.259 Release: 1%{?dist} Summary: An extremely fast Python linter, written in Rust License: MIT From 9b9d643c4888fbb7ac13e70996946bf932ff5e2e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 23 Mar 2023 23:15:06 +0000 Subject: [PATCH 24/82] bump: sass --- anda/others/sass/sass.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/others/sass/sass.spec b/anda/others/sass/sass.spec index 22a6a64dfb..ccf8a66953 100644 --- a/anda/others/sass/sass.spec +++ b/anda/others/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.59.3 +Version: 1.60.0 Release: 1%{?dist} Summary: The reference implementation of Sass, written in Dart License: MIT From bf6f2fba18b1fef343ff4a786def3e1d593c5949 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 24 Mar 2023 04:38:26 +0000 Subject: [PATCH 25/82] bump: fuc --- anda/tools/fuc/fuc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/fuc/fuc.spec b/anda/tools/fuc/fuc.spec index fde69f8768..d099a3c08e 100644 --- a/anda/tools/fuc/fuc.spec +++ b/anda/tools/fuc/fuc.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: fuc -Version: 1.1.5 +Version: 1.1.6 Release: 1%{?dist} Summary: Modern, performance focused unix commands URL: https://github.com/SUPERCILEX/fuc From 9f605cd939f462852b3bc988c5736e0ce7dbd66b Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 24 Mar 2023 06:56:26 -0700 Subject: [PATCH 26/82] fix: lomiri-schemas (#312) I have no idea how this happened. Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- .../others/lomiri-schemas/lomiri-schemas.spec | 287 ------------------ 1 file changed, 287 deletions(-) diff --git a/anda/others/lomiri-schemas/lomiri-schemas.spec b/anda/others/lomiri-schemas/lomiri-schemas.spec index 39d6e0dd60..0b9a1a0b43 100644 --- a/anda/others/lomiri-schemas/lomiri-schemas.spec +++ b/anda/others/lomiri-schemas/lomiri-schemas.spec @@ -38,292 +38,5 @@ Configuration schemas for lomiri desktop enviroment. %{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy %{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla -%changelog -%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas -%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 -%forgemeta - -Name: lomiri-schemas -Version: 0.1.3 -Release: %autorelease -Summary: Configuration schemas for lomiri -License: LGPLv2+ -URL: https://gitlab.com/ubports/development/core/lomiri-schemas -Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz -BuildArch: noarch - -BuildRequires: cmake -BuildRequires: cmake-extras -BuildRequires: glib2-devel -BuildRequires: gettext -BuildRequires: intltool - -%description -Configuration schemas for lomiri desktop enviroment. - -%prep -%autosetup -n %{name}-%commit - -%build -%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true -%cmake_build - -%install -%cmake_install - -%files -%{_datadir}/accountsservice/interfaces/*.xml -%{_datadir}/dbus-1/interfaces/*.xml -%{_datadir}/glib-2.0/schemas/*.xml -%{_datadir}/pkgconfig/lomiri-schemas.pc -%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy -%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla - -%changelog -%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas -%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 -%forgemeta - -Name: lomiri-schemas -Version: 0.1.3 -Release: %autorelease -Summary: Configuration schemas for lomiri -License: LGPLv2+ -URL: https://gitlab.com/ubports/development/core/lomiri-schemas -Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz -BuildArch: noarch - -BuildRequires: cmake -BuildRequires: cmake-extras -BuildRequires: glib2-devel -BuildRequires: gettext -BuildRequires: intltool - -%description -Configuration schemas for lomiri desktop enviroment. - -%prep -%autosetup -n %{name}-%commit - -%build -%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true -%cmake_build - -%install -%cmake_install - -%files -%{_datadir}/accountsservice/interfaces/*.xml -%{_datadir}/dbus-1/interfaces/*.xml -%{_datadir}/glib-2.0/schemas/*.xml -%{_datadir}/pkgconfig/lomiri-schemas.pc -%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy -%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla - -%changelog -%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas -%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 -%forgemeta - -Name: lomiri-schemas -Version: 0.1.3 -Release: %autorelease -Summary: Configuration schemas for lomiri -License: LGPLv2+ -URL: https://gitlab.com/ubports/development/core/lomiri-schemas -Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz -BuildArch: noarch - -BuildRequires: cmake -BuildRequires: cmake-extras -BuildRequires: glib2-devel -BuildRequires: gettext -BuildRequires: intltool - -%description -Configuration schemas for lomiri desktop enviroment. - -%prep -%autosetup -n %{name}-%commit - -%build -%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true -%cmake_build - -%install -%cmake_install - -%files -%{_datadir}/accountsservice/interfaces/*.xml -%{_datadir}/dbus-1/interfaces/*.xml -%{_datadir}/glib-2.0/schemas/*.xml -%{_datadir}/pkgconfig/lomiri-schemas.pc -%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy -%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla - -%changelog -%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas -%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 -%forgemeta - -Name: lomiri-schemas -Version: 0.1.3 -Release: %autorelease -Summary: Configuration schemas for lomiri -License: LGPLv2+ -URL: https://gitlab.com/ubports/development/core/lomiri-schemas -Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz -BuildArch: noarch - -BuildRequires: cmake -BuildRequires: cmake-extras -BuildRequires: glib2-devel -BuildRequires: gettext -BuildRequires: intltool - -%description -Configuration schemas for lomiri desktop enviroment. - -%prep -%autosetup -n %{name}-%commit - -%build -%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true -%cmake_build - -%install -%cmake_install - -%files -%{_datadir}/accountsservice/interfaces/*.xml -%{_datadir}/dbus-1/interfaces/*.xml -%{_datadir}/glib-2.0/schemas/*.xml -%{_datadir}/pkgconfig/lomiri-schemas.pc -%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy -%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla - -%changelog -%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas -%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 -%forgemeta - -Name: lomiri-schemas -Version: 0.1.3 -Release: %autorelease -Summary: Configuration schemas for lomiri -License: LGPLv2+ -URL: https://gitlab.com/ubports/development/core/lomiri-schemas -Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz -BuildArch: noarch - -BuildRequires: cmake -BuildRequires: cmake-extras -BuildRequires: glib2-devel -BuildRequires: gettext -BuildRequires: intltool - -%description -Configuration schemas for lomiri desktop enviroment. - -%prep -%autosetup -n %{name}-%commit - -%build -%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true -%cmake_build - -%install -%cmake_install - -%files -%{_datadir}/accountsservice/interfaces/*.xml -%{_datadir}/dbus-1/interfaces/*.xml -%{_datadir}/glib-2.0/schemas/*.xml -%{_datadir}/pkgconfig/lomiri-schemas.pc -%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy -%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla - -%changelog -%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas -%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 -%forgemeta - -Name: lomiri-schemas -Version: 0.1.3 -Release: %autorelease -Summary: Configuration schemas for lomiri -License: LGPLv2+ -URL: https://gitlab.com/ubports/development/core/lomiri-schemas -Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz -BuildArch: noarch - -BuildRequires: cmake -BuildRequires: cmake-extras -BuildRequires: glib2-devel -BuildRequires: gettext -BuildRequires: intltool - -%description -Configuration schemas for lomiri desktop enviroment. - -%prep -%autosetup -n %{name}-%commit - -%build -%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true -%cmake_build - -%install -%cmake_install - -%files -%{_datadir}/accountsservice/interfaces/*.xml -%{_datadir}/dbus-1/interfaces/*.xml -%{_datadir}/glib-2.0/schemas/*.xml -%{_datadir}/pkgconfig/lomiri-schemas.pc -%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy -%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla - -%changelog -%autochangelog%global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas -%global commit fed68d63df86c0b39654b66c31e02be25018f5f1 -%forgemeta - -Name: lomiri-schemas -Version: 0.1.3 -Release: %autorelease -Summary: Configuration schemas for lomiri -License: LGPLv2+ -URL: https://gitlab.com/ubports/development/core/lomiri-schemas -Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz -BuildArch: noarch - -BuildRequires: cmake -BuildRequires: cmake-extras -BuildRequires: glib2-devel -BuildRequires: gettext -BuildRequires: intltool - -%description -Configuration schemas for lomiri desktop enviroment. - -%prep -%autosetup -n %{name}-%commit - -%build -%cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true -%cmake_build - -%install -%cmake_install - -%files -%{_datadir}/accountsservice/interfaces/*.xml -%{_datadir}/dbus-1/interfaces/*.xml -%{_datadir}/glib-2.0/schemas/*.xml -%{_datadir}/pkgconfig/lomiri-schemas.pc -%{_datadir}/polkit-1/actions/com.lomiri.AccountsService.policy -%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.AccountsService.pkla - %changelog %autochangelog From dba9ea97632a672e5e876b6e27a33dcbeedc07d7 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 24 Mar 2023 22:34:02 +0800 Subject: [PATCH 27/82] fix: lomiri-schema lomiri-url-dispatcher (#308) * fix: lomiri-url-dispatcher * fix: lomiri-schemas I have no idea what happened wwwww --- anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec | 3 ++- anda/lib/lomiri-url-dispatcher/update.rhai | 3 +++ anda/others/lomiri-schemas/lomiri-schemas.spec | 2 +- anda/others/lomiri-schemas/update.rhai | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 anda/lib/lomiri-url-dispatcher/update.rhai create mode 100644 anda/others/lomiri-schemas/update.rhai diff --git a/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec b/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec index 2499def02a..56f86e5dd1 100644 --- a/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec +++ b/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec @@ -3,7 +3,7 @@ %forgemeta Name: lomiri-url-dispatcher -Version: 0.1.0 +Version: 0.1.2 Release: %autorelease Summary: A small library for handling URLs over dbus @@ -26,6 +26,7 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(libapparmor) Requires: lomiri-ui-toolkit +ExclusiveArch: x86_64 %description Lomiri-url-dispatcher is a small handler to take URLs and do what is appropriate with them. diff --git a/anda/lib/lomiri-url-dispatcher/update.rhai b/anda/lib/lomiri-url-dispatcher/update.rhai new file mode 100644 index 0000000000..3b89df98ff --- /dev/null +++ b/anda/lib/lomiri-url-dispatcher/update.rhai @@ -0,0 +1,3 @@ +let o = get("https://gitlab.com/api/v4/projects/17424894/repository/tags").json_arr()[0]; +rpm.global("commit", o.commit.id); +rpm.version(o.name); diff --git a/anda/others/lomiri-schemas/lomiri-schemas.spec b/anda/others/lomiri-schemas/lomiri-schemas.spec index 0b9a1a0b43..af451d8630 100644 --- a/anda/others/lomiri-schemas/lomiri-schemas.spec +++ b/anda/others/lomiri-schemas/lomiri-schemas.spec @@ -8,7 +8,7 @@ Release: %autorelease Summary: Configuration schemas for lomiri License: LGPLv2+ URL: https://gitlab.com/ubports/development/core/lomiri-schemas -Source0: %{url}/-/archive/%commit/lomiri-schemas-%commit.tar.gz +Source0: %url/-/archive/%commit/lomiri-schemas-%commit.tar.gz BuildArch: noarch BuildRequires: cmake diff --git a/anda/others/lomiri-schemas/update.rhai b/anda/others/lomiri-schemas/update.rhai new file mode 100644 index 0000000000..c8714d2f23 --- /dev/null +++ b/anda/others/lomiri-schemas/update.rhai @@ -0,0 +1,3 @@ +let o = get("https://gitlab.com/api/v4/projects/30932494/repository/tags").json_arr()[0]; +rpm.global("commit", o.commit.id); +rpm.version(o.name); From 55b4e5026b2ee41cf97ea7372b21795d9c9467ad Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 24 Mar 2023 10:02:00 -0700 Subject: [PATCH 28/82] feat: add suru-icon-theme (#313) --- anda/themes/suru-icon-theme/anda.hcl | 5 +++ .../suru-icon-theme/suru-icon-theme.spec | 34 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 anda/themes/suru-icon-theme/anda.hcl create mode 100644 anda/themes/suru-icon-theme/suru-icon-theme.spec diff --git a/anda/themes/suru-icon-theme/anda.hcl b/anda/themes/suru-icon-theme/anda.hcl new file mode 100644 index 0000000000..59879c7e3f --- /dev/null +++ b/anda/themes/suru-icon-theme/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "suru-icon-theme.spec" + } +} diff --git a/anda/themes/suru-icon-theme/suru-icon-theme.spec b/anda/themes/suru-icon-theme/suru-icon-theme.spec new file mode 100644 index 0000000000..ce86b9b5d4 --- /dev/null +++ b/anda/themes/suru-icon-theme/suru-icon-theme.spec @@ -0,0 +1,34 @@ +%global forgeurl https://gitlab.com/ubports/development/core/suru-icon-theme +%global commit 2b832bd20443a45ea75d6da04236f687a5d0564a +%forgemeta + +Name: suru-icon-theme +Version: 20.05.1 +Release: %autorelease +Summary: Suru icon theme for Lomiri desktop +License: CC-BY-SA-3.0 +URL: https://gitlab.com/ubports/development/core/suru-icon-theme +Source0: %{url}/-/archive/%commit/suru-icon-theme-%commit.tar.gz +BuildArch: noarch + +Requires: hicolor-icon-theme + +%description +Suru is a icon theme for Lomiri desktop. + +%prep +%autosetup -n %{name}-%commit + +%build +true + +%install +mkdir -m 0755 -p %{buildroot}%{_datadir}/icons/suru +cp -r suru/* %{buildroot}%{_datadir}/icons/suru + +%files +%license COPYING +%{_datadir}/icons/suru/ + +%changelog +%autochangelog From bd09bb3e598bcdc01f9cd16a8865a8b218b46731 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 25 Mar 2023 08:48:48 +0800 Subject: [PATCH 29/82] feat(update): automatic update scripts (#309) The following packages now receive updates automatically: apparmor dbus-test-runner frame geis geoname glewmx grail lomiri-app-launcher lomiri-ui-toolkit nlohmann-json click gsettigs-ubuntu-touch-schemas unity-greeter Note that some specs are modified to: - fails when there is an update * now we know there's an update * doesn't make a version with the old sources (horrible) - fix source urls so that it works when the package is bumped automatically Some packages are also intentionally avoided because either it's too hard to implement autoupdate or it's a bad idea (such as properties-cpp-devel which doesn't really receive updates + there's a patch by cat-master21) --- anda/lib/apparmor/update.rhai | 3 +++ anda/lib/cmake-extras/update.rhai | 3 +-- anda/lib/dbus-test-runner/update.rhai | 3 +++ anda/lib/frame/frame.spec | 4 ++-- anda/lib/frame/update.rhai | 3 +++ anda/lib/geis/update.rhai | 3 +++ anda/lib/geonames/update.rhai | 3 +++ anda/lib/glewmx/update.rhai | 3 +++ anda/lib/grail/grail.spec | 2 +- anda/lib/grail/update.rhai | 3 +++ anda/lib/lomiri-app-launch/update.rhai | 3 +++ anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec | 2 +- anda/lib/lomiri-ui-toolkit/update.rhai | 3 +++ anda/lib/nlohmann-json/update.rhai | 1 + anda/others/click/update.rhai | 3 +++ anda/others/gsettings-ubuntu-touch-schemas/update.rhai | 3 +++ anda/others/unity-greeter/unity-greeter.spec | 2 +- anda/others/unity-greeter/update.rhai | 3 +++ 18 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 anda/lib/apparmor/update.rhai create mode 100644 anda/lib/dbus-test-runner/update.rhai create mode 100644 anda/lib/frame/update.rhai create mode 100644 anda/lib/geis/update.rhai create mode 100644 anda/lib/geonames/update.rhai create mode 100644 anda/lib/glewmx/update.rhai create mode 100644 anda/lib/grail/update.rhai create mode 100644 anda/lib/lomiri-app-launch/update.rhai create mode 100644 anda/lib/lomiri-ui-toolkit/update.rhai create mode 100644 anda/lib/nlohmann-json/update.rhai create mode 100644 anda/others/click/update.rhai create mode 100644 anda/others/gsettings-ubuntu-touch-schemas/update.rhai create mode 100644 anda/others/unity-greeter/update.rhai diff --git a/anda/lib/apparmor/update.rhai b/anda/lib/apparmor/update.rhai new file mode 100644 index 0000000000..512ca1ccd4 --- /dev/null +++ b/anda/lib/apparmor/update.rhai @@ -0,0 +1,3 @@ +let html = get("https://launchpad.net/apparmor"); +let v = find("Latest version is ([\d.]+)", html, 1); +rpm.version(v); diff --git a/anda/lib/cmake-extras/update.rhai b/anda/lib/cmake-extras/update.rhai index f4ac61854e..798f5b1a8f 100644 --- a/anda/lib/cmake-extras/update.rhai +++ b/anda/lib/cmake-extras/update.rhai @@ -1,3 +1,2 @@ let txt = get("https://gitlab.com/api/v4/projects/17117115/repository/tags"); -let ver = txt.json_arr()[0].name; -rpm.version(ver); +rpm.version(txt.json_arr()[0].name); diff --git a/anda/lib/dbus-test-runner/update.rhai b/anda/lib/dbus-test-runner/update.rhai new file mode 100644 index 0000000000..c6ea640640 --- /dev/null +++ b/anda/lib/dbus-test-runner/update.rhai @@ -0,0 +1,3 @@ +let html = get("https://launchpad.net/dbus-test-runner"); +let v = find("Latest version is ([\d.]+)", html, 1); +rpm.version(v); diff --git a/anda/lib/frame/frame.spec b/anda/lib/frame/frame.spec index fa14e246be..50d6288233 100644 --- a/anda/lib/frame/frame.spec +++ b/anda/lib/frame/frame.spec @@ -5,8 +5,8 @@ Summary: Touch Frame Library License: GPLv3 AND LGPLv3 URL: https://launchpad.net/frame -Source0: http://archive.ubuntu.com/ubuntu/pool/universe/f/frame/frame_2.5.0daily13.06.05+16.10.20160809.orig.tar.gz -Patch0: http://archive.ubuntu.com/ubuntu/pool/universe/f/frame/frame_2.5.0daily13.06.05+16.10.20160809-0ubuntu3.diff.gz +Source0: http://archive.ubuntu.com/ubuntu/pool/universe/f/frame/frame_%{version}daily13.06.05+16.10.20160809.orig.tar.gz +Patch0: http://archive.ubuntu.com/ubuntu/pool/universe/f/frame/frame_%{version}daily13.06.05+16.10.20160809-0ubuntu3.diff.gz BuildRequires: automake libtool gnome-common BuildRequires: intltool diff --git a/anda/lib/frame/update.rhai b/anda/lib/frame/update.rhai new file mode 100644 index 0000000000..f168e2759b --- /dev/null +++ b/anda/lib/frame/update.rhai @@ -0,0 +1,3 @@ +let html = get("https://launchpad.net/frame"); +let v = find("Latest version is v([\d.]+)", html, 1); +rpm.version(v); diff --git a/anda/lib/geis/update.rhai b/anda/lib/geis/update.rhai new file mode 100644 index 0000000000..88f1020fd8 --- /dev/null +++ b/anda/lib/geis/update.rhai @@ -0,0 +1,3 @@ +let html = get("https://launchpad.net/geis"); +let v = find("Latest version is ([\d.]+)", html, 1); +rpm.version(v); diff --git a/anda/lib/geonames/update.rhai b/anda/lib/geonames/update.rhai new file mode 100644 index 0000000000..91e7ab6bf1 --- /dev/null +++ b/anda/lib/geonames/update.rhai @@ -0,0 +1,3 @@ +let o = get("https://gitlab.com/api/v4/projects/34230948/repository/tags").json_arr()[0]; +rpm.global("commit", o.commit.id); +rpm.version(o.name); diff --git a/anda/lib/glewmx/update.rhai b/anda/lib/glewmx/update.rhai new file mode 100644 index 0000000000..6ea5197ee3 --- /dev/null +++ b/anda/lib/glewmx/update.rhai @@ -0,0 +1,3 @@ +let html = get("http://archive.ubuntu.com/ubuntu/pool/universe/g/glewmx/?C=N;O=D"); +let v = find("glewmx_([\\d.+]+).", html, 1); +rpm.version(v); diff --git a/anda/lib/grail/grail.spec b/anda/lib/grail/grail.spec index 128d1e2198..7459010614 100644 --- a/anda/lib/grail/grail.spec +++ b/anda/lib/grail/grail.spec @@ -5,7 +5,7 @@ Summary: Gesture Recognition And Instantiation Library License: GPLv3 AND LGPLv3 URL: https://launchpad.net/grail -Source0: http://archive.ubuntu.com/ubuntu/pool/universe/g/grail/grail_3.1.1.orig.tar.bz2 +Source0: http://archive.ubuntu.com/ubuntu/pool/universe/g/grail/grail_%{version}.orig.tar.bz2 BuildRequires: automake libtool gnome-common BuildRequires: intltool diff --git a/anda/lib/grail/update.rhai b/anda/lib/grail/update.rhai new file mode 100644 index 0000000000..cfb52f46d2 --- /dev/null +++ b/anda/lib/grail/update.rhai @@ -0,0 +1,3 @@ +let html = get("https://launchpad.net/grail"); +let v = find("Latest version is ([\d.]+)", html, 1); +rpm.version(v); diff --git a/anda/lib/lomiri-app-launch/update.rhai b/anda/lib/lomiri-app-launch/update.rhai new file mode 100644 index 0000000000..4bef084cc0 --- /dev/null +++ b/anda/lib/lomiri-app-launch/update.rhai @@ -0,0 +1,3 @@ +let o = get("https://gitlab.com/api/v4/projects/17286402/repository/tags").json_arr()[0]; +rpm.global("commit", o.commit.id); +rpm.version(o.name); diff --git a/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec b/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec index d8aff6c3de..a6dfd7e0ae 100644 --- a/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec +++ b/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec @@ -20,7 +20,7 @@ BuildRequires: gcc BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(dbus-1) BuildRequires: libXi-devel -Buildrequires: lttng-ust-devel +BuildRequires: lttng-ust-devel BuildRequires: qt5-doctools BuildRequires: qt5-rpm-macros BuildRequires: qt5-qtdeclarative diff --git a/anda/lib/lomiri-ui-toolkit/update.rhai b/anda/lib/lomiri-ui-toolkit/update.rhai new file mode 100644 index 0000000000..5c7d73e15f --- /dev/null +++ b/anda/lib/lomiri-ui-toolkit/update.rhai @@ -0,0 +1,3 @@ +let o = get("https://gitlab.com/api/v4/projects/19057685/repository/tags").json_arr()[0]; +rpm.global("commit", o.commit.id); +rpm.version(o.name); diff --git a/anda/lib/nlohmann-json/update.rhai b/anda/lib/nlohmann-json/update.rhai new file mode 100644 index 0000000000..3357c0919d --- /dev/null +++ b/anda/lib/nlohmann-json/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("nlohmann/json")); diff --git a/anda/others/click/update.rhai b/anda/others/click/update.rhai new file mode 100644 index 0000000000..4fdddac26c --- /dev/null +++ b/anda/others/click/update.rhai @@ -0,0 +1,3 @@ +let o = get("https://gitlab.com/api/v4/projects/25034025/repository/tags").json_arr()[0]; +rpm.global("commit", o.commit.id); +rpm.version(o.name); diff --git a/anda/others/gsettings-ubuntu-touch-schemas/update.rhai b/anda/others/gsettings-ubuntu-touch-schemas/update.rhai new file mode 100644 index 0000000000..92c49cc7ba --- /dev/null +++ b/anda/others/gsettings-ubuntu-touch-schemas/update.rhai @@ -0,0 +1,3 @@ +let html = get("https://bazaar.launchpad.net/~system-settings-touch/gsettings-ubuntu-touch-schemas/trunk/changes"); +let v = find("([.\\d+]+)-0ubuntu1", html, 1); +rpm.version(v); diff --git a/anda/others/unity-greeter/unity-greeter.spec b/anda/others/unity-greeter/unity-greeter.spec index ae999ffb92..c206e7fc0c 100644 --- a/anda/others/unity-greeter/unity-greeter.spec +++ b/anda/others/unity-greeter/unity-greeter.spec @@ -5,7 +5,7 @@ Summary: Unity Greeter for Lightdm License: GPLv3 URL: https://launchpad.net/unity-greeter -Source0: http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-greeter/unity-greeter_22.04.1-0ubuntu2.tar.xz +Source0: http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-greeter/unity-greeter_%{version}-0ubuntu2.tar.xz Patch1: 0001-Remove-libido.patch BuildRequires: automake libtool gnome-common diff --git a/anda/others/unity-greeter/update.rhai b/anda/others/unity-greeter/update.rhai new file mode 100644 index 0000000000..c056f96829 --- /dev/null +++ b/anda/others/unity-greeter/update.rhai @@ -0,0 +1,3 @@ +let html = get("http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-greeter/?C=N;O=D"); +let v = find("unity-greeter_([\\d.+]+)-0ubuntu2", html, 1); +rpm.version(v); From e94a284319308b4adfd1d16b172418577a4c8800 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 24 Mar 2023 20:41:11 -0700 Subject: [PATCH 30/82] add: qtdbusmock (#319) --- anda/lib/qtdbusmock/anda.hcl | 5 +++ anda/lib/qtdbusmock/qtdbusmock.spec | 57 +++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 anda/lib/qtdbusmock/anda.hcl create mode 100644 anda/lib/qtdbusmock/qtdbusmock.spec diff --git a/anda/lib/qtdbusmock/anda.hcl b/anda/lib/qtdbusmock/anda.hcl new file mode 100644 index 0000000000..56d3666a9d --- /dev/null +++ b/anda/lib/qtdbusmock/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "qtdbusmock.spec" + } +} diff --git a/anda/lib/qtdbusmock/qtdbusmock.spec b/anda/lib/qtdbusmock/qtdbusmock.spec new file mode 100644 index 0000000000..cddb98b2d8 --- /dev/null +++ b/anda/lib/qtdbusmock/qtdbusmock.spec @@ -0,0 +1,57 @@ +%global forgeurl https://gitlab.com/ubports/development/core/libqtdbusmock +%global commit e875ddd9b79d87bffe6b10047e592b304bd62a47 +%forgemeta + +Name: qtdbusmock +Version: 0.9.0 +Release: %autorelease +Summary: Library for mocking DBus interactions using Qt +License: LGPLv3 +URL: https://gitlab.com/ubports/development/core/libqtdbusmock +Source0: %{url}/-/archive/%commit/libqtdbusmock-%commit.tar.gz + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(libqtdbustest-1) +BuildRequires: pkgconfig(libnm) +BuildRequires: pkgconfig(gmock) +BuildRequires: pkgconfig(gtest) + +%description +A simple library for mocking DBus services with a Qt API. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%autosetup -n libqtdbusmock-%commit + +%build +%cmake +%cmake_build + +%install +%cmake_install + +%files +%license COPYING +%{_libdir}/libqtdbusmock.so.* +%dir %{_datadir}/libqtdbusmock +%dir %{_datadir}/libqtdbusmock/templates +%{_datadir}/libqtdbusmock/templates/*.py + +%files devel +%dir %{_includedir}/libqtdbusmock-1 +%dir %{_includedir}/libqtdbusmock-1/libqtdbusmock +%{_includedir}/libqtdbusmock-1/libqtdbusmock/*.h +%{_libdir}/libqtdbusmock.so +%{_libdir}/pkgconfig/libqtdbusmock-1.pc + +%changelog +%autochangelog From 5afc0909a1ef6045f718da43ca314e7c31e6d0a5 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 24 Mar 2023 22:24:52 -0700 Subject: [PATCH 31/82] upd(qt5-qtdbustest): `0.2` -> `0.3` (#318) * upd(qt5-qtdbustest): 0.2 -> 0.3 Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> * chore: use %version instead of %commit Co-authored-by: madomado Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --------- Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> Co-authored-by: madomado --- anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec b/anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec index a1b9a919cc..351ee2d687 100644 --- a/anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec +++ b/anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec @@ -1,11 +1,14 @@ +%global forgeurl https://gitlab.com/ubports/development/core/libqtdbustest +%global commit f204bb8d7e9a2ffcd159d2f51f47257a715bbd62 +%forgemeta + Name: qt5-qtdbustest -Version: 0.2+bzr42 +Version: 0.3.0 Release: %autorelease Summary: Library for testing DBus interactions using Qt5 License: LGPLv3 -URL: https://launchpad.net/libqtdbustest -Source0: http://deb.debian.org/debian/pool/main/libq/libqtdbustest/libqtdbustest_0.2+bzr42+repack1.orig.tar.xz -Source1: https://salsa.debian.org/debian-ayatana-team/libqtdbustest/-/archive/master/libqtdbustest-master.tar.gz +URL: https://gitlab.com/ubports/development/core/libqtdbustest +Source0: %url/-/archive/%version/qtdbustest-%version.tar.gz BuildRequires: cmake BuildRequires: cmake-extras @@ -29,10 +32,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} developing applications that use %{name}. %prep -%autosetup -n libqtdbustest-%{version} -# Apply fixes -tar -xf '%{SOURCE1}' -for i in $(cat libqtdbustest-master/debian/patches/series); do patch -p1 < libqtdbustest-master/debian/patches/$i; done +%autosetup -n libqtdbustest-%version %build %cmake @@ -51,7 +51,6 @@ for i in $(cat libqtdbustest-master/debian/patches/series); do patch -p1 < libqt %{_datadir}/libqtdbustest/*.conf %files devel -%license COPYING %dir %{_includedir}/libqtdbustest-1 %dir %{_includedir}/libqtdbustest-1/libqtdbustest %{_includedir}/libqtdbustest-1/libqtdbustest/*.h From 7d6883c0b6458b470e54e3149c42e223a9c27962 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 24 Mar 2023 22:43:47 -0700 Subject: [PATCH 32/82] feat: add gsettings-qt (#314) * feat: add gsettings-qt * chore: downgrade to the correct version Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --------- Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/gsettings-qt/anda.hcl | 5 ++ anda/lib/gsettings-qt/gsettings-qt.spec | 63 +++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 anda/lib/gsettings-qt/anda.hcl create mode 100644 anda/lib/gsettings-qt/gsettings-qt.spec diff --git a/anda/lib/gsettings-qt/anda.hcl b/anda/lib/gsettings-qt/anda.hcl new file mode 100644 index 0000000000..2664b47b45 --- /dev/null +++ b/anda/lib/gsettings-qt/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "gsettings-qt.spec" + } +} diff --git a/anda/lib/gsettings-qt/gsettings-qt.spec b/anda/lib/gsettings-qt/gsettings-qt.spec new file mode 100644 index 0000000000..8c6f49f11b --- /dev/null +++ b/anda/lib/gsettings-qt/gsettings-qt.spec @@ -0,0 +1,63 @@ +%global forgeurl https://gitlab.com/ubports/development/core/gsettings-qt +%global commit d5e002d7e0bce46c315bcc99a44a8bd51f49f488 +%forgemeta + +Name: gsettings-qt +Version: 0.2 +Release: %autorelease +Summary: QML Bindings for GSettings +License: LGPLv3 +URL: https://gitlab.com/ubports/development/core/gsettings-qt +Source0: %{url}/-/archive/%commit/gsettings-qt-%commit.tar.gz + +BuildRequires: gcc-c++ +BuildRequires: glib2-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtdeclarative +BuildRequires: qt5-qtdeclarative-devel + +%description +gsettings-qt provides Qt binding to GSettings, a high-level API +for application settings. This library can be used to access GSettings from Qt +applications. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%autosetup -n gsettings-qt-%commit + +%build +%qmake_qt5 + +%make_build + +%install +%make_install INSTALL_ROOT=%{buildroot} +# Files underneath are part of coreutils and cpptest packages +rm -rf %{buildroot}/usr/tests + +%files +%license COPYING +%{_libdir}/libgsettings-qt.so.1 +%{_libdir}/libgsettings-qt.so.1.0 +%{_libdir}/libgsettings-qt.so.1.0.0 +%dir %{_libdir}/qt5/qml/GSettings.1.0 +%{_libdir}/qt5/qml/GSettings.1.0/libGSettingsQmlPlugin.so +%{_libdir}/qt5/qml/GSettings.1.0/plugins.qmltypes +%{_libdir}/qt5/qml/GSettings.1.0/qmldir + +%files devel +%dir %{_includedir}/qt5/QGSettings +%{_includedir}/qt5/QGSettings/QGSettings +%{_includedir}/qt5/QGSettings/qgsettings.h +%{_libdir}/libgsettings-qt.so +%{_libdir}/pkgconfig/gsettings-qt.pc + +%changelog +%autochangelog From 27d8c43333e9668afa2c0984b7022f053a9d1d30 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 24 Mar 2023 23:08:42 -0700 Subject: [PATCH 33/82] feat: add process-cpp (#315) * feat: add process-cpp * chore: downgrade process-cpp to correct version Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --------- Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/process-cpp/anda.hcl | 5 ++ anda/lib/process-cpp/process-cpp.spec | 84 +++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 anda/lib/process-cpp/anda.hcl create mode 100644 anda/lib/process-cpp/process-cpp.spec diff --git a/anda/lib/process-cpp/anda.hcl b/anda/lib/process-cpp/anda.hcl new file mode 100644 index 0000000000..f34474214d --- /dev/null +++ b/anda/lib/process-cpp/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "process-cpp.spec" + } +} diff --git a/anda/lib/process-cpp/process-cpp.spec b/anda/lib/process-cpp/process-cpp.spec new file mode 100644 index 0000000000..8c15d5ba9b --- /dev/null +++ b/anda/lib/process-cpp/process-cpp.spec @@ -0,0 +1,84 @@ +%global forgeurl https://gitlab.com/ubports/development/core/lib-cpp/process-cpp +%global commit ee6d99a3278343f5fdcec7ed3dad38763e257310 +%forgemeta + +Name: process-cpp +Version: 3.0.1 +Release: %autorelease +Summary: A simple convenience library for handling processes in C++ + +License: LGPLv3+ +URL: https://gitlab.com/ubports/development/core/lib-cpp/process-cpp +Source0: %{url}/-/archive/%commit/process-cpp-%commit.tar.gz +Patch0: https://sources.debian.org/data/main/p/process-cpp/3.0.1-9/debian/patches/2001-Don-t-run-tests.patch +Patch1: https://sources.debian.org/data/main/p/process-cpp/3.0.1-9/debian/patches/1002-Reproducible-documentation.patch +Patch3: https://sources.debian.org/data/main/p/process-cpp/3.0.1-9/debian/patches/1004-spelling-fixes.patch + +BuildRequires: boost-devel +BuildRequires: cmake +BuildRequires: pkgconfig +BuildRequires: g++ +BuildRequires: gcc +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(properties-cpp) +#BuildRequires: pkgconfig(Backtrace) +BuildRequires: doxygen + +%description +A simple convenience library for handling processes in C++11. + +%package devel +Summary: process-cpp development files +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package contains development files for process-cpp. + +%package doc +Summary: process-cpp documentation files +BuildArch: noarch + +%description doc +This package contains documentation files for process-cpp. + +%prep +%autosetup -n process-cpp-%commit -p1 + +%build +sed -i '/find_package(PkgConfig REQUIRED)/a set(THREADS_PREFER_PTHREAD_FLAG ON)' CMakeLists.txt +%cmake -DPROCESS_CPP_WERROR=OFF + +%cmake_build + +%install +%cmake_install + +%files +%license COPYING +%{_libdir}/libprocess-cpp.so.* + +%files devel +%{_libdir}/libprocess-cpp.so +%{_libdir}/pkgconfig/process-cpp.pc +%dir %{_includedir}/core/testing +%{_includedir}/core/testing/*.h +%dir %{_includedir}/core/posix +%{_includedir}/core/posix/*.h +%dir %{_includedir}/core/posix/linux +%dir %{_includedir}/core/posix/linux/proc +%dir %{_includedir}/core/posix/linux/proc/process +%{_includedir}/core/posix/linux/proc/process/*.h + +%files doc +%dir %{_docdir}/process-cpp +%dir %{_docdir}/process-cpp/html +%{_docdir}/process-cpp/html/*.html +%{_docdir}/process-cpp/html/*.map +%{_docdir}/process-cpp/html/*.css +%{_docdir}/process-cpp/html/*.png +%{_docdir}/process-cpp/html/*.js +%{_docdir}/process-cpp/html/*.md5 +%{_docdir}/process-cpp/html/*.svg + +%changelog +%autochangelog From 6b84f2bd2e0d38e3c9c0b0a585e90c4c5cb4acc2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 25 Mar 2023 06:43:55 +0000 Subject: [PATCH 34/82] bump: elementary-theme glewmx lomiri-ui-toolkit lomiri-url-dispatcher moby-compose click --- .../elementary/elementary-theme/elementary-theme.spec | 4 ++-- anda/lib/glewmx/glewmx.spec | 4 ++-- anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec | 2 +- anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec | 2 +- anda/moby-extras/moby-compose/moby-compose.spec | 2 +- anda/others/click/click.spec | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anda/desktops/elementary/elementary-theme/elementary-theme.spec b/anda/desktops/elementary/elementary-theme/elementary-theme.spec index 253d450cf1..7637dacc54 100644 --- a/anda/desktops/elementary/elementary-theme/elementary-theme.spec +++ b/anda/desktops/elementary/elementary-theme/elementary-theme.spec @@ -3,8 +3,8 @@ Name: elementary-theme Summary: elementary GTK+ Stylesheet -Version: 7.0.1 -Release: %autorelease +Version: 7.1.0 +Release: 1%{?dist} License: GPLv3 URL: https://github.com/elementary/stylesheet diff --git a/anda/lib/glewmx/glewmx.spec b/anda/lib/glewmx/glewmx.spec index 8104b89127..cc7a98f140 100644 --- a/anda/lib/glewmx/glewmx.spec +++ b/anda/lib/glewmx/glewmx.spec @@ -2,8 +2,8 @@ %global debug_package %{nil} Name: glewmx -Version: 1.13.0 -Release: %autorelease +Version: 1.13.0. +Release: 1%{?dist} Summary: OpenGL Extension Wrangler MX License: GPLv3+ diff --git a/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec b/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec index a6dfd7e0ae..955e74b5f0 100644 --- a/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec +++ b/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit -%global commit 57b9c01a64b06ee57a0c73657e5a61f369911954 +%global commit b996aa8e9d5add6e9d55f9a44a9fafc548d819c1 %forgemeta Name: lomiri-ui-toolkit diff --git a/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec b/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec index 56f86e5dd1..8522a9ba91 100644 --- a/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec +++ b/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-url-dispatcher -%global commit 6164af4dac5ed8f166429c9476831997a470f58a +%global commit 0f6518439bdec30816feb0ede9d52080f50d1425 %forgemeta Name: lomiri-url-dispatcher diff --git a/anda/moby-extras/moby-compose/moby-compose.spec b/anda/moby-extras/moby-compose/moby-compose.spec index ea23bc6ee0..63fcb548ef 100644 --- a/anda/moby-extras/moby-compose/moby-compose.spec +++ b/anda/moby-extras/moby-compose/moby-compose.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: moby-compose -Version: 2.17.0 +Version: 2.17.1 Release: 1%{?dist} Summary: Define and run multi-container applications with Docker diff --git a/anda/others/click/click.spec b/anda/others/click/click.spec index 6b620018c1..433ba79ff0 100644 --- a/anda/others/click/click.spec +++ b/anda/others/click/click.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/click -%global commit 5cb9cd655453bb158fc49e5501c98fe4170b25a8 +%global commit ff697fae4259e7b0f4bef27e3817f848bc06233a %forgemeta Name: click From 224c49da55e535bbe864ccaacf8707b7a55e9a7e Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 25 Mar 2023 15:08:20 +0800 Subject: [PATCH 35/82] add: xdg-desktop-portal-pantheon (#317) * add: xdg-desktop-portal-pantheon * fix * a * dunno * a * fix * dk1 * a * Update xdg-desktop-portal-pantheon.spec Signed-off-by: madomado * Update xdg-desktop-portal-pantheon.spec Signed-off-by: madomado * Update xdg-desktop-portal-pantheon.spec Signed-off-by: madomado --------- Signed-off-by: madomado --- .../xdg-desktop-portal-pantheon/anda.hcl | 5 +++ .../xdg-desktop-portal-pantheon/update.rhai | 1 + .../xdg-desktop-portal-pantheon.spec | 42 +++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 anda/desktops/elementary/xdg-desktop-portal-pantheon/anda.hcl create mode 100644 anda/desktops/elementary/xdg-desktop-portal-pantheon/update.rhai create mode 100644 anda/desktops/elementary/xdg-desktop-portal-pantheon/xdg-desktop-portal-pantheon.spec diff --git a/anda/desktops/elementary/xdg-desktop-portal-pantheon/anda.hcl b/anda/desktops/elementary/xdg-desktop-portal-pantheon/anda.hcl new file mode 100644 index 0000000000..e88d875a87 --- /dev/null +++ b/anda/desktops/elementary/xdg-desktop-portal-pantheon/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "xdg-desktop-portal-pantheon.spec" + } +} diff --git a/anda/desktops/elementary/xdg-desktop-portal-pantheon/update.rhai b/anda/desktops/elementary/xdg-desktop-portal-pantheon/update.rhai new file mode 100644 index 0000000000..57450f2010 --- /dev/null +++ b/anda/desktops/elementary/xdg-desktop-portal-pantheon/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("elementary/portals")); diff --git a/anda/desktops/elementary/xdg-desktop-portal-pantheon/xdg-desktop-portal-pantheon.spec b/anda/desktops/elementary/xdg-desktop-portal-pantheon/xdg-desktop-portal-pantheon.spec new file mode 100644 index 0000000000..024bfd6146 --- /dev/null +++ b/anda/desktops/elementary/xdg-desktop-portal-pantheon/xdg-desktop-portal-pantheon.spec @@ -0,0 +1,42 @@ +%define debug_package %{nil} + +Name: xdg-desktop-portal-pantheon +Version: 7.0.0 +Release: %?dist +Summary: Pantheon XDG Desktop Portals +License: GPL-3.0 +URL: https://github.com/elementary/portals +Source0: %url/archive/refs/tags/%version.tar.gz +Requires: gtk4 glib2 granite-7 libX11 +BuildRequires: ninja-build vala meson glib2-devel pkgconfig(granite-7) gtk4-devel pkgconfig(x11) pkgconfig(systemd) + +%description +Backend implementation for xdg-desktop-portal for the Pantheon desktop environment + +%prep +%autosetup -n portals-%version + +%build +%meson --prefix=/usr +%meson_build + +%install +%meson_install + +%check +%meson_test + + +%files +%doc README.md +%license COPYING +/usr/share/xdg-desktop-portal/portals/pantheon.portal +/usr/share/dbus-1/services/org.freedesktop.impl.portal.desktop.pantheon.service +/usr/lib/systemd/user/xdg-desktop-portal-pantheon.service +/usr/libexec/xdg-desktop-portal-pantheon +/usr/share/metainfo/io.elementary.portals.metainfo.xml +/usr/share/locale/*/LC_MESSAGES/xdg-desktop-portal-pantheon.mo + +%changelog +* Sat Mar 25 2023 windowsboy111 +- Initial package From fc02d05d0bb2391b42635dd077a9732801dfead0 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 25 Mar 2023 16:43:04 +0800 Subject: [PATCH 36/82] fix: bat-extras (#307) --- anda/rust/bat-extras/bat-extras.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/rust/bat-extras/bat-extras.spec b/anda/rust/bat-extras/bat-extras.spec index e99e57e298..077691e149 100644 --- a/anda/rust/bat-extras/bat-extras.spec +++ b/anda/rust/bat-extras/bat-extras.spec @@ -7,7 +7,7 @@ Summary: Bash scripts that integrate bat with various command line tools License: MIT URL: https://github.com/eth-p/bat-extras -Source0: https://github.com/eth-p/bat-extras/archive/refs/tags/v2022.07.27.tar.gz +Source0: https://github.com/eth-p/bat-extras/archive/refs/tags/v%{version}.tar.gz BuildRequires: bash Requires: bash From c54e408e7f8ceb05efe8bd0277f156a9b27575ca Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 26 Mar 2023 07:58:59 +0800 Subject: [PATCH 37/82] fix(ci): sync (#320) --- .github/workflows/sync.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index ec47db5e55..f92139e0be 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -8,19 +8,19 @@ on: jobs: sync: - if: github.event.pull_request.merged == true + if: github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'nosync') runs-on: ubuntu-latest steps: - - name: Install SSH key - run: | - mkdir -p ${{ runner.temp }} - echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key - chmod 0700 ${{ runner.temp }}/signing_key - name: Checkout uses: actions/checkout@v3 with: fetch-depth: 0 ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }} + - name: Install SSH key + run: | + mkdir -p ${{ runner.temp }} + echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key + chmod 0700 ${{ runner.temp }}/signing_key - name: Setup Git run: | git config --global --add safe.directory "$GITHUB_WORKSPACE" @@ -29,11 +29,10 @@ jobs: git config gpg.format "ssh" git config user.signingkey "${{ runner.temp }}/signing_key" - name: Download patches - run: | - curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch + run: curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch - name: Apply patches run: | git checkout f38 - git am --keep-cr --signoff < pr.patch + git am -S --keep-cr --signoff < pr.patch - name: Push - run: git push origin -u --all + run: git push -u origin --all From bcaf72e5d5f4ea6a37f5b72efdf5e0a2842af8a6 Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 26 Mar 2023 07:59:30 +0800 Subject: [PATCH 38/82] fix(files): libappimageupdate (#322) Some files that was included may cause file conflicts with other packages. They have been excluded. Fixes #316 --- anda/lib/libappimageupdate/libappimageupdate.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/anda/lib/libappimageupdate/libappimageupdate.spec b/anda/lib/libappimageupdate/libappimageupdate.spec index 1487a335a6..a52dda5fe8 100644 --- a/anda/lib/libappimageupdate/libappimageupdate.spec +++ b/anda/lib/libappimageupdate/libappimageupdate.spec @@ -10,7 +10,7 @@ Name: libappimageupdate Version: %{libver_format} -Release: 1%{?dist} +Release: 2%{?dist} Summary: AppImageUpdate lets you update AppImages in a decentral way using information embedded in the AppImage itself. License: MIT @@ -76,10 +76,11 @@ git submodule update --init --recursive %exclude %{_bindir}/zsyncmake2 %files devel -%{_includedir}/* +%{_includedir}/{appimage,cpr,zs*.h} +%exclude %{_includedir}/z{conf,lib}.h +%exclude %{_includedir}/curl/ %{_prefix}/lib/cmake/AppImageUpdate/ /usr/lib/debug/usr/bin/zsync*.debug -/usr/lib/debug/usr/bin/zsyncmake*.debug /usr/lib64/cmake/CURL/CURLConfig.cmake /usr/lib64/cmake/CURL/CURLConfigVersion.cmake /usr/lib64/cmake/CURL/CURLTargets-debug.cmake @@ -89,8 +90,8 @@ git submodule update --init --recursive /usr/lib64/cmake/zsync2/zsync2Targets-debug.cmake /usr/lib64/cmake/zsync2/zsync2Targets.cmake /usr/lib64/pkgconfig/args.pc -/usr/lib64/pkgconfig/libcurl.pc -/usr/lib64/pkgconfig/zlib.pc +%exclude /usr/lib64/pkgconfig/libcurl.pc +%exclude /usr/lib64/pkgconfig/zlib.pc %changelog * Tue Oct 25 2022 Cappy Ishihara From 2123308a55a1fb113aca4ad88d565b4432776ec2 Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 26 Mar 2023 07:59:48 +0800 Subject: [PATCH 39/82] fix(update): apparmor dbus-test-runner frame geis grail libappimage (#321) --- anda/lib/apparmor/update.rhai | 2 +- anda/lib/dbus-test-runner/update.rhai | 2 +- anda/lib/frame/update.rhai | 2 +- anda/lib/geis/update.rhai | 2 +- anda/lib/grail/update.rhai | 2 +- anda/lib/libappimage/update.rhai | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/lib/apparmor/update.rhai b/anda/lib/apparmor/update.rhai index 512ca1ccd4..7cc467baa3 100644 --- a/anda/lib/apparmor/update.rhai +++ b/anda/lib/apparmor/update.rhai @@ -1,3 +1,3 @@ let html = get("https://launchpad.net/apparmor"); -let v = find("Latest version is ([\d.]+)", html, 1); +let v = find("Latest version is ([\\d.]+)", html, 1); rpm.version(v); diff --git a/anda/lib/dbus-test-runner/update.rhai b/anda/lib/dbus-test-runner/update.rhai index c6ea640640..c63475cd29 100644 --- a/anda/lib/dbus-test-runner/update.rhai +++ b/anda/lib/dbus-test-runner/update.rhai @@ -1,3 +1,3 @@ let html = get("https://launchpad.net/dbus-test-runner"); -let v = find("Latest version is ([\d.]+)", html, 1); +let v = find("Latest version is ([\\d.]+)", html, 1); rpm.version(v); diff --git a/anda/lib/frame/update.rhai b/anda/lib/frame/update.rhai index f168e2759b..a7804556e6 100644 --- a/anda/lib/frame/update.rhai +++ b/anda/lib/frame/update.rhai @@ -1,3 +1,3 @@ let html = get("https://launchpad.net/frame"); -let v = find("Latest version is v([\d.]+)", html, 1); +let v = find("Latest version is v([\\d.]+)", html, 1); rpm.version(v); diff --git a/anda/lib/geis/update.rhai b/anda/lib/geis/update.rhai index 88f1020fd8..4751b18122 100644 --- a/anda/lib/geis/update.rhai +++ b/anda/lib/geis/update.rhai @@ -1,3 +1,3 @@ let html = get("https://launchpad.net/geis"); -let v = find("Latest version is ([\d.]+)", html, 1); +let v = find("Latest version is ([\\d.]+)", html, 1); rpm.version(v); diff --git a/anda/lib/grail/update.rhai b/anda/lib/grail/update.rhai index cfb52f46d2..9f97e65cee 100644 --- a/anda/lib/grail/update.rhai +++ b/anda/lib/grail/update.rhai @@ -1,3 +1,3 @@ let html = get("https://launchpad.net/grail"); -let v = find("Latest version is ([\d.]+)", html, 1); +let v = find("Latest version is ([\\d.]+)", html, 1); rpm.version(v); diff --git a/anda/lib/libappimage/update.rhai b/anda/lib/libappimage/update.rhai index 0199954768..b9c5307863 100644 --- a/anda/lib/libappimage/update.rhai +++ b/anda/lib/libappimage/update.rhai @@ -1,2 +1,2 @@ -let v = gh("AppImageCommunity/libappimage"); +let v = gh_tag("AppImageCommunity/libappimage"); rpm.global("libver", v); From 423d8a222b1871a6650edf0918da4fd299e0e676 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sat, 25 Mar 2023 17:05:59 -0700 Subject: [PATCH 40/82] Feat: add lomiri-sounds (#324) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/others/lomiri-sounds/anda.hcl | 5 +++ anda/others/lomiri-sounds/lomiri-sounds.spec | 39 ++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 anda/others/lomiri-sounds/anda.hcl create mode 100644 anda/others/lomiri-sounds/lomiri-sounds.spec diff --git a/anda/others/lomiri-sounds/anda.hcl b/anda/others/lomiri-sounds/anda.hcl new file mode 100644 index 0000000000..98f3dc911f --- /dev/null +++ b/anda/others/lomiri-sounds/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "lomiri-sounds.spec" + } +} diff --git a/anda/others/lomiri-sounds/lomiri-sounds.spec b/anda/others/lomiri-sounds/lomiri-sounds.spec new file mode 100644 index 0000000000..5508db28ab --- /dev/null +++ b/anda/others/lomiri-sounds/lomiri-sounds.spec @@ -0,0 +1,39 @@ +%global forgeurl https://gitlab.com/ubports/development/core/lomiri-sounds +%global commit 4e71c32b2181ae00feb09818c304a7e8e4574fed +%forgemeta + +Name: lomiri-sounds +Summary: Ring-tones and notification tones included with Ubuntu Touch +Version: 22.02 +Release: %autorelease +License: CC-BY-SA-3.0 +URL: https://gitlab.com/ubports/development/core/lomiri-sounds +Source0: %{url}/-/archive/%commit/lomiri-sounds-%commit.tar.gz +BuildArch: noarch + +BuildRequires: cmake +BuildRequires: gcc +BuildRequires: g++ + +%description +Lomiri sounds contains the ringtones and notification tones recommended for the Lomiri stack. + +%prep +%autosetup -n %{name}-%commit + +%build +%cmake +%cmake_build + +%install +%cmake_install + +%files +%{_datadir}/pkgconfig/lomiri-sounds.pc +%dir %{_datadir}/sounds/lomiri +%{_datadir}/sounds/lomiri/camera/ +%{_datadir}/sounds/lomiri/notifications/ +%{_datadir}/sounds/lomiri/ringtones/ + +%changelog +%autochangelog From 959d959fbf65bdc59991522567652b4a26290094 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sat, 25 Mar 2023 17:06:13 -0700 Subject: [PATCH 41/82] Feat: add libayatana-common (#326) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/libayatana-common/anda.hcl | 5 ++ anda/libayatana-common/libayatana-common.spec | 63 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 anda/libayatana-common/anda.hcl create mode 100644 anda/libayatana-common/libayatana-common.spec diff --git a/anda/libayatana-common/anda.hcl b/anda/libayatana-common/anda.hcl new file mode 100644 index 0000000000..20e971b7b1 --- /dev/null +++ b/anda/libayatana-common/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "libayatana-common.spec" + } +} diff --git a/anda/libayatana-common/libayatana-common.spec b/anda/libayatana-common/libayatana-common.spec new file mode 100644 index 0000000000..4ea42157c1 --- /dev/null +++ b/anda/libayatana-common/libayatana-common.spec @@ -0,0 +1,63 @@ +Name: libayatana-common +Summary: Common functions for Ayatana System Indicators +Version: 0.9.8 +Release: %autorelease +License: GPLv3 +URL: https://github.com/AyatanaIndicators/libayatana-common +Source0: %{url}/archive/refs/tags/%{version}.tar.gz + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(lomiri-url-dispatcher) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: vala-devel +Buildrequires: vala +BuildRequires: intltool + +%description +The Ayatana Indicators project is the continuation of Application Indicators and System Indicators, +two technologies developed by Canonical Ltd. for the Unity7 desktop and Lomiri desktop. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package contains the development header files for %{name}. + +%prep +%autosetup -n %{name}-%{version} + +%build +%cmake -DENABLE_LOMIRI_FEATURES=ON \ + -DENABLE_TESTS=ON \ + -DENABLE_COVERAGE=OFF + +%cmake_build + +%install +%cmake_install +%find_lang ayatana-common + +%files -f ayatana-common.lang +%license COPYING +%{_userunitdir}/ayatana-indicators.target +%{_libdir}/libayatana-common.so.* +%{_libdir}/girepository-1.0/AyatanaCommon-0.0.typelib +%{_datadir}/glib-2.0/schemas/org.ayatana.common.gschema.xml + +%files devel +%{_libdir}/libayatana-common.so +%{_datadir}/gir-1.0/AyatanaCommon-0.0.gir +%{_libdir}/pkgconfig/libayatana-common.pc +%dir %{_includedir}/ayatana +%dir %{_includedir}/ayatana/common +%{_includedir}/ayatana/common/utils.h +%{_datadir}/vala/vapi/AyatanaCommon.vapi + +%changelog +%autochangelog From f094f3c1172f7c26d4eac8cc803bf57289736645 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sat, 25 Mar 2023 17:06:29 -0700 Subject: [PATCH 42/82] Feat: add qtmir (#323) --- anda/lib/qtmir/anda.hcl | 5 ++ anda/lib/qtmir/qtmir.spec | 121 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 anda/lib/qtmir/anda.hcl create mode 100644 anda/lib/qtmir/qtmir.spec diff --git a/anda/lib/qtmir/anda.hcl b/anda/lib/qtmir/anda.hcl new file mode 100644 index 0000000000..1f88e88e3f --- /dev/null +++ b/anda/lib/qtmir/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "qtmir.spec" + } +} diff --git a/anda/lib/qtmir/qtmir.spec b/anda/lib/qtmir/qtmir.spec new file mode 100644 index 0000000000..f8f9eed9ba --- /dev/null +++ b/anda/lib/qtmir/qtmir.spec @@ -0,0 +1,121 @@ +%global forgeurl https://gitlab.com/ubports/development/core/qtmir +# The commit Debian uses so no need for mirclient, not from mainline but ubports/focal_-_mir2.0 +%global commit bd21224b0fcd3edeaa56e5ccb90ac57a1785352d +%forgemeta + +Name: qtmir +Version: 0.8.0 +Release: %autorelease +Summary: Mir backed compositor using Qt + +License: LGPLv3+ AND GPLv3+ +URL: https://gitlab.com/ubports/development/core/qtmir +Source0: %{url}/-/archive/%commit/qtmir-%commit.tar.gz +Patch0: https://sources.debian.org/data/main/q/qtmir/0.8.0~git20230223.bd21224-3/debian/patches/1003_require-miroil-in-pkgconfig-file.patch +#Patch1: https://gitlab.com/ubports/development/core/qtmir/-/commit/24351ad41224fdbf2a42dbda6c380a54e4631ab5.patch + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: pkgconfig +BuildRequires: g++ +BuildRequires: gcc +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5Sensors) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(mirserver) +BuildRequires: pkgconfig(mir-renderer-gl-dev) +BuildRequires: pkgconfig(miral) +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(process-cpp) +BuildRequires: pkgconfig(lomiri-app-launch-0) +BuildRequires: pkgconfig(lomiri-url-dispatcher) +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(lttng-ust) +BuildRequires: pkgconfig(gsettings-qt) +BuildRequires: pkgconfig(libqtdbustest-1) +BuildRequires: pkgconfig(libqtdbusmock-1) +BuildRequires: pkgconfig(lomiri-shell-application) +BuildRequires: pkgconfig(valgrind) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: cmake(Qt5FontDatabaseSupport) +BuildRequires: qt-devel +# Not in pkgconfig +BuildRequires: properties-cpp-devel +BuildRequires: qt5-qtbase-static +BuildRequires: qt5-qtbase-private-devel +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: glm-devel +BuildRequires: boost-devel + +Requires: xorg-x11-server-Xwayland + +%description +Mir backed compositor using QT which is used in Lomiri. + +%package devel +Summary: Qtmir development files +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package contains development files needed for qtmir. + +%package demo +Summary: Qtmir demos +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description demo +This package contains development files needed for qtmir. + +%prep +%autosetup -n qtmir-%commit -p1 +#sed -i '' + +%build +%cmake -DWerror=OFF -DWITH_MIR2=on -DWITH_CONTENTHUB=OFF + +%cmake_build + +%install +%cmake_install + +%files +%license COPYING COPYING.LESSER +%{_libdir}/libqtmirserver.so.* +%{_qt5_plugindir}/platforms/libqpa-mirserver.so +%dir %{_qt5_qmldir}/QtMir +%dir %{_qt5_qmldir}/QtMir/Application +%{_qt5_qmldir}/QtMir/Application/libqtmirapplicationplugin.so +%{_qt5_qmldir}/QtMir/Application/qmldir +%{_datadir}/applications/xwayland.qtmir.desktop +%{_datadir}/icons/hicolor/256x256/apps/xwayland.qtmir.png +%{_datadir}/glib-2.0/schemas/com.canonical.qtmir.gschema.xml + +%files devel +%{_libdir}/libqtmirserver.so +%{_libdir}/pkgconfig/qtmirserver.pc +%dir %{_includedir}/qtmir +%dir %{_includedir}/qtmir/qtmir +%{_includedir}/qtmir/qtmir/*.h + +%files demo +%{_bindir}/qtmir-demo-* +%{_datadir}/applications/qtmir-demo-client.desktop +%dir %{_datadir}/qtmir +%dir %{_datadir}/qtmir/benchmarks +%{_datadir}/qtmir/benchmarks/*.py +%{_datadir}/qtmir/benchmarks/*.R +%dir %{_datadir}/qtmir/qtmir-demo-client +%{_datadir}/qtmir/qtmir-demo-client/*.qml +%dir %{_datadir}/qtmir/qtmir-demo-shell +%{_datadir}/qtmir/qtmir-demo-shell/*.qml +%{_datadir}/qtmir/qtmir-demo-shell/*.png + +%changelog +%autochangelog From b0f6947d20ba2c4512ef9448720044862c8f040c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 26 Mar 2023 01:18:36 +0000 Subject: [PATCH 43/82] bump: libappimage --- anda/lib/libappimage/libappimage.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/libappimage/libappimage.spec b/anda/lib/libappimage/libappimage.spec index b9fb71dc07..3f8c22c82f 100644 --- a/anda/lib/libappimage/libappimage.spec +++ b/anda/lib/libappimage/libappimage.spec @@ -1,4 +1,4 @@ -%global libver 1.0.4-5 +%global libver v1.0.4 # replace - with ~ %global libver_format %(v=%{libver}; sed -e 's/-/~/' <<< $v) From 1612f13dfe5b1bf25f58595f482bf260c6342ea0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 26 Mar 2023 01:26:12 +0000 Subject: [PATCH 44/82] bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly --- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 2 +- .../prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 7dc1d76eaa..610a7a23c6 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 6dcf34acdc8ec3dcbb094e4981ef136cd6a99913 +%global commit 09d607f39c47a467de5dde260e90771ad0ac51df %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index 5aa465a71a..579c467ba9 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 6dcf34acdc8ec3dcbb094e4981ef136cd6a99913 +%global commit 09d607f39c47a467de5dde260e90771ad0ac51df %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 From 9815f9c81e5bec7da39533d8c2b7400645cb7ce5 Mon Sep 17 00:00:00 2001 From: lleyton Date: Sat, 25 Mar 2023 21:31:36 -0700 Subject: [PATCH 45/82] Update autobuild.yml (#330) Signed-off-by: lleyton --- .github/workflows/autobuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index e85e849721..0bc4498658 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -69,7 +69,7 @@ jobs: with: name: "${{ matrix.pkg.pkg }}" mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }} - extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}" + extraArgs: ${{ github.event_name != 'pull_request' && '-D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"' || "" }} andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo - id: art From 97096af8cb1f105b8f3ae5a5b59fb11699575cc8 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sat, 25 Mar 2023 21:32:25 -0700 Subject: [PATCH 46/82] feat: add lomiri-settings-components (#331) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/lomiri-settings-components/anda.hcl | 5 +++ .../lomiri-settings-components.spec | 44 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 anda/lib/lomiri-settings-components/anda.hcl create mode 100644 anda/lib/lomiri-settings-components/lomiri-settings-components.spec diff --git a/anda/lib/lomiri-settings-components/anda.hcl b/anda/lib/lomiri-settings-components/anda.hcl new file mode 100644 index 0000000000..a1a791c3ed --- /dev/null +++ b/anda/lib/lomiri-settings-components/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "lomiri-settings-components.spec" + } +} diff --git a/anda/lib/lomiri-settings-components/lomiri-settings-components.spec b/anda/lib/lomiri-settings-components/lomiri-settings-components.spec new file mode 100644 index 0000000000..66ff7788bc --- /dev/null +++ b/anda/lib/lomiri-settings-components/lomiri-settings-components.spec @@ -0,0 +1,44 @@ +%global forgeurl https://gitlab.com/ubports/development/core/lomiri-settings-components +%global commit 2951ca5aa3d5d78823240d163aecb4a0aa62c535 +%forgemeta + +Name: lomiri-settings-components +Version: 1.0.1 +Release: %autorelease +Summary: The system settings components for Lomiri +License: GPLv3 AND LGPLv3 +URL: https://gitlab.com/ubports/development/core/lomiri-settings-components +Source0: %{url}/-/archive/%commit/lomiri-settings-components-%commit.tar.gz + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(QtGui) +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt5-qtbase-private-devel +BuildRequires: cmake(QmlPlugins) +Recommends: lomiri-system-settings + +%description +The system settings qml components for lomiri-system-settings. + +%prep +%autosetup -n %{name}-%commit + +%build +%cmake +%cmake_build + +%install +%cmake_install +%find_lang %{name} + +%files -f %{name}.lang +%license COPYING.GPL COPYING.LGPL +%dir %{_qt5_qmldir}/Lomiri/Settings +%{_qt5_qmldir}/Lomiri/Settings/Components/ +%{_qt5_qmldir}/Lomiri/Settings/Fingerprint/ +%{_qt5_qmldir}/Lomiri/Settings/Menus/ +%{_qt5_qmldir}/Lomiri/Settings/Vpn/ + +%changelog +%autochangelog From 2c812739b2e60f4b48d3e282de4b274763432352 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sat, 25 Mar 2023 21:33:30 -0700 Subject: [PATCH 47/82] feat: add qmenumodel (#329) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/qmenumodel/anda.hcl | 5 +++ anda/lib/qmenumodel/qmenumodel.spec | 56 +++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 anda/lib/qmenumodel/anda.hcl create mode 100644 anda/lib/qmenumodel/qmenumodel.spec diff --git a/anda/lib/qmenumodel/anda.hcl b/anda/lib/qmenumodel/anda.hcl new file mode 100644 index 0000000000..9361392d05 --- /dev/null +++ b/anda/lib/qmenumodel/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "qmenumodel.spec" + } +} diff --git a/anda/lib/qmenumodel/qmenumodel.spec b/anda/lib/qmenumodel/qmenumodel.spec new file mode 100644 index 0000000000..f85a169cab --- /dev/null +++ b/anda/lib/qmenumodel/qmenumodel.spec @@ -0,0 +1,56 @@ +Name: qmenumodel +Version: 0.9.1 +Release: %autorelease +Summary: Qt5 renderer for Ayatana Indicators +License: LGPLv3 +URL: https://github.com/AyatanaIndicators/qmenumodel +Source0: https://releases.ayatana-indicators.org/source/qmenumodel/qmenumodel-%{version}.tar.gz + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: gcc-c++ +BuildRequires: qt5-doctools +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: dbus-test-runner + +%description +Qt bindings for GMenuModel that allows connecting to a menu model exposed on +D-Bus and presents it as a list model. It can be used to expose indicator or +application menus for applications using the Qt framework. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%autosetup -n qmenumodel-%{version} + +%build +%cmake -DENABLE_TESTS=ON -DENABLE_COVERAGE=ON -DGENERATE_DOC=ON +%cmake_build + +%install +%cmake_install + +%files +%license COPYING.LGPL +%{_libdir}/libqmenumodel.so.* +%dir %{_qt5_qmldir}/QMenuModel.1 +%{_qt5_qmldir}/QMenuModel.1/libqmenumodel-qml.so +%{_qt5_qmldir}/QMenuModel.1/qmldir + +%files devel +%dir %{_includedir}/qmenumodel +%{_includedir}/qmenumodel/*.h +%{_libdir}/libqmenumodel.so +%{_libdir}/pkgconfig/qmenumodel.pc + +%changelog +%autochangelog From 23a12bdcd71fefaecfb5dc2c914486bc3ed008ea Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sat, 25 Mar 2023 21:34:16 -0700 Subject: [PATCH 48/82] feat: add ayatana-indicator-datetime (#328) * feat: add ayatana-indicator-datetime Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> * fix(ayatana-indicator-datetime): add anda.hcl Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --------- Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/ayatana-indicator-datetime/anda.hcl | 5 ++ .../ayatana-indicator-datetime.spec | 58 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 anda/lib/ayatana-indicator-datetime/anda.hcl create mode 100644 anda/lib/ayatana-indicator-datetime/ayatana-indicator-datetime.spec diff --git a/anda/lib/ayatana-indicator-datetime/anda.hcl b/anda/lib/ayatana-indicator-datetime/anda.hcl new file mode 100644 index 0000000000..7f40b6b338 --- /dev/null +++ b/anda/lib/ayatana-indicator-datetime/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "ayatana-indicator-datetime.spec" + } +} diff --git a/anda/lib/ayatana-indicator-datetime/ayatana-indicator-datetime.spec b/anda/lib/ayatana-indicator-datetime/ayatana-indicator-datetime.spec new file mode 100644 index 0000000000..2dc89ea588 --- /dev/null +++ b/anda/lib/ayatana-indicator-datetime/ayatana-indicator-datetime.spec @@ -0,0 +1,58 @@ +Name: ayatana-indicator-datetime +Summary: A GTK implementation of the StatusNotifierItem Specification +Version: 22.9.1 +Release: %autorelease +License: GPLv3 +URL: https://github.com/AyatanaIndicators/ayatana-indicator-datetime +Source0: %{url}/archive/refs/tags/%{version}.tar.gz + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: gcc-c++ +BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(lomiri-url-dispatcher) +BuildRequires: pkgconfig(lomiri-schemas) +BuildRequires: pkgconfig(libayatana-common) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(libical) +BuildRequires: pkgconfig(libecal-2.0) +BuildRequires: pkgconfig(libedataserver-1.2) +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(properties-cpp) +BuildRequires: pkgconfig(libaccounts-glib) +BuildRequires: pkgconfig(messaging-menu) +BuildRequires: pkgconfig(uuid) +BuildRequires: pkgconfig(lomiri-sounds) +BuildRequires: pkgconfig(dbustest-1) +BuildRequires: pkgconfig(systemd) + +%description +The Ayatana Indicators project is the continuation of Application Indicators and System Indicators, +two technologies developed by Canonical Ltd. for the Unity7 desktop and Lomiri desktop. + +%prep +%autosetup -n %{name}-%{version} + +%build +%cmake -DENABLE_LOMIRI_FEATURES=ON \ + -DENABLE_TESTS=ON \ + -DENABLE_COVERAGE=OFF \ +%cmake_build + +%install +%cmake_install +%find_lang %{name} + +%files -f %{name}.lang +%license COPYING +%{_sysconfdir}/xdg/autostart +%{_userunitdir}/ayatana-indicator-datetime.service +%dir %{_libexecdir}/ayatana-indicator-datetime +%{_libexecdir}/ayatana-indicator-datetime/ayatana-indicator-datetime-service +%{_datadir}/ayatana/indicators/org.ayatana.indicator.datetime +%{_datadir}/glib-2.0/schemas/org.ayatana.indicator.datetime.gschema.xml + +%changelog +%autochangelog From f25487e95c07838bbcd406a7a431a9fc0ee45687 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sat, 25 Mar 2023 21:35:07 -0700 Subject: [PATCH 49/82] feat: add ayatana-indicator-messages (#327) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/ayatana-indicator-messages/anda.hcl | 5 + .../ayatana-indicator-messages.spec | 93 +++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 anda/lib/ayatana-indicator-messages/anda.hcl create mode 100644 anda/lib/ayatana-indicator-messages/ayatana-indicator-messages.spec diff --git a/anda/lib/ayatana-indicator-messages/anda.hcl b/anda/lib/ayatana-indicator-messages/anda.hcl new file mode 100644 index 0000000000..b0f3598528 --- /dev/null +++ b/anda/lib/ayatana-indicator-messages/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "ayatana-indicator-messages.spec" + } +} diff --git a/anda/lib/ayatana-indicator-messages/ayatana-indicator-messages.spec b/anda/lib/ayatana-indicator-messages/ayatana-indicator-messages.spec new file mode 100644 index 0000000000..056e75f618 --- /dev/null +++ b/anda/lib/ayatana-indicator-messages/ayatana-indicator-messages.spec @@ -0,0 +1,93 @@ +Name: ayatana-indicator-messages +Summary: Ayatana Indicator Messages Applet +Version: 22.9.0 +Release: %autorelease +License: GPLv3 +URL: https://github.com/AyatanaIndicators/ayatana-indicator-messages +Source0: %{url}/archive/refs/tags/%{version}.tar.gz + +BuildRequires: cmake +BuildRequires: pkgconfig(lomiri-url-dispatcher) +BuildRequires: cmake-extras +BuildRequires: systemd-rpm-macros +BuildRequires: accountsservice-devel +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(dbustest-1) +BuildRequires: vala +BuildRequires: gtk-doc +BuildRequires: vala-devel +BuildRequires: intltool + +%description +The Ayatana Indicators project is the continuation of Application Indicators and System Indicators, +two technologies developed by Canonical Ltd. for the Unity7 desktop and Lomiri desktop. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package contains the development header files for %{name}. + +%package doc +Summary: Documentation for %{name} +BuildArch: noarch + +%description doc +This package contains documentation files for %{name}. + +%prep +%autosetup -n %{name}-%{version} + +%build +%cmake -DENABLE_LOMIRI_FEATURES=ON \ + -DENABLE_TESTS=ON \ + -DENABLE_COVERAGE=OFF \ +%cmake_build + +%install +%cmake_install +%find_lang %{name} + +%files -f %{name}.lang +%license COPYING +%{_sysconfdir}/xdg/autostart/ayatana-indicator-messages.desktop +%{_userunitdir}/ayatana-indicator-messages.service +%{_libdir}/libmessaging-menu.so.* +%{_libdir}/girepository-1.0/MessagingMenu-1.0.typelib +%dir %{_libexecdir}/ayatana-indicator-messages +%{_libexecdir}/ayatana-indicator-messages/ayatana-indicator-messages-service +%{_datadir}/ayatana/indicators/org.ayatana.indicator.messages +%{_datadir}/glib-2.0/schemas/org.ayatana.indicator.messages.gschema.xml +%{_datadir}/icons/hicolor/scalable/status/*.svg +%{_datadir}/icons/hicolor/scalable/categories/*.svg +%{_datadir}/icons/hicolor/16x16/categories/*.png +%{_datadir}/icons/hicolor/16x16/status/*.png +%{_datadir}/icons/hicolor/22x22/categories/*.png +%{_datadir}/icons/hicolor/22x22/status/*.png +%{_datadir}/icons/hicolor/24x24/status/*.png +%{_datadir}/icons/hicolor/32x32/categories/*.png +%{_datadir}/icons/hicolor/32x32/status/*.png +%{_datadir}/icons/hicolor/48x48/status/*.png + +%files devel +%dir %{_includedir}/messaging-menu +%{_includedir}/messaging-menu/*.h +%{_libdir}/libmessaging-menu.so +%{_libdir}/pkgconfig/messaging-menu.pc +%{_datadir}/vala/vapi/MessagingMenu-1.0.vapi +%{_datadir}/gir-1.0/MessagingMenu-1.0.gir + +%files doc +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html +%dir %{_datadir}/gtk-doc/html/messaging-menu +%{_datadir}/gtk-doc/html/messaging-menu/*.html +%{_datadir}/gtk-doc/html/messaging-menu/*.png +%{_datadir}/gtk-doc/html/messaging-menu/messaging-menu.devhelp2 +%{_datadir}/gtk-doc/html/messaging-menu/style.css + +%changelog +%autochangelog From c9c58853777d12a06030b71b05c2fb32cf93b3d7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 26 Mar 2023 05:36:15 +0000 Subject: [PATCH 50/82] bump: maturin --- anda/rust/maturin/rust-maturin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/rust/maturin/rust-maturin.spec b/anda/rust/maturin/rust-maturin.spec index dd0f059806..34b8879ea6 100644 --- a/anda/rust/maturin/rust-maturin.spec +++ b/anda/rust/maturin/rust-maturin.spec @@ -2,7 +2,7 @@ %global crate maturin Name: rust-maturin -Version: 0.14.15 +Version: 0.14.16 Release: 1%{?dist} Summary: Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages From a8433cff4767426b46b047ad16090806af76e13d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 26 Mar 2023 13:36:12 +0000 Subject: [PATCH 51/82] bump: libhelium --- anda/lib/libhelium/libhelium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index 3650bdb9ed..517ea55107 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -1,6 +1,6 @@ Summary: The Application Framework for tauOS apps Name: libhelium -Version: 1.5.11 +Version: 1.5.12 Release: 1%{?dist} License: GPLv3 URL: https://github.com/tau-OS/libhelium From 5171c4b079890d0db8630872dac40f43260b0382 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 26 Mar 2023 15:13:52 +0000 Subject: [PATCH 52/82] bump: moby-compose --- anda/moby-extras/moby-compose/moby-compose.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/moby-extras/moby-compose/moby-compose.spec b/anda/moby-extras/moby-compose/moby-compose.spec index 63fcb548ef..ea17a399d5 100644 --- a/anda/moby-extras/moby-compose/moby-compose.spec +++ b/anda/moby-extras/moby-compose/moby-compose.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: moby-compose -Version: 2.17.1 +Version: 2.17.2 Release: 1%{?dist} Summary: Define and run multi-container applications with Docker From afc84acdda7df1622b308c9375925a24bacd8c42 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 26 Mar 2023 16:18:48 +0000 Subject: [PATCH 53/82] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index 361ae3cedc..b0eb398fa4 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: osu-lazer -Version: 2023.305.0 +Version: 2023.326.0 Release: 1%{?dist} Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From b90f4ead0ce6d352f510f67459ba7cbb6eac5844 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 26 Mar 2023 18:17:06 +0000 Subject: [PATCH 54/82] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index b0eb398fa4..b323941b2b 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: osu-lazer -Version: 2023.326.0 +Version: 2023.326.1 Release: 1%{?dist} Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From f28ac4253f43b60718a70b77fc535a33c2c59018 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sun, 26 Mar 2023 14:16:52 -0700 Subject: [PATCH 55/82] feat: add deviceinfo (#335) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/deviceinfo/anda.hcl | 5 +++ anda/lib/deviceinfo/deviceinfo.spec | 60 +++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 anda/lib/deviceinfo/anda.hcl create mode 100644 anda/lib/deviceinfo/deviceinfo.spec diff --git a/anda/lib/deviceinfo/anda.hcl b/anda/lib/deviceinfo/anda.hcl new file mode 100644 index 0000000000..e647e1cd32 --- /dev/null +++ b/anda/lib/deviceinfo/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "deviceinfo.spec" + } +} diff --git a/anda/lib/deviceinfo/deviceinfo.spec b/anda/lib/deviceinfo/deviceinfo.spec new file mode 100644 index 0000000000..517ef214ee --- /dev/null +++ b/anda/lib/deviceinfo/deviceinfo.spec @@ -0,0 +1,60 @@ +%global forgeurl https://gitlab.com/ubports/development/core/deviceinfo +%global commit fe939f071aafa47f631caec55a4e8420b3eb4a12 +%forgemeta + +Name: deviceinfo +Version: 0.1.1 +Release: %autorelease +Summary: Library to detect and configure devices +License: GPLv3+ +URL: https://gitlab.com/ubports/development/core/deviceinfo +Source0: %{url}/-/archive/%commit/deviceinfo-%commit.tar.gz +Source1: https://salsa.debian.org/ubports-team/deviceinfo/-/raw/master/debian/device-info.1 + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: pkgconfig(yaml-cpp) +BuildRequires: gcc-c++ + +%description +Library to detect and configure devices for Lomiri. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%autosetup -n deviceinfo-%commit + +%build +%cmake +%cmake_build + +%install +%cmake_install +install -Dm644 '%{SOURCE1}' %{buildroot}%{_mandir}/man1/device-info.1 + +%files +%license LICENSE +%dir %{_sysconfdir}/deviceinfo +%{_sysconfdir}/deviceinfo/default.yaml +%dir %{_sysconfdir}/deviceinfo/devices +%{_sysconfdir}/deviceinfo/devices/*.yaml +%dir %{_sysconfdir}/deviceinfo/sensorfw +%{_sysconfdir}/deviceinfo/sensorfw/*.conf +%{_bindir}/device-info +%{_mandir}/man1/device-info.1.gz +%{_libdir}/libdeviceinfo.so.* + +%files devel +%dir %{_includedir}/deviceinfo +%{_includedir}/deviceinfo/deviceinfo.h +%{_libdir}/libdeviceinfo.so +%{_libdir}/pkgconfig/deviceinfo.pc + +%changelog +%autochangelog From 661b81adac4f03091250ea768dc31b364ab96f9c Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sun, 26 Mar 2023 14:18:21 -0700 Subject: [PATCH 56/82] feat: add qdjango (#333) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/qdjango/anda.hcl | 5 +++ anda/lib/qdjango/qdjango.spec | 70 +++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 anda/lib/qdjango/anda.hcl create mode 100644 anda/lib/qdjango/qdjango.spec diff --git a/anda/lib/qdjango/anda.hcl b/anda/lib/qdjango/anda.hcl new file mode 100644 index 0000000000..935de7d942 --- /dev/null +++ b/anda/lib/qdjango/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "qdjango.spec" + } +} diff --git a/anda/lib/qdjango/qdjango.spec b/anda/lib/qdjango/qdjango.spec new file mode 100644 index 0000000000..45931cd0a8 --- /dev/null +++ b/anda/lib/qdjango/qdjango.spec @@ -0,0 +1,70 @@ +Name: qdjango +Version: 0.6.2 +Release: %autorelease +Summary: A web framework written in C++ and built on top of the Qt library +License: LGPLv2 +URL: https://github.com/jlaine/qdjango +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz +Patch0: https://sources.debian.org/data/main/q/qdjango/0.6.2-3.3/debian/patches/disable_hash_tests.patch +Patch1: https://sources.debian.org/data/main/q/qdjango/0.6.2-3.3/debian/patches/fix_gcc6_ftbfs.patch + +BuildRequires: qt5-rpm-macros +BuildRequires: qt5-qtbase-devel +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: doxygen + +%description +QDjango is a web framework written in C++ and built on top of the Qt library. +Where possible, it tries to follow django's API, hence its name. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package doc +Summary: Documenation for %{name} +BuildArch: noarch + +%description doc +The %{name}-doc contains documentation for %{name}. + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +%qmake_qt5 PREFIX=%{_exec_prefix} LIBDIR=%{_lib} +%make_build +%make_build docs + +%install +%make_install INSTALL_ROOT=%{buildroot} +# Aren't needed and already ran plus contain rpaths in every single file underneath +rm -rf %{buildroot}%{_prefix}/tests + +%files +%license LICENSE.LGPL +%{_libdir}/libqdjango-db.so.* +%{_libdir}/libqdjango-http.so.* + +%files devel +%dir %{_includedir}/qdjango +%dir %{_includedir}/qdjango/db +%{_includedir}/qdjango/db/*.h +%dir %{_includedir}/qdjango/http +%{_includedir}/qdjango/http/*.h +%{_libdir}/libqdjango-db.so +%{_libdir}/libqdjango-http.so +%{_libdir}/pkgconfig/qdjango-db.pc +%{_libdir}/pkgconfig/qdjango-http.pc + +%files doc +%dir %{_docdir}/qdjango +%{_docdir}/qdjango/html/ + +%changelog +%autochangelog From cbf9f362b2ef880ae48705747992c5233b42f89b Mon Sep 17 00:00:00 2001 From: lleyton Date: Sun, 26 Mar 2023 14:22:41 -0700 Subject: [PATCH 57/82] Update autobuild.yml (#338) Signed-off-by: lleyton --- .github/workflows/autobuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 0bc4498658..0cfb80bbda 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -69,7 +69,7 @@ jobs: with: name: "${{ matrix.pkg.pkg }}" mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }} - extraArgs: ${{ github.event_name != 'pull_request' && '-D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"' || "" }} + extraArgs: ${{ github.event_name != 'pull_request' && '-D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"' || '' }} andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo - id: art From cd321bbda73bdbf41e342a0c81745de66de4b9e7 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:31:30 -0700 Subject: [PATCH 58/82] feat: add qofono (#337) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/qofono/anda.hcl | 5 +++ anda/lib/qofono/qofono.spec | 85 +++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 anda/lib/qofono/anda.hcl create mode 100644 anda/lib/qofono/qofono.spec diff --git a/anda/lib/qofono/anda.hcl b/anda/lib/qofono/anda.hcl new file mode 100644 index 0000000000..843063caf3 --- /dev/null +++ b/anda/lib/qofono/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "qofono.spec" + } +} diff --git a/anda/lib/qofono/qofono.spec b/anda/lib/qofono/qofono.spec new file mode 100644 index 0000000000..8287c9754b --- /dev/null +++ b/anda/lib/qofono/qofono.spec @@ -0,0 +1,85 @@ +Name: qofono +Summary: A library of Qt5 bindings for ofono +Version: 0.120 +Release: %autorelease +License: LGPLv2 +URL: https://github.com/sailfishos/libqofono +Source0: %{url}/archive/refs/tags/%{version}.tar.gz +Source1: https://gitlab.com/ubports/development/core/packaging/libqofono/-/archive/ubports/latest/libqofono-ubports-latest.tar.gz +Patch0: https://sources.debian.org/data/main/libq/libqofono/0.120-1/debian/patches/1001_context-preferred.patch +Patch1: https://sources.debian.org/data/main/libq/libqofono/0.120-1/debian/patches/1003_mtk_settings_binding.patch +Patch2: https://sources.debian.org/data/main/libq/libqofono/0.120-1/debian/patches/2001_path-adjustments.patch +Patch3: https://sources.debian.org/data/main/libq/libqofono/0.120-1/debian/patches/1004_desktop-file-fields.patch + +BuildRequires: qt5-rpm-macros +BuildRequires: qt5-qtbase-devel +BuildRequires: make +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5Test) + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description +This package contains Qt5 bindings for ofono cellular service +interfaces. + +%package devel +Summary: Development files for ofono Qt5 bindings +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package contains the development header files for the ofono Qt5 bindings. + +%package tests +Summary: Qml tests and examples for the ofono Qt5 bindings +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tests +This package contains qml tests and examples for ofono Qt5 bindings. + +%prep +sed -i 'sX$(dpkg-architecture -qDEB_HOST_MULTIARCH)/XX' '%{PATCH2}' +%autosetup -n libqofono-%{version} -p1 + +%build +export QT_SELECT=5 +%qmake_qt5 "VERSION=$(sed 's/+.*//' <<<"%{version}")" +%make_build + +%install +%make_install INSTALL_ROOT=%{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%license COPYING +%{_libdir}/libqofono-qt5.so.* +%{_qt5_qmldir}/QOfono/ + +%files devel +%{_libdir}/libqofono-qt5.prl +%{_libdir}/libqofono-qt5.so +%{_libdir}/pkgconfig/qofono-qt5.pc +%dir %{_includedir}/qofono-qt5 +%{_includedir}/qofono-qt5/*.h +%dir %{_includedir}/qofono-qt5/dbus +%{_includedir}/qofono-qt5/dbus/ofono*.xml +%{_qt5_datadir}/mkspecs/features/qofono-qt5.prf + +%files tests +%dir %{_libexecdir}/libqofono-qt5 +%{_libexecdir}/libqofono-qt5/tests/ +%{_libexecdir}/libqofono-qt5/ofonotest +%dir %{_datadir}/libqofono-qt5 +%dir %{_datadir}/libqofono-qt5/qml +%dir %{_datadir}/libqofono-qt5/qml/ofonotest +%{_datadir}/libqofono-qt5/qml/ofonotest/main.qml + +%changelog +%autochangelog From aedcb2c0e35e0b3ea276b618f40079a85c624291 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:34:24 -0700 Subject: [PATCH 59/82] feat: add gmenuharness (#336) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/gmenuharness/anda.hcl | 5 +++ anda/lib/gmenuharness/gmenuharness.spec | 57 +++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 anda/lib/gmenuharness/anda.hcl create mode 100644 anda/lib/gmenuharness/gmenuharness.spec diff --git a/anda/lib/gmenuharness/anda.hcl b/anda/lib/gmenuharness/anda.hcl new file mode 100644 index 0000000000..6f43f92497 --- /dev/null +++ b/anda/lib/gmenuharness/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "gmenuharness.spec" + } +} diff --git a/anda/lib/gmenuharness/gmenuharness.spec b/anda/lib/gmenuharness/gmenuharness.spec new file mode 100644 index 0000000000..377aac7458 --- /dev/null +++ b/anda/lib/gmenuharness/gmenuharness.spec @@ -0,0 +1,57 @@ +%global forgeurl https://gitlab.com/ubports/development/core/gmenuharness +%global commit 04e27ce98ca2d2b132b9bd0279a80bcb1ccbcc8c +%forgemeta + +Name: gmenuharness +Version: 0.1.4 +Release: %autorelease +Summary: GMenu harness library +License: LGPLv3 +URL: https://gitlab.com/ubports/development/core/gmenuharness +Source0: %{url}/-/archive/%commit/gmenuharness-%commit.tar.gz + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(liblomiri-api) +BuildRequires: pkgconfig(gmock) +BuildRequires: pkgconfig(gtest) +BuildRequires: pkgconfig(libqtdbustest-1) + +%description +GMenu harness library for lomiri. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%autosetup -n gmenuharness-%commit + +%build +%cmake +%cmake_build + +%install +%cmake_install + +%files +%license COPYING +%{_libdir}/libgmenuharness.so.* + +%files devel +%dir %{_includedir}/gmenuharness-0.1 +%dir %{_includedir}/gmenuharness-0.1/lomiri +%dir %{_includedir}/gmenuharness-0.1/lomiri/gmenuharness +%{_includedir}/gmenuharness-0.1/lomiri/gmenuharness/*.h +%{_libdir}/libgmenuharness.so +%{_libdir}/pkgconfig/libgmenuharness.pc + +%changelog +%autochangelog From 39415fa088d50889c8160a5c96ff671e23d8ffd6 Mon Sep 17 00:00:00 2001 From: lleyton Date: Sun, 26 Mar 2023 18:48:28 -0700 Subject: [PATCH 60/82] fix: handle inputs for PRs properly (#342) --- .github/workflows/autobuild.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 0cfb80bbda..6e8f11431e 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -66,10 +66,18 @@ jobs: options: --cap-add=SYS_ADMIN --privileged steps: - uses: terrapkg/anda-build@main + if: github.event_name == 'pull_request' with: name: "${{ matrix.pkg.pkg }}" mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }} - extraArgs: ${{ github.event_name != 'pull_request' && '-D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"' || '' }} + andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo + + - uses: terrapkg/anda-build@main + if: github.event_name != 'pull_request' + with: + name: "${{ matrix.pkg.pkg }}" + mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }} + extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}" andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo - id: art From 3dcfc55f2a57a6839c8bcaef6e48f8e7e40c268c Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Mon, 27 Mar 2023 02:40:17 -0700 Subject: [PATCH 61/82] fix: get com.lomiri.Shell to compile (#341) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/others/lomiri-schemas/lomiri-schemas.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/others/lomiri-schemas/lomiri-schemas.spec b/anda/others/lomiri-schemas/lomiri-schemas.spec index af451d8630..a43a8f112f 100644 --- a/anda/others/lomiri-schemas/lomiri-schemas.spec +++ b/anda/others/lomiri-schemas/lomiri-schemas.spec @@ -9,6 +9,7 @@ Summary: Configuration schemas for lomiri License: LGPLv2+ URL: https://gitlab.com/ubports/development/core/lomiri-schemas Source0: %url/-/archive/%commit/lomiri-schemas-%commit.tar.gz +Patch0: https://gitlab.com/cat-master21/lomiri-schemas/-/commit/e32de385c858f9096c6014a3749117fa6f94f231.patch BuildArch: noarch BuildRequires: cmake @@ -21,7 +22,7 @@ BuildRequires: intltool Configuration schemas for lomiri desktop enviroment. %prep -%autosetup -n %{name}-%commit +%autosetup -n %{name}-%commit -p1 %build %cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true From ed7408e436b5babce9c65ca8ae10b39dfd06ce59 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Mon, 27 Mar 2023 02:50:37 -0700 Subject: [PATCH 62/82] add: libusermetrics (#334) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/libusermetrics/anda.hcl | 5 ++ anda/lib/libusermetrics/libusermetrics.spec | 94 +++++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 anda/lib/libusermetrics/anda.hcl create mode 100644 anda/lib/libusermetrics/libusermetrics.spec diff --git a/anda/lib/libusermetrics/anda.hcl b/anda/lib/libusermetrics/anda.hcl new file mode 100644 index 0000000000..abb8b31eaf --- /dev/null +++ b/anda/lib/libusermetrics/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "libusermetrics.spec" + } +} diff --git a/anda/lib/libusermetrics/libusermetrics.spec b/anda/lib/libusermetrics/libusermetrics.spec new file mode 100644 index 0000000000..6b931cbcc8 --- /dev/null +++ b/anda/lib/libusermetrics/libusermetrics.spec @@ -0,0 +1,94 @@ +%global forgeurl https://gitlab.com/ubports/development/core/libusermetrics +%global commit bce6f62b8472bf35bb746b9fcb92aecfe3295c36 +%forgemeta + +Name: libusermetrics +Version: 1.3.0 +Release: %autorelease +Summary: library for retrieving anonymous metrics about users +License: GPLv3 AND LGPLv3 AND LGPLv2 +URL: https://gitlab.com/ubports/development/core/libusermetrics +Source0: %{url}/-/archive/%commit/libusermetrics-%commit.tar.gz + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: gcc-c++ +BuildRequires: doxygen +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt5-qtxmlpatterns-devel +BuildRequires: pkgconfig(gsettings-qt) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(click-0.4) +BuildRequires: pkgconfig(libqtdbustest-1) +BuildRequires: pkgconfig(libapparmor) +BuildRequires: qdjango-devel + +%description +library for retrieving anonymous metrics about users +This package contains shared libraries to be used by applications. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package doc +Summary: Documenation for %{name} +BuildArch: noarch + +%description doc +The %{name}-doc contains documentation for %{name}. + +%prep +%autosetup -n libusermetrics-%commit + +%build +%cmake -DENABLE_TESTS=ON +%cmake_build + +%install +%cmake_install +%find_lang %{name} + +%files -f %{name}.lang +%license LGPL_EXCEPTION.txt LICENSE.GPL LICENSE.LGPL LICENSE.LGPL-3 +%{_sysconfdir}/dbus-1/system.d/com.lomiri.UserMetrics.conf +%{_bindir}/usermetricsinput +%{_bindir}/usermetricsinput-increment +%{_libdir}/libusermetricsinput.so.* +%{_libdir}/libusermetricsoutput.so.* +%dir %{_qt5_qmldir}/UserMetrics +%{_qt5_qmldir}/UserMetrics/libusermetrics-qml.so +%{_qt5_qmldir}/UserMetrics/qmldir +%dir %{_libexecdir}/libusermetrics +%{_libexecdir}/libusermetrics/usermetricsservice +%{_datadir}/dbus-1/interfaces/*.xml +%{_datadir}/dbus-1/system-services/com.lomiri.UserMetrics.service +%{_datadir}/glib-2.0/schemas/com.lomiri.UserMetrics.gschema.xml +%dir %{_datadir}/libusermetrics +%dir %{_datadir}/libusermetrics/themes +%{_datadir}/libusermetrics/themes/color-theme.xsd +%{_datadir}/libusermetrics/themes/default.xml + +%files devel +%dir %{_includedir}/libusermetrics-1 +%dir %{_includedir}/libusermetrics-1/libusermetricsinput +%{_includedir}/libusermetrics-1/libusermetricsinput/*.h +%dir %{_includedir}/libusermetrics-1/libusermetricsoutput +%{_includedir}/libusermetrics-1/libusermetricsoutput/*.h +%{_libdir}/libusermetricsinput.so +%{_libdir}/libusermetricsoutput.so +%{_libdir}/pkgconfig/libusermetricsinput-1.pc +%{_libdir}/pkgconfig/libusermetricsoutput-1.pc + +%files doc +%dir %{_docdir}/libusermetrics-doc +%{_docdir}/libusermetrics-doc/html/ +%{_docdir}/libusermetrics-doc/xml/ + +%changelog +%autochangelog From 83076d04b28b558eaebe07755d924e74bdc31087 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 27 Mar 2023 10:37:42 +0000 Subject: [PATCH 63/82] bump: sccache --- anda/rust/sccache/rust-sccache.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/rust/sccache/rust-sccache.spec b/anda/rust/sccache/rust-sccache.spec index cfcf34cbd5..d574743fc5 100644 --- a/anda/rust/sccache/rust-sccache.spec +++ b/anda/rust/sccache/rust-sccache.spec @@ -6,7 +6,7 @@ %global crate sccache Name: rust-sccache -Version: 0.4.0 +Version: 0.4.1 Release: 1%{?dist} Summary: Ccache-like tool From 1cdbadd1666996f14a222bad0a328775d2a0dbfa Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Mon, 27 Mar 2023 07:49:43 -0700 Subject: [PATCH 64/82] feat: add lomiri-indicator-network (#339) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/lomiri-indicator-network/anda.hcl | 5 + .../lomiri-indicator-network.spec | 98 +++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 anda/lib/lomiri-indicator-network/anda.hcl create mode 100644 anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec diff --git a/anda/lib/lomiri-indicator-network/anda.hcl b/anda/lib/lomiri-indicator-network/anda.hcl new file mode 100644 index 0000000000..3c8c6c91f3 --- /dev/null +++ b/anda/lib/lomiri-indicator-network/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "lomiri-indicator-network.spec" + } +} diff --git a/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec b/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec new file mode 100644 index 0000000000..1907de60e2 --- /dev/null +++ b/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec @@ -0,0 +1,98 @@ +%global forgeurl https://gitlab.com/ubports/development/core/lomiri-indicator-network +%global commit f4610298aa91b17161b5bc65b232228bf0fcab47 +%forgemeta + +Name: lomiri-indicator-network +Version: 1.0.0 +Release: %autorelease +Summary: The Network indicator for Ubuntu Touch +License: GPLv3 AND LGPLv3 +URL: https://gitlab.com/ubports/development/core/lomiri-indicator-network +Source0: %{url}/-/archive/%commit/lomiri-indicator-network-%commit.tar.gz +Patch0: https://sources.debian.org/data/main/l/lomiri-indicator-network/1.0.0-1/debian/patches/1003_no-abs-paths-in-documentation.patch + +BuildRequires: systemd-rpm-macros +BuildRequires: qt-devel +BuildRequires: doxygen +BuildRequires: qt5-doctools +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: gcc-c++ +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(liblomiri-api) +BuildRequires: pkgconfig(libnm) +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(ofono) +BuildRequires: pkgconfig(libqtdbustest-1) +BuildRequires: pkgconfig(libqtdbusmock-1) +BuildRequires: pkgconfig(libgmenuharness) +BuildRequires: pkgconfig(ofono) +BuildRequires: pkgconfig(qofono-qt5) +BuildRequires: pkgconfig(lomiri-url-dispatcher) + +%description +The "Network" indicator for Ubuntu Touch and Lomiri. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package doc +Summary: Documentation files for %{name} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + +%prep +%autosetup -n lomiri-indicator-network-%commit -p1 + +%build +%cmake -DENABLE_COVERAGE=OFF -DENABLE_UBUNTU_COMPAT=ON +%cmake_build + +%install +%cmake_install +%find_lang %{name} + +%files -f %{name}.lang +%license COPYING COPYING.LGPL +%{_sysconfdir}/xdg/autostart/lomiri-indicator-network.desktop +%{_userunitdir}/*.service +%{_libdir}/liblomiri-connectivity-qt1.so.* +%dir %{_qt5_qmldir}/Lomiri/Connectivity +%{_qt5_qmldir}/Lomiri/Connectivity/libconnectivity-qml.so +%{_qt5_qmldir}/Lomiri/Connectivity/qmldir +%dir %{_qt5_qmldir}/Ubuntu/Connectivity +%{_qt5_qmldir}/Ubuntu/Connectivity/libconnectivity-qml-ubuntu-compat.so +%{_qt5_qmldir}/Ubuntu/Connectivity/qmldir +%dir %{_libexecdir}/lomiri-indicator-network +%{_libexecdir}/lomiri-indicator-network/lomiri-indicator-network-* +%{_datadir}/glib-2.0/schemas/com.lomiri.indicator.network.gschema.xml +%{_datadir}/unity/indicators/com.lomiri.indicator.network + +%files devel +%dir %{_includedir}/connectivity-api +%dir %{_includedir}/connectivity-api/qt1 +%dir %{_includedir}/connectivity-api/qt1/connectivityqt +%{_includedir}/connectivity-api/qt1/connectivityqt/*.h +%dir %{_includedir}/connectivity-api/qt1/lomiri +%dir %{_includedir}/connectivity-api/qt1/lomiri/connectivity +%{_includedir}/connectivity-api/qt1/lomiri/connectivity/networking-status.h +%{_libdir}/liblomiri-connectivity-qt1.so +%{_libdir}/pkgconfig/lomiri-connectivity-qt1.pc + +%files doc +%dir %{_docdir}/lomiri-connectivity-doc +%{_docdir}/lomiri-connectivity-doc/cpp/ +%{_docdir}/lomiri-connectivity-doc/dbus/ +%{_docdir}/lomiri-connectivity-doc/qml/ + +%changelog +%autochangelog From f9c29f34f52b21647c286fc3127540283ec751ad Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Mon, 27 Mar 2023 07:51:46 -0700 Subject: [PATCH 65/82] feat: add lomiri-download-manager (#340) * feat: add lomiri-download-manager Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> * chore: fix version name Co-authored-by: madomado Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --------- Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> Co-authored-by: madomado --- anda/lib/lomiri-download-manager/anda.hcl | 5 + .../lomiri-download-manager.spec | 100 ++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 anda/lib/lomiri-download-manager/anda.hcl create mode 100644 anda/lib/lomiri-download-manager/lomiri-download-manager.spec diff --git a/anda/lib/lomiri-download-manager/anda.hcl b/anda/lib/lomiri-download-manager/anda.hcl new file mode 100644 index 0000000000..f2f3101674 --- /dev/null +++ b/anda/lib/lomiri-download-manager/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "lomiri-download-manager.spec" + } +} diff --git a/anda/lib/lomiri-download-manager/lomiri-download-manager.spec b/anda/lib/lomiri-download-manager/lomiri-download-manager.spec new file mode 100644 index 0000000000..33f1ec2878 --- /dev/null +++ b/anda/lib/lomiri-download-manager/lomiri-download-manager.spec @@ -0,0 +1,100 @@ +%global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager +%global commit 86d086292db613df0b0cbc5fc2cfcdc33c3315bb +%forgemeta + +Name: lomiri-download-manager +Version: 0.1.2 +Release: %autorelease +Summary: Upload Download Manager for Lomiri +License: LGPLv3 +URL: https://gitlab.com/ubports/development/core/lomiri-download-manager +Source0: %{url}/-/archive/%commit/lomiri-download-manager-%commit.tar.gz + +BuildRequires: systemd-rpm-macros +BuildRequires: boost-devel +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: gcc-c++ +BuildRequires: doxygen +BuildRequires: qt5-doctools +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtbase-private-devel +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(libglog) +BuildRequires: pkgconfig(liblomiri-api) + +%description +Upload Download Manager performs uploads and downloads from a centralized +location. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package doc +Summary: Documentation files for %{name} +BuildArch: noarch + +%description doc +%{name}-doc contains documentation for %{name}-devel. + +%prep +%autosetup -n lomiri-download-manager-%commit +sed -e "s/-Werror//g" -i CMakeLists.txt +sed -i 's/ -qt=qt5//' docs/qml/CMakeLists.txt + +%build +%cmake -DCMAKE_INSTALL_LIBEXECDIR=%{_libdir} -DENABLE_UBUNTU_COMPAT=ON +%cmake_build + +%install +%cmake_install +%find_lang %{name} + +%files -f %{name}.lang +%license COPYING +%{_sysconfdir}/dbus-1/system.d/*.conf +%{_bindir}/lomiri-* +%{_userunitdir}/*.service +%{_libdir}/liblomiri-download-manager-client.so.* +%{_libdir}/liblomiri-download-manager-common.so.* +%{_libdir}/liblomiri-upload-manager-common.so.* +%{_libdir}/libldm-common.so.* +%{_libdir}/libldm-priv-common.so.* +%dir %{_libdir}/lomiri-download-manager +%{_libdir}/lomiri-download-manager/ldm-extractor +%{_qt5_qmldir}/Lomiri/ +%{_qt5_qmldir}/Ubuntu/ +%{_datadir}/dbus-1/services/*.service +%{_datadir}/dbus-1/system-services/*.service + +%files devel +%dir %{_includedir}/lomiri/download_manager +%{_includedir}/lomiri/download_manager/*.h +%dir %{_includedir}/lomiri/transfers +%{_includedir}/lomiri/transfers/*.h +%dir %{_includedir}/lomiri/transfers/errors +%{_includedir}/lomiri/transfers/errors/*.h +%dir %{_includedir}/lomiri/upload_manager +%{_includedir}/lomiri/upload_manager/*.h +%{_libdir}/liblomiri-download-manager-client.so +%{_libdir}/liblomiri-download-manager-common.so +%{_libdir}/liblomiri-upload-manager-common.so +%{_libdir}/libldm-common.so +%{_libdir}/libldm-priv-common.so +%{_libdir}/pkgconfig/*.pc + +%files doc +%dir %{_docdir}/%{name} +%dir %{_docdir}/%{name}/cpp +%{_docdir}/%{name}/cpp/html/ +%dir %{_docdir}/%{name}/qml +%{_docdir}/%{name}/qml/html/ + +%changelog +%autochangelog From 23937fe2b76549978e35e4a5060ac77f3681d1d8 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Mon, 27 Mar 2023 07:52:44 -0700 Subject: [PATCH 66/82] feat: add lomiri-system-settings (#332) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/apps/lomiri-system-settings/anda.hcl | 5 + .../lomiri-system-settings.spec | 94 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 anda/apps/lomiri-system-settings/anda.hcl create mode 100644 anda/apps/lomiri-system-settings/lomiri-system-settings.spec diff --git a/anda/apps/lomiri-system-settings/anda.hcl b/anda/apps/lomiri-system-settings/anda.hcl new file mode 100644 index 0000000000..93ffdbae24 --- /dev/null +++ b/anda/apps/lomiri-system-settings/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "lomiri-system-settings.spec" + } +} diff --git a/anda/apps/lomiri-system-settings/lomiri-system-settings.spec b/anda/apps/lomiri-system-settings/lomiri-system-settings.spec new file mode 100644 index 0000000000..4a4531ca4a --- /dev/null +++ b/anda/apps/lomiri-system-settings/lomiri-system-settings.spec @@ -0,0 +1,94 @@ +%global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings +%global commit 595b25b5f6ab0fee51e084bb6b0d31ccfb719e73 +%forgemeta + +Name: lomiri-system-settings +Version: 1.0.1 +Release: %autorelease +Summary: The system settings application for Lomiri +License: GPLv3 +URL: https://gitlab.com/ubports/development/core/lomiri-system-settings +Source0: %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz +Patch0: https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch +Patch1: https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch +Patch2: https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2002_use-Noto-font-instead-of-Ubuntu-font.patch + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(upower-glib) +BuildRequires: pkgconfig(accountsservice) +BuildRequires: pkgconfig(geonames) +BuildRequires: pkgconfig(icu-i18n) +#BuildRequires: pkgconfig(libandroid-properties) +BuildRequires: pkgconfig(click-0.4) +BuildRequires: pkgconfig(gsettings-qt) +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(gnome-desktop-3.0) +BuildRequires: pkgconfig(libqtdbusmock-1) +BuildRequires: pkgconfig(libqtdbustest-1) +BuildRequires: cmake(QmlPlugins) +BuildRequires: cmake(Qt5Concurrent) +BuildRequires: cmake(Qt5Qml) +BuildRequires: qt5-qtbase-private-devel +Recommends: suru-icon-theme +Requires: maliit-keyboard +Requires: ayatana-indicator-datetime +Requires: lomiri-settings-components + +%description +The system settings application (and library) for the Lomiri desktop enviroment. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%autosetup -n lomiri-system-settings-%commit -p1 + +%build +%cmake +%cmake_build + +%install +%cmake_install +%find_lang %{name} + +%files -f %{name}.lang +%license COPYING +%{_bindir}/lomiri-system-settings +%{_libdir}/libLomiriSystemSettings.so.* +%{_libdir}/libLomiriSystemSettingsPrivate.so.* +%dir %{_libdir}/lomiri-system-settings +%{_libdir}/lomiri-system-settings/*.so +%dir %{_libdir}/lomiri-system-settings/private +%dir %{_libdir}/lomiri-system-settings/private/Lomiri +%{_libdir}/lomiri-system-settings/private/Lomiri/SystemSettings/ +%{_datadir}/applications/lomiri-system-settings.desktop +%{_datadir}/glib-2.0/schemas/com.lomiri.lomiri-system-settings.gschema.xml +%dir %{_datadir}/lomiri-system-settings +%{_datadir}/lomiri-system-settings/*.settings +%{_datadir}/lomiri-system-settings/*.svg +%{_datadir}/lomiri-system-settings/*.png +%{_datadir}/lomiri-system-settings/url-map.ini +%dir %{_datadir}/lomiri-system-settings/icons +%{_datadir}/lomiri-system-settings/icons/*.svg +%{_datadir}/lomiri-system-settings/qml-plugins/ +%{_datadir}/lomiri-url-dispatcher/urls/lomiri-system-settings.url-dispatcher + +%files devel +%dir %{_includedir}/LomiriSystemSettings +%{_includedir}/LomiriSystemSettings/*.h +%{_includedir}/LomiriSystemSettings/ItemBase +%{_includedir}/LomiriSystemSettings/PluginInterface +%dir %{_includedir}/LomiriSystemSettings/private +%{_includedir}/LomiriSystemSettings/private/*.h +%{_libdir}/libLomiriSystemSettings.so +%{_libdir}/libLomiriSystemSettingsPrivate.so +%{_libdir}/pkgconfig/LomiriSystemSettings.pc + +%changelog +%autochangelog From d1dad9000bdc666e5e7b7ca29084dc3f7d2d1e3a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 27 Mar 2023 20:36:25 +0000 Subject: [PATCH 67/82] bump: fuc --- anda/tools/fuc/fuc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/fuc/fuc.spec b/anda/tools/fuc/fuc.spec index d099a3c08e..24c04324ac 100644 --- a/anda/tools/fuc/fuc.spec +++ b/anda/tools/fuc/fuc.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: fuc -Version: 1.1.6 +Version: 1.1.7 Release: 1%{?dist} Summary: Modern, performance focused unix commands URL: https://github.com/SUPERCILEX/fuc From 6d69aa025059302bc7361333dc03fac2fd62ca4e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 28 Mar 2023 02:25:02 +0000 Subject: [PATCH 68/82] bump: groovy-docs groovy --- anda/groovy/groovy-docs/groovy-docs.spec | 2 +- anda/groovy/groovy.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/groovy/groovy-docs/groovy-docs.spec b/anda/groovy/groovy-docs/groovy-docs.spec index cdf63f56d9..3b91504b42 100644 --- a/anda/groovy/groovy-docs/groovy-docs.spec +++ b/anda/groovy/groovy-docs/groovy-docs.spec @@ -1,5 +1,5 @@ Name: groovy-docs -Version: 4.0.10 +Version: 4.0.11 Release: 1%{?dist} Summary: Documentation for the Groovy programming language URL: https://groovy-lang.org/ diff --git a/anda/groovy/groovy.spec b/anda/groovy/groovy.spec index 6773bcfc51..969056ba5f 100644 --- a/anda/groovy/groovy.spec +++ b/anda/groovy/groovy.spec @@ -1,5 +1,5 @@ Name: groovy -Version: 4.0.10 +Version: 4.0.11 Release: 1%{?dist} Summary: A multi-faceted language for the Java platform BuildArch: noarch From 23a1641a9153ceed3ab58893c8d22d0e3110cd68 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 28 Mar 2023 11:16:19 +0800 Subject: [PATCH 69/82] fix: rust-sccache (#306) --- anda/rust/sccache/rust-sccache.spec | 187 ++++++------------ .../sccache/sccache-fix-metadata-auto.diff | 8 +- 2 files changed, 62 insertions(+), 133 deletions(-) diff --git a/anda/rust/sccache/rust-sccache.spec b/anda/rust/sccache/rust-sccache.spec index d574743fc5..b722580615 100644 --- a/anda/rust/sccache/rust-sccache.spec +++ b/anda/rust/sccache/rust-sccache.spec @@ -1,13 +1,12 @@ -# Generated by rust2rpm 22 -%bcond_without check +# Generated by rust2rpm 24 # dont run brp scriptlet %undefine __brp_mangle_shebangs - +%global debug_package %{nil} %global crate sccache Name: rust-sccache Version: 0.4.1 -Release: 1%{?dist} +Release: %autorelease Summary: Ccache-like tool License: Apache-2.0 @@ -16,15 +15,12 @@ Source: %{crates_source} # Automatically generated patch to strip foreign dependencies Patch: sccache-fix-metadata-auto.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging >= 21 -BuildRequires: anda-srpm-macros -BuildRequires: openssl-devel +BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24 openssl-devel pkg-config %global _description %{expand: -Ccache-like tool. It is used as a compiler wrapper and avoids compilation when -possible, storing a cache in a remote storage using the S3 API.} +Sccache is a ccache-like tool. It is used as a compiler wrapper and +avoids compilation when possible, storing a cache in a remote storage +using various cloud storage.} %description %{_description} @@ -37,21 +33,8 @@ Summary: %{summary} %license LICENSE %doc CODE_OF_CONDUCT.md %doc README.md -#%%{_bindir}/sccache-dist %{_bindir}/sccache - - -# if x86_64 -%ifarch x86_64 -%package -n %{crate}-dist -Summary: sccache distributed server - -%description -n %{crate}-dist -Distributed server for sccache. - -%files -n %{crate}-dist %{_bindir}/sccache-dist -%endif %package devel Summary: %{summary} @@ -63,9 +46,6 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license %{crate_instdir}/LICENSE -%doc %{crate_instdir}/CODE_OF_CONDUCT.md -%doc %{crate_instdir}/README.md %{crate_instdir}/ %package -n %{name}+default-devel @@ -104,18 +84,6 @@ use the "azure" feature of the "%{crate}" crate. %files -n %{name}+azure-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+chrono-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+chrono-devel %{_description} - -This package contains library source intended for building other packages which -use the "chrono" feature of the "%{crate}" crate. - -%files -n %{name}+chrono-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+crossbeam-utils-devel Summary: %{summary} BuildArch: noarch @@ -188,16 +156,16 @@ use the "gcs" feature of the "%{crate}" crate. %files -n %{name}+gcs-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+hmac-devel +%package -n %{name}+gha-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+hmac-devel %{_description} +%description -n %{name}+gha-devel %{_description} This package contains library source intended for building other packages which -use the "hmac" feature of the "%{crate}" crate. +use the "gha" feature of the "%{crate}" crate. -%files -n %{name}+hmac-devel +%files -n %{name}+gha-devel %ghost %{crate_instdir}/Cargo.toml %package -n %{name}+hyper-devel @@ -212,18 +180,6 @@ use the "hyper" feature of the "%{crate}" crate. %files -n %{name}+hyper-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+hyperx-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+hyperx-devel %{_description} - -This package contains library source intended for building other packages which -use the "hyperx" feature of the "%{crate}" crate. - -%files -n %{name}+hyperx-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+jsonwebtoken-devel Summary: %{summary} BuildArch: noarch @@ -248,18 +204,6 @@ use the "libmount" feature of the "%{crate}" crate. %files -n %{name}+libmount-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+md-5-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+md-5-devel %{_description} - -This package contains library source intended for building other packages which -use the "md-5" feature of the "%{crate}" crate. - -%files -n %{name}+md-5-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+memcached-devel Summary: %{summary} BuildArch: noarch @@ -272,18 +216,6 @@ use the "memcached" feature of the "%{crate}" crate. %files -n %{name}+memcached-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+memcached-rs-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+memcached-rs-devel %{_description} - -This package contains library source intended for building other packages which -use the "memcached-rs" feature of the "%{crate}" crate. - -%files -n %{name}+memcached-rs-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+native-zlib-devel Summary: %{summary} BuildArch: noarch @@ -308,28 +240,28 @@ use the "nix" feature of the "%{crate}" crate. %files -n %{name}+nix-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+openssl-devel +%package -n %{name}+opendal-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+openssl-devel %{_description} +%description -n %{name}+opendal-devel %{_description} This package contains library source intended for building other packages which -use the "openssl" feature of the "%{crate}" crate. +use the "opendal" feature of the "%{crate}" crate. -%files -n %{name}+openssl-devel +%files -n %{name}+opendal-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+percent-encoding-devel +%package -n %{name}+openssl-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+percent-encoding-devel %{_description} +%description -n %{name}+openssl-devel %{_description} This package contains library source intended for building other packages which -use the "percent-encoding" feature of the "%{crate}" crate. +use the "openssl" feature of the "%{crate}" crate. -%files -n %{name}+percent-encoding-devel +%files -n %{name}+openssl-devel %ghost %{crate_instdir}/Cargo.toml %package -n %{name}+redis-devel @@ -344,28 +276,28 @@ use the "redis" feature of the "%{crate}" crate. %files -n %{name}+redis-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+reqwest-devel +%package -n %{name}+reqsign-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+reqwest-devel %{_description} +%description -n %{name}+reqsign-devel %{_description} This package contains library source intended for building other packages which -use the "reqwest" feature of the "%{crate}" crate. +use the "reqsign" feature of the "%{crate}" crate. -%files -n %{name}+reqwest-devel +%files -n %{name}+reqsign-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+ring-devel +%package -n %{name}+reqwest-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+ring-devel %{_description} +%description -n %{name}+reqwest-devel %{_description} This package contains library source intended for building other packages which -use the "ring" feature of the "%{crate}" crate. +use the "reqwest" feature of the "%{crate}" crate. -%files -n %{name}+ring-devel +%files -n %{name}+reqwest-devel %ghost %{crate_instdir}/Cargo.toml %package -n %{name}+rouille-devel @@ -392,18 +324,6 @@ use the "s3" feature of the "%{crate}" crate. %files -n %{name}+s3-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+sha-1-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+sha-1-devel %{_description} - -This package contains library source intended for building other packages which -use the "sha-1" feature of the "%{crate}" crate. - -%files -n %{name}+sha-1-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+sha2-devel Summary: %{summary} BuildArch: noarch @@ -416,18 +336,6 @@ use the "sha2" feature of the "%{crate}" crate. %files -n %{name}+sha2-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+simple-s3-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+simple-s3-devel %{_description} - -This package contains library source intended for building other packages which -use the "simple-s3" feature of the "%{crate}" crate. - -%files -n %{name}+simple-s3-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+syslog-devel Summary: %{summary} BuildArch: noarch @@ -464,6 +372,18 @@ use the "url" feature of the "%{crate}" crate. %files -n %{name}+url-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+vendored-openssl-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+vendored-openssl-devel %{_description} + +This package contains library source intended for building other packages which +use the "vendored-openssl" feature of the "%{crate}" crate. + +%files -n %{name}+vendored-openssl-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+version-compare-devel Summary: %{summary} BuildArch: noarch @@ -488,24 +408,33 @@ use the "void" feature of the "%{crate}" crate. %files -n %{name}+void-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+webdav-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+webdav-devel %{_description} + +This package contains library source intended for building other packages which +use the "webdav" feature of the "%{crate}" crate. + +%files -n %{name}+webdav-devel +%ghost %{crate_instdir}/Cargo.toml + %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep_online %build -%ifarch x86_64 -%cargo_build -a -%else -%cargo_build -%endif +%cargo_build -f dist-server %install -%ifarch x86_64 -%cargo_install -a -%else -%cargo_install -%endif +%cargo_install -f dist-server +%if %{with check} +%check +%cargo_test -f dist-server +%endif + %changelog %autochangelog diff --git a/anda/rust/sccache/sccache-fix-metadata-auto.diff b/anda/rust/sccache/sccache-fix-metadata-auto.diff index 77ca79a9e6..25722f92b6 100644 --- a/anda/rust/sccache/sccache-fix-metadata-auto.diff +++ b/anda/rust/sccache/sccache-fix-metadata-auto.diff @@ -1,8 +1,8 @@ ---- sccache-0.3.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ sccache-0.3.1/Cargo.toml 1970-01-01T00:00:01+00:00 -@@ -402,14 +402,3 @@ +--- sccache-0.4.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sccache-0.4.1/Cargo.toml 2023-03-27T14:56:08.411559+00:00 +@@ -358,14 +358,3 @@ [target."cfg(unix)".dependencies.daemonize] - version = "0.4" + version = "0.5" -[target."cfg(windows)".dependencies.parity-tokio-ipc] -version = "0.9" From c5b293dd8847fc3c174e0f4429d2fe4414a72842 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 28 Mar 2023 15:16:57 +0000 Subject: [PATCH 70/82] bump: orjson --- anda/python/orjson/python3-orjson.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/python/orjson/python3-orjson.spec b/anda/python/orjson/python3-orjson.spec index 60f35f6b37..166fe57afd 100644 --- a/anda/python/orjson/python3-orjson.spec +++ b/anda/python/orjson/python3-orjson.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: python3-orjson -Version: 3.8.8 +Version: 3.8.9 Release: 1%{?dist} Summary: Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy License: MIT or APACHE-2.0 From 004e49d8446a841aa8da2d7a94c69da949e92ceb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 28 Mar 2023 16:26:45 +0000 Subject: [PATCH 71/82] bump: xyproto-vt100 --- anda/go/xyproto-vt100/golang-github-xyproto-vt100.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/go/xyproto-vt100/golang-github-xyproto-vt100.spec b/anda/go/xyproto-vt100/golang-github-xyproto-vt100.spec index eb93a572b9..50315791d0 100644 --- a/anda/go/xyproto-vt100/golang-github-xyproto-vt100.spec +++ b/anda/go/xyproto-vt100/golang-github-xyproto-vt100.spec @@ -3,7 +3,7 @@ # https://github.com/xyproto/vt100 %global goipath github.com/xyproto/vt100 -Version: 1.11.3 +Version: 1.11.4 # REMOVE BEFORE SUBMITTING THIS FOR REVIEW # --- @@ -24,7 +24,7 @@ Version: 1.11.3 %global godocs TODO.md README.md cmd/widget/README.md Name: golang-%{goname} -Release: %autorelease +Release: 1%{?dist} Summary: :computer: VT100 Terminal Package License: # FIXME From baf81c7712d3686e7f770a93eb2a4f3a30a93b5c Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 29 Mar 2023 06:23:38 +0800 Subject: [PATCH 72/82] fix: linting and license representations (#325) * chore: fix linting warnings * chore: fix license repr --- anda/apps/anki-bin/anki-bin.spec | 2 +- anda/apps/anki-qt5/anki-qt5.spec | 2 +- anda/apps/anki/anki.spec | 4 +- anda/apps/authy/authy.spec | 2 +- .../discord-canary-openasar.spec | 2 +- .../discord-openasar/discord-openasar.spec | 2 +- .../discord-ptb-openasar.spec | 2 +- .../vala-panel-appmenu.spec | 4 +- anda/apps/vala-panel/vala-panel.spec | 2 +- anda/audio/distrho/distrho.spec | 2 +- .../budgie/budgie-extras/budgie-extras.spec | 2 +- anda/desktops/compiz9/compiz9.spec | 6 +- .../elementary-calculator.spec | 2 +- .../elementary-calendar.spec | 2 +- .../elementary-camera/elementary-camera.spec | 2 +- .../elementary-capnet-assist.spec | 2 +- .../elementary-code/elementary-code.spec | 2 +- .../elementary-files/elementary-files.spec | 2 +- .../elementary-greeter.spec | 2 +- .../elementary-icon-theme.spec | 2 +- .../elementary-music/elementary-music.spec | 2 +- .../elementary-notifications.spec | 2 +- .../elementary-onboarding.spec | 2 +- .../elementary-photos/elementary-photos.spec | 2 +- .../elementary-print/elementary-print.spec | 2 +- .../elementary-screenshot-tool.spec | 2 +- .../elementary-settings-daemon.spec | 2 +- .../elementary-shortcut-overlay.spec | 2 +- .../elementary-sideload.spec | 2 +- .../elementary-sound-theme.spec | 2 +- .../elementary-terminal.spec | 2 +- .../elementary-theme/elementary-theme.spec | 2 +- .../elementary-videos/elementary-videos.spec | 2 +- .../elementary-wallpapers.spec | 2 +- anda/desktops/elementary/gala/gala.spec | 2 +- .../elementary/granite-7/granite-7.spec | 2 +- .../pantheon-agent-geoclue2.spec | 2 +- .../pantheon-agent-polkit.spec | 2 +- .../pantheon-session-settings.spec | 2 +- .../switchboard-plug-a11y.spec | 2 +- .../switchboard-plug-about.spec | 2 +- .../switchboard-plug-applications.spec | 2 +- .../switchboard-plug-bluetooth.spec | 2 +- .../switchboard-plug-display.spec | 2 +- .../switchboard-plug-keyboard.spec | 2 +- .../switchboard-plug-mouse-touchpad.spec | 2 +- .../switchboard-plug-networking.spec | 2 +- .../switchboard-plug-notifications.spec | 2 +- .../switchboard-plug-onlineaccounts.spec | 2 +- .../switchboard-plug-pantheon-shell.spec | 2 +- .../switchboard-plug-printers.spec | 2 +- .../switchboard-plug-sharing.spec | 2 +- .../switchboard-plug-sound.spec | 2 +- .../switchboard-plug-tweaks.spec | 2 +- .../elementary/switchboard/switchboard.spec | 2 +- .../wingpanel-applications-menu.spec | 2 +- .../wingpanel-indicator-bluetooth.spec | 2 +- .../wingpanel-indicator-datetime.spec | 2 +- .../wingpanel-indicator-keyboard.spec | 2 +- .../wingpanel-indicator-network.spec | 2 +- .../wingpanel-indicator-nightlight.spec | 2 +- .../wingpanel-indicator-notifications.spec | 2 +- .../wingpanel-indicator-power.spec | 2 +- .../wingpanel-indicator-session.spec | 2 +- .../wingpanel-indicator-sound.spec | 2 +- .../elementary/wingpanel/wingpanel.spec | 2 +- .../latte-dock-nightly.spec | 2 +- anda/desktops/unity-shell/unity-shell.spec | 104 +++++++++--------- anda/desktops/unityx-shell/unityx-shell.spec | 24 ++-- anda/fonts/arphic-ukai/arphic-ukai-fonts.spec | 2 +- .../arphic-uming/arphic-uming-fonts.spec | 2 +- anda/fonts/hannom/hannom-fonts.spec | 2 +- .../iosevka-fusion/iosevka-fusion-fonts.spec | 2 +- .../kanjistrokeorders-fonts.spec | 2 +- anda/fonts/manrope/manrope-fonts.spec | 2 +- .../mini-wakuwaku/mini-wakuwaku-fonts.spec | 2 +- anda/fonts/naikai/naikai-fonts.spec | 2 +- anda/fonts/nerd-fonts/nerd-fonts.spec | 2 +- anda/fonts/seto/seto-fonts.spec | 2 +- anda/games/opsu/opsu.spec | 2 +- anda/games/osu-lazer/osu-lazer.spec | 2 +- anda/games/osu-mime/osu-mime.spec | 2 +- .../golang-github-xyproto-gendesk.spec | 10 -- .../golang-github-xyproto-textoutput.spec | 10 -- .../golang-github-xyproto-vt100.spec | 18 +-- .../golang-github-yhat-scrape.spec | 10 -- anda/lib/cmake-extras/cmake-extras.spec | 2 +- .../dbus-test-runner/dbus-test-runner.spec | 2 +- anda/lib/frame/frame.spec | 6 +- anda/lib/geis/geis.spec | 6 +- anda/lib/geonames/geonames.spec | 2 +- anda/lib/glewmx/glewmx.spec | 28 ++--- anda/lib/grail/grail.spec | 42 +++---- anda/lib/gsettings-qt/gsettings-qt.spec | 2 +- anda/lib/libbismuth/libbismuth.spec | 2 +- anda/lib/libhelium/libhelium.spec | 2 +- anda/lib/libindicator/libindicator.spec | 31 +++--- anda/lib/libunity-misc/libunity-misc.spec | 40 +++---- anda/lib/libunity/libunity.spec | 2 +- anda/lib/lomiri-api/lomiri-api.spec | 2 +- .../lomiri-app-launch/lomiri-app-launch.spec | 2 +- .../lomiri-ui-toolkit/lomiri-ui-toolkit.spec | 2 +- .../lomiri-url-dispatcher.spec | 2 +- anda/lib/marble-gtk/marble-gtk.spec | 2 +- anda/lib/nux/nux.spec | 2 +- anda/lib/process-cpp/process-cpp.spec | 2 +- .../properties-cpp-devel.spec | 2 +- anda/lib/qt5-pim/qt5-pim.spec | 2 +- anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec | 2 +- anda/lib/qt5-qtsystems/qt5-qtsystems.spec | 2 +- anda/lib/qtdbusmock/qtdbusmock.spec | 2 +- .../unity-settings-daemon.spec | 2 +- .../blackbox-terminal/blackbox-terminal.spec | 2 +- anda/others/click/click.spec | 2 +- .../gsettings-ubuntu-touch-schemas.spec | 2 +- .../others/lomiri-schemas/lomiri-schemas.spec | 2 +- anda/others/tau-helium/tau-helium.spec | 2 +- anda/others/tau-hydrogen/tau-hydrogen.spec | 2 +- anda/others/ubuntu-sdk/ubuntu-sdk.spec | 2 +- anda/others/unity-greeter/unity-greeter.spec | 2 +- .../unity-scope-home/unity-scope-home.spec | 2 +- anda/others/unity-session/unity-session.spec | 2 +- anda/python/orjson/python3-orjson.spec | 2 +- anda/rust/pop-launcher/pop-launcher.spec | 2 +- anda/rust/rnote/rnote.spec | 2 +- .../adwaita++-icons/adwaita++-icons.spec | 2 +- .../bibata-cursor-theme.spec | 2 +- anda/tools/graalvm/graalvm.spec | 2 +- anda/tools/melody/melody.spec | 4 +- anda/tools/muon/muon.spec | 2 +- .../vala-language-server-nightly.spec | 2 +- .../vala-lint-nightly/vala-lint-nightly.spec | 2 +- 132 files changed, 269 insertions(+), 310 deletions(-) diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec index bb9905d4b5..a58a337069 100644 --- a/anda/apps/anki-bin/anki-bin.spec +++ b/anda/apps/anki-bin/anki-bin.spec @@ -2,7 +2,7 @@ Name: anki-bin Version: 2.1.60 Release: 1%{?dist} Summary: Flashcard program for using space repetition learning (Installed with wheel) -License: AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY +License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 URL: https://apps.ankiweb.net/ BuildRequires: python3-installer python3.11 Requires: hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash diff --git a/anda/apps/anki-qt5/anki-qt5.spec b/anda/apps/anki-qt5/anki-qt5.spec index 7bd1b00375..8015ef7e91 100644 --- a/anda/apps/anki-qt5/anki-qt5.spec +++ b/anda/apps/anki-qt5/anki-qt5.spec @@ -2,7 +2,7 @@ Name: anki-qt5 Version: 2.1.60 Release: 1%{?dist} Summary: Flashcard program for using space repetition learning -License: AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY +License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 URL: https://apps.ankiweb.net/ BuildRequires: python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson python3-pyqt5-sip diff --git a/anda/apps/anki/anki.spec b/anda/apps/anki/anki.spec index 48604ddc05..1e30ac991a 100644 --- a/anda/apps/anki/anki.spec +++ b/anda/apps/anki/anki.spec @@ -2,7 +2,7 @@ Name: anki Version: 2.1.60 Release: 1%{?dist} Summary: Flashcard program for using space repetition learning -License: AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY +License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 URL: https://apps.ankiweb.net/ BuildRequires: python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson @@ -62,5 +62,5 @@ chmod 755 %{buildroot}%{_bindir}/anki %changelog -* Tue Jan 3 2023 windowsboy111 +* Tue Jan 3 2023 windowsboy111 - 2.1.60 - Initial package diff --git a/anda/apps/authy/authy.spec b/anda/apps/authy/authy.spec index 9e049009f3..2b1db7031c 100644 --- a/anda/apps/authy/authy.spec +++ b/anda/apps/authy/authy.spec @@ -2,7 +2,7 @@ Name: authy Version: 2.2.3 Release: 1%{?dist} Summary: Two factor authentication desktop application -License: Unknown +License: Unlicense URL: https://authy.com/ Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_18.snap Requires: gtk3 diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index c9a81dca4c..18be5d8675 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -4,7 +4,7 @@ Name: discord-canary-openasar Version: 0.0.150 Release: 1%{?dist} Summary: OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming -License: MIT and https://discord.com/terms +License: MIT AND https://discord.com/terms URL: https://github.com/GooseMod/OpenAsar Source0: https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz Source1: %{url}/releases/download/nightly/app.asar diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index 67fc35b1ec..22787cc172 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -4,7 +4,7 @@ Name: discord-openasar Version: 0.0.25 Release: 1%{?dist} Summary: OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming -License: MIT and https://discord.com/terms +License: MIT AND https://discord.com/terms URL: https://github.com/GooseMod/OpenAsar Source0: https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz Source1: %{url}/releases/download/nightly/app.asar diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index 01a9e84946..85b8103ddd 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -4,7 +4,7 @@ Name: discord-ptb-openasar Version: 0.0.41 Release: 1%{?dist} Summary: OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming -License: MIT and https://discord.com/terms +License: MIT AND https://discord.com/terms URL: https://github.com/GooseMod/OpenAsar Source0: https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz Source1: %{url}/releases/download/nightly/app.asar diff --git a/anda/apps/vala-panel-appmenu/vala-panel-appmenu.spec b/anda/apps/vala-panel-appmenu/vala-panel-appmenu.spec index a5a780a2c1..fa7397396c 100644 --- a/anda/apps/vala-panel-appmenu/vala-panel-appmenu.spec +++ b/anda/apps/vala-panel-appmenu/vala-panel-appmenu.spec @@ -5,7 +5,7 @@ Name: vala-panel-appmenu Version: 0.7.6 Release: %autorelease -License: LGPL-3.0+ +License: LGPL-3.0-or-later Summary: This package provides Application Menu plugin for vala-panel URL: %{forgeurl} Source: %{forgesource} @@ -31,7 +31,7 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(dbusmenu-glib-0.4) BuildRequires: pkgconfig(vala-panel) BuildRequires: pkgconfig(libmatepanelapplet-4.0) -Provides: vala-panel-appmenu-plugin +Provides: vala-panel-appmenu-plugin = %{version} Requires: unity-gtk3-module Requires: unity-gtk2-module Requires: bamf-daemon diff --git a/anda/apps/vala-panel/vala-panel.spec b/anda/apps/vala-panel/vala-panel.spec index 445dc5c43a..b62d2f0856 100644 --- a/anda/apps/vala-panel/vala-panel.spec +++ b/anda/apps/vala-panel/vala-panel.spec @@ -6,7 +6,7 @@ Name: vala-panel Version: 0.5.0 Release: %autorelease -License: LGPL-3.0+ +License: LGPL-3.0-or-later Summary: This package provides Application Menu plugin for vala-panel URL: %{forgeurl} Source: %{forgesource} diff --git a/anda/audio/distrho/distrho.spec b/anda/audio/distrho/distrho.spec index d576f5bd61..5233d4351c 100644 --- a/anda/audio/distrho/distrho.spec +++ b/anda/audio/distrho/distrho.spec @@ -9,7 +9,7 @@ Version: 0 Release: 0.1.%{rel_tag}%{?dist} Summary: Linux audio plugins ports URL: https://distrho.sourceforge.io/ports.php -License: GPLv2 and GPLv3 and MIT +License: GPL-2.0 AND GPL-3.0 AND MIT Source0: https://github.com/DISTRHO/DISTRHO-Ports/archive/refs/tags/2021-03-15.tar.gz diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index cbdcc3c7ec..7c27624b7b 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -3,7 +3,7 @@ Name: budgie-extras Version: 1.6.0 Release: 1%{?dist} -License: GPLv3 +License: GPL-3.0 Summary: Additional Budgie Desktop enhancements for user experience URL: https://ubuntubudgie.org/ diff --git a/anda/desktops/compiz9/compiz9.spec b/anda/desktops/compiz9/compiz9.spec index 6892e32632..3b36c9942d 100644 --- a/anda/desktops/compiz9/compiz9.spec +++ b/anda/desktops/compiz9/compiz9.spec @@ -6,7 +6,7 @@ Version: 0.9.14.2 Release: %autorelease Summary: OpenGL window and compositing manager 0.9.X.X series -License: GPLv2+ AND LGPLv2+ AND MIT +License: GPL-2.0-or-later AND LGPL-2.0-or-later AND MIT URL: https://launchpad.net/compiz Source0: http://archive.ubuntu.com/ubuntu/pool/universe/c/compiz/compiz_%{version}+%{_ubuntu_rel}.tar.xz Patch0: https://raw.githubusercontent.com/cat-master21/unityDE-specs/main/patches/compiz-cmake-install-path.patch @@ -57,8 +57,8 @@ Requires: metacity Requires: glx-utils %package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package contains the development files for %{name}. diff --git a/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec b/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec index 010e75a16d..1002047e74 100644 --- a/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec +++ b/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec @@ -5,7 +5,7 @@ Name: elementary-calculator Summary: Calculator app designed for elementary Version: 2.0.1 Release: %autorelease -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec b/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec index 955fad00da..b7eae6dc28 100644 --- a/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec +++ b/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec @@ -7,7 +7,7 @@ Name: elementary-calendar Summary: Desktop calendar app designed for elementary Version: 6.1.2 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/calendar Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-camera/elementary-camera.spec b/anda/desktops/elementary/elementary-camera/elementary-camera.spec index 2ef39495d9..081f7267ca 100644 --- a/anda/desktops/elementary/elementary-camera/elementary-camera.spec +++ b/anda/desktops/elementary/elementary-camera/elementary-camera.spec @@ -5,7 +5,7 @@ Name: elementary-camera Summary: Camera app designed for elementary Version: 6.2.1 Release: 1%{?dist} -License: GPLv3 +License: GPL-3.0 URL: https://github.com/elementary/camera Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec b/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec index ee454f0ba7..dbeeb6cbc0 100644 --- a/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec +++ b/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec @@ -5,7 +5,7 @@ Name: elementary-capnet-assist Summary: Captive Portal Assistant for elementary Version: 2.4.3 Release: 2%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/capnet-assist Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-code/elementary-code.spec b/anda/desktops/elementary/elementary-code/elementary-code.spec index bb466f041b..042719fae8 100644 --- a/anda/desktops/elementary/elementary-code/elementary-code.spec +++ b/anda/desktops/elementary/elementary-code/elementary-code.spec @@ -7,7 +7,7 @@ Name: elementary-code Summary: Code editor from elementary Version: 7.0.0 Release: 2%{?dist} -License: GPLv3 +License: GPL-3.0 URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-files/elementary-files.spec b/anda/desktops/elementary/elementary-files/elementary-files.spec index c50a1f342f..ad2bd69f53 100644 --- a/anda/desktops/elementary/elementary-files/elementary-files.spec +++ b/anda/desktops/elementary/elementary-files/elementary-files.spec @@ -7,7 +7,7 @@ Name: elementary-files Summary: File manager from elementary Version: 6.3.0 Release: 1%{?dist} -License: GPLv3 +License: GPL-3.0 URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec index 0751b5f049..8d312b4a4c 100644 --- a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec +++ b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec @@ -5,7 +5,7 @@ Name: elementary-greeter Summary: LightDM Login Screen for the elementary desktop Version: 6.1.1 Release: %autorelease -License: GPLv3 +License: GPL-3.0 URL: https://github.com/elementary/greeter Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec b/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec index 8338cd1ae2..c117ef41c1 100644 --- a/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec +++ b/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec @@ -5,7 +5,7 @@ Name: elementary-icon-theme Summary: Icons from the Elementary Project Version: 7.2.0 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/icons Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-music/elementary-music.spec b/anda/desktops/elementary/elementary-music/elementary-music.spec index 9554fa8dfd..958736cf3d 100644 --- a/anda/desktops/elementary/elementary-music/elementary-music.spec +++ b/anda/desktops/elementary/elementary-music/elementary-music.spec @@ -12,7 +12,7 @@ Name: elementary-music Summary: Music player and library from elementary Version: 7.0.1 Release: 2%{?dist} -License: LGPLv2+ +License: LGPL-2.0-or-later URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-notifications/elementary-notifications.spec b/anda/desktops/elementary/elementary-notifications/elementary-notifications.spec index 33348b8bea..77d04018e6 100644 --- a/anda/desktops/elementary/elementary-notifications/elementary-notifications.spec +++ b/anda/desktops/elementary/elementary-notifications/elementary-notifications.spec @@ -7,7 +7,7 @@ Version: 6.0.3 Release: 1%{?dist} Summary: GTK Notification server for Pantheon -License: GPLv3 +License: GPL-3.0 URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/refs/tags/%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec b/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec index 8a4301b3c7..15ce8150d2 100644 --- a/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec +++ b/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec @@ -5,7 +5,7 @@ Name: elementary-onboarding Summary: Onboarding app for new users Version: 7.0.1 Release: %autorelease -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/onboarding Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-photos/elementary-photos.spec b/anda/desktops/elementary/elementary-photos/elementary-photos.spec index 8c222db626..459569ea0e 100644 --- a/anda/desktops/elementary/elementary-photos/elementary-photos.spec +++ b/anda/desktops/elementary/elementary-photos/elementary-photos.spec @@ -7,7 +7,7 @@ Name: elementary-photos Summary: Photo manager and viewer from elementary Version: 2.8.0 Release: %autorelease -License: LGPLv2+ +License: LGPL-2.0-or-later URL: https://github.com/elementary/photos Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-print/elementary-print.spec b/anda/desktops/elementary/elementary-print/elementary-print.spec index 0637427ad3..db420894e2 100644 --- a/anda/desktops/elementary/elementary-print/elementary-print.spec +++ b/anda/desktops/elementary/elementary-print/elementary-print.spec @@ -5,7 +5,7 @@ Name: elementary-print Summary: Simple shim for printing support via Contractor Version: 0.1.3 Release: 9%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec b/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec index 2051c1a3c3..27ef28773b 100644 --- a/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec +++ b/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec @@ -5,7 +5,7 @@ Name: elementary-screenshot-tool Summary: Screenshot tool designed for elementary Version: 6.0.3 Release: 1%{?dist} -License: LGPLv3 +License: LGPL-3.0 URL: https://github.com/elementary/screenshot Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec b/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec index 93ab0fdc99..84537444bd 100644 --- a/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec +++ b/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec @@ -6,7 +6,7 @@ Name: elementary-settings-daemon Version: 1.2.0 Release: 2%{?dist} Summary: Settings Daemon and Portal for Pantheon -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/settings-daemon Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec b/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec index ce3bb6c8bb..50e37cbf98 100644 --- a/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec +++ b/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec @@ -5,7 +5,7 @@ Name: elementary-shortcut-overlay Summary: Native, OS-wide shortcut overlay Version: 2.0.1 Release: %autorelease -License: GPLv3 +License: GPL-3.0 URL: https://github.com/elementary/shortcut-overlay Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec index 6cd235db03..1ffdb4e0f4 100644 --- a/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec +++ b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec @@ -5,7 +5,7 @@ Name: elementary-sideload Summary: Sideload flatpaks on Pantheon Version: 6.1.0 Release: %autorelease -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/sideload Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-sound-theme/elementary-sound-theme.spec b/anda/desktops/elementary/elementary-sound-theme/elementary-sound-theme.spec index 292216e503..471b3c3e6e 100644 --- a/anda/desktops/elementary/elementary-sound-theme/elementary-sound-theme.spec +++ b/anda/desktops/elementary/elementary-sound-theme/elementary-sound-theme.spec @@ -4,7 +4,7 @@ Name: elementary-sound-theme Summary: Set of system sounds for elementary Version: 1.1.0 Release: %autorelease -License: Unlicense and CC-BY +License: Unlicense AND CC-BY-4.0 # Unlicense: # - audio-volume-change diff --git a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec index 1de5dad757..ef1b61538f 100644 --- a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec +++ b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec @@ -5,7 +5,7 @@ Name: elementary-terminal Summary: The terminal of the 21st century Version: 6.1.1 Release: 1%{?dist} -License: LGPLv3 +License: LGPL-3.0 URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-theme/elementary-theme.spec b/anda/desktops/elementary/elementary-theme/elementary-theme.spec index 7637dacc54..b6cfeb8fbe 100644 --- a/anda/desktops/elementary/elementary-theme/elementary-theme.spec +++ b/anda/desktops/elementary/elementary-theme/elementary-theme.spec @@ -5,7 +5,7 @@ Name: elementary-theme Summary: elementary GTK+ Stylesheet Version: 7.1.0 Release: 1%{?dist} -License: GPLv3 +License: GPL-3.0 URL: https://github.com/elementary/stylesheet Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-videos/elementary-videos.spec b/anda/desktops/elementary/elementary-videos/elementary-videos.spec index a3098a2edc..ce0ab319c6 100644 --- a/anda/desktops/elementary/elementary-videos/elementary-videos.spec +++ b/anda/desktops/elementary/elementary-videos/elementary-videos.spec @@ -5,7 +5,7 @@ Name: elementary-videos Summary: Video player and library app from elementary Version: 2.9.0 Release: 2%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/elementary-wallpapers/elementary-wallpapers.spec b/anda/desktops/elementary/elementary-wallpapers/elementary-wallpapers.spec index df64ebd8fb..669128b960 100644 --- a/anda/desktops/elementary/elementary-wallpapers/elementary-wallpapers.spec +++ b/anda/desktops/elementary/elementary-wallpapers/elementary-wallpapers.spec @@ -7,7 +7,7 @@ Version: 7.0.0 Release: 1%{?dist} # License breakdown is available in debian/copyright -License: Public Domain +License: CC-BY-SA-4.0 AND CC0-1.0 AND Unlicense URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz diff --git a/anda/desktops/elementary/gala/gala.spec b/anda/desktops/elementary/gala/gala.spec index 35dd6b1433..b79f96c654 100644 --- a/anda/desktops/elementary/gala/gala.spec +++ b/anda/desktops/elementary/gala/gala.spec @@ -4,7 +4,7 @@ Name: gala Summary: Gala window manager Version: 7.0.1 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/gala Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz diff --git a/anda/desktops/elementary/granite-7/granite-7.spec b/anda/desktops/elementary/granite-7/granite-7.spec index c9479e1159..29bb3955d5 100644 --- a/anda/desktops/elementary/granite-7/granite-7.spec +++ b/anda/desktops/elementary/granite-7/granite-7.spec @@ -7,7 +7,7 @@ Name: granite-7 Summary: elementary companion library for GTK+ and GLib Version: 7.2.0 Release: 1%{?dist} -License: LGPLv3+ +License: LGPL-3.0-or-later URL: https://github.com/elementary/granite Source0: %{url}/archive/%{version}/granite-%{version}.tar.gz diff --git a/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec b/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec index 3d730c0623..dffebcbc1c 100644 --- a/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec +++ b/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec @@ -5,7 +5,7 @@ Name: pantheon-agent-geoclue2 Summary: Pantheon Geoclue2 Agent Version: 1.0.6 Release: %autorelease -License: GPLv3 +License: GPL-3.0 URL: https://github.com/elementary/pantheon-agent-geoclue2 Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec b/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec index 498eae00d5..c7e06f09bb 100644 --- a/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec +++ b/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec @@ -5,7 +5,7 @@ Name: pantheon-agent-polkit Summary: Pantheon Polkit Agent Version: 1.0.5 Release: 2%{?dist} -License: LGPLv2+ +License: LGPL-2.0-or-later URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/pantheon-session-settings/pantheon-session-settings.spec b/anda/desktops/elementary/pantheon-session-settings/pantheon-session-settings.spec index e0b8a7deb7..de173d65ad 100644 --- a/anda/desktops/elementary/pantheon-session-settings/pantheon-session-settings.spec +++ b/anda/desktops/elementary/pantheon-session-settings/pantheon-session-settings.spec @@ -4,7 +4,7 @@ Name: pantheon-session-settings Summary: Pantheon session configuration files Version: 35.0 Release: 2%{?dist} -License: GPLv3 +License: GPL-3.0 URL: https://pagure.io/pantheon-fedora/session-settings Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec b/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec index 9fc71802dc..f0a48feb9e 100644 --- a/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec +++ b/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-a11y Summary: Switchboard Accessibility plug Version: 2.3.0 Release: 4%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/switchboard-plug-a11y Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec b/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec index 9c44173d44..55ff965a26 100644 --- a/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec +++ b/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-about Summary: Switchboard System Information plug Version: 6.2.0 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/switchboard-plug-about Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec b/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec index 3473becd2a..d99a34297a 100644 --- a/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec +++ b/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-applications Summary: Switchboard Applications plug Version: 6.0.1 Release: 3%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/switchboard-plug-applications Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-bluetooth/switchboard-plug-bluetooth.spec b/anda/desktops/elementary/switchboard-plug-bluetooth/switchboard-plug-bluetooth.spec index 1efad9120b..694e90a263 100644 --- a/anda/desktops/elementary/switchboard-plug-bluetooth/switchboard-plug-bluetooth.spec +++ b/anda/desktops/elementary/switchboard-plug-bluetooth/switchboard-plug-bluetooth.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-bluetooth Summary: Switchboard Bluetooth plug Version: 2.3.6 Release: 4%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/switchboard-plug-bluetooth Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec b/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec index 56e5e5615e..16ed35e2c7 100644 --- a/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec +++ b/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-display Summary: Switchboard Display plug Version: 2.3.3 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/switchboard-plug-display Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec b/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec index 63a48b3e99..a6030a4262 100644 --- a/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec +++ b/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-keyboard Summary: Switchboard Keyboard plug Version: 3.1.1 Release: %autorelease -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/switchboard-plug-keyboard Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-mouse-touchpad/switchboard-plug-mouse-touchpad.spec b/anda/desktops/elementary/switchboard-plug-mouse-touchpad/switchboard-plug-mouse-touchpad.spec index bc31a490a3..242152e3c3 100644 --- a/anda/desktops/elementary/switchboard-plug-mouse-touchpad/switchboard-plug-mouse-touchpad.spec +++ b/anda/desktops/elementary/switchboard-plug-mouse-touchpad/switchboard-plug-mouse-touchpad.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-mouse-touchpad Summary: Switchboard Mouse and Touchpad plug Version: 7.0.0 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/switchboard-plug-mouse-touchpad Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec b/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec index 35815450d9..f9d8e084ea 100644 --- a/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec +++ b/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-networking Summary: Switchboard Networking plug Version: 2.4.4 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/switchboard-plug-network Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec b/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec index f756c48071..bf9f280f67 100644 --- a/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec +++ b/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-notifications Summary: Switchboard Notifications plug Version: 2.2.0 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/switchboard-plug-notifications Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec index 4cacd7c515..dc3a8ad616 100644 --- a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec +++ b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec @@ -8,7 +8,7 @@ Name: switchboard-plug-onlineaccounts Summary: Switchboard Online Accounts plug Version: 6.5.1 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/switchboard-plug-onlineaccounts Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec b/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec index abf8415f8f..0711297875 100644 --- a/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec +++ b/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-pantheon-shell Summary: Switchboard Pantheon Shell plug Version: 6.3.1 Release: 1%{?dist} -License: GPLv3 +License: GPL-3.0 URL: https://github.com/elementary/switchboard-plug-pantheon-shell Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec b/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec index d1a6cfc636..e2cd3cb9e9 100644 --- a/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec +++ b/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-printers Summary: Switchboard Printers Plug Version: 2.2.1 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/switchboard-plug-printers Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-sharing/switchboard-plug-sharing.spec b/anda/desktops/elementary/switchboard-plug-sharing/switchboard-plug-sharing.spec index 78e4ca0f38..ca14678333 100644 --- a/anda/desktops/elementary/switchboard-plug-sharing/switchboard-plug-sharing.spec +++ b/anda/desktops/elementary/switchboard-plug-sharing/switchboard-plug-sharing.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-sharing Summary: Switchboard Sharing Plug Version: 2.1.6 Release: 1%{?dist} -License: GPLv3 +License: GPL-3.0 URL: https://github.com/elementary/switchboard-plug-sharing Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec b/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec index 6866240a5a..bcdd72aefe 100644 --- a/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec +++ b/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec @@ -10,7 +10,7 @@ Name: switchboard-plug-sound Summary: Switchboard Sound Plug Version: 2.3.2 Release: %autorelease -License: LGPLv2+ +License: LGPL-2.0-or-later URL: https://github.com/elementary/switchboard-plug-sound Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec b/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec index 4652acabcb..51a871602e 100644 --- a/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec +++ b/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec @@ -7,7 +7,7 @@ Name: switchboard-plug-tweaks Summary: Switchboard Tweaks Plug Version: 1.1.0 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/pantheon-tweaks/pantheon-tweaks Source0: %{url}/archive/%{version}/%{plug_name}-%{version}.tar.gz diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec index ebfd913598..d3120644b6 100644 --- a/anda/desktops/elementary/switchboard/switchboard.spec +++ b/anda/desktops/elementary/switchboard/switchboard.spec @@ -5,7 +5,7 @@ Name: switchboard Summary: Modular Desktop Settings Hub Version: 6.0.2 Release: 1%{?dist} -License: LGPLv2+ +License: LGPL-2.0-or-later URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec b/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec index 130009ee7b..437f55e56e 100644 --- a/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec +++ b/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec @@ -7,7 +7,7 @@ Name: wingpanel-applications-menu Summary: Lightweight and stylish app launcher Version: 2.11.1 Release: %autorelease -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/applications-menu Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec b/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec index 92fe996448..53f3481875 100644 --- a/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec +++ b/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec @@ -7,7 +7,7 @@ Name: wingpanel-indicator-bluetooth Summary: Bluetooth Indicator for wingpanel Version: 2.1.8 Release: 3%{?dist} -License: LGPLv2+ +License: LGPL-2.0-or-later URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec b/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec index 18d9212d89..9f93928550 100644 --- a/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec +++ b/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec @@ -7,7 +7,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.4.1 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/wingpanel-indicator-datetime Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec b/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec index 35f7b92220..afee3a47da 100644 --- a/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec +++ b/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec @@ -7,7 +7,7 @@ Name: wingpanel-indicator-keyboard Summary: Keyboard Indicator for wingpanel Version: 2.4.1 Release: 1%{?dist} -License: LGPLv2+ +License: LGPL-2.0-or-later URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec b/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec index 20c71c9d3e..6337928315 100644 --- a/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec +++ b/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec @@ -7,7 +7,7 @@ Name: wingpanel-indicator-network Summary: Network Indicator for wingpanel Version: 7.0.1 Release: 1%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/elementary/wingpanel-indicator-network Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec b/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec index bf59558de6..886d30f13b 100644 --- a/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec +++ b/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec @@ -7,7 +7,7 @@ Name: wingpanel-indicator-nightlight Summary: Night Light Indicator for wingpanel Version: 2.1.1 Release: 1%{?dist} -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/elementary/wingpanel-indicator-nightlight Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec b/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec index 04c2d3e26f..f977edf876 100644 --- a/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec +++ b/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec @@ -7,7 +7,7 @@ Name: wingpanel-indicator-notifications Summary: Notifications Indicator for wingpanel Version: 6.0.7 Release: 1%{?dist} -License: LGPLv2+ +License: LGPL-2.0-or-later URL: https://github.com/elementary/wingpanel-indicator-notifications Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec b/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec index 90e3d6ae32..ff832a3401 100644 --- a/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec +++ b/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec @@ -7,7 +7,7 @@ Name: wingpanel-indicator-power Summary: Power indicator for wingpanel Version: 6.2.0 Release: %autorelease -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/elementary/wingpanel-indicator-power Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec b/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec index c5e8d6cd07..9a0e23fe13 100644 --- a/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec +++ b/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec @@ -7,7 +7,7 @@ Name: wingpanel-indicator-session Summary: Session Indicator for wingpanel Version: 2.3.1 Release: 1%{?dist} -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/elementary/wingpanel-indicator-session Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec b/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec index 5ceea6b0e5..eb94f4d844 100644 --- a/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec +++ b/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec @@ -7,7 +7,7 @@ Name: wingpanel-indicator-sound Summary: Sound Indicator for wingpanel Version: 6.0.2 Release: %autorelease -License: GPLv3 +License: GPL-3.0 URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz diff --git a/anda/desktops/elementary/wingpanel/wingpanel.spec b/anda/desktops/elementary/wingpanel/wingpanel.spec index d84dfc750d..0d265d9e9f 100644 --- a/anda/desktops/elementary/wingpanel/wingpanel.spec +++ b/anda/desktops/elementary/wingpanel/wingpanel.spec @@ -8,7 +8,7 @@ Name: wingpanel Summary: Stylish top panel Version: 3.0.3 Release: %autorelease -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/elementary/wingpanel Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz diff --git a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec index e495535340..68df78badf 100644 --- a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec +++ b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec @@ -11,7 +11,7 @@ Version: 0.10.0^%{snapshot_info} %forgemeta Release: 1%{?dist} Summary: Latte is a dock based on plasma frameworks -License: GPLv2+ +License: GPL-2.0-or-later URL: %{forgeurl} Source0: https://github.com/KDE/latte-dock/archive/%{commit}.tar.gz diff --git a/anda/desktops/unity-shell/unity-shell.spec b/anda/desktops/unity-shell/unity-shell.spec index c2df750fdc..c95da08caa 100644 --- a/anda/desktops/unity-shell/unity-shell.spec +++ b/anda/desktops/unity-shell/unity-shell.spec @@ -2,57 +2,57 @@ %global commit 0ba4fbaa112a37e7756c64f339f0569483d1e52f %forgemeta -Name: unity-shell -Version: 1.7.7 -Release: %autorelease -Summary: Unity is a shell that sings +Name: unity-shell +Version: 1.7.7 +Release: %autorelease +Summary: Unity is a shell that sings -License: GPLv3+ +License: GPL-3.0-or-later # forgeurl doesn't really work with spectool, tries https://gitlab.com/ubuntu-unity/unity instead of https://gitlab.com/ubuntu-unity/unity/unity -URL: https://gitlab.com/ubuntu-unity/unity/unity -Source0: %{url}/-/archive/%commit/unity-%commit.tar.bz2 -Patch0: 0001-Remove-xpathselect-dependency.patch -Patch1: 0002-Remove-ido-dependency.patch -Patch2: 0003-Remove-social-scope.patch - -BuildRequires: cmake -BuildRequires: g++ -BuildRequires: gcc -BuildRequires: dee-devel -BuildRequires: gnome-desktop3-devel -BuildRequires: pkgconfig(zeitgeist-2.0) -BuildRequires: libappstream-glib-devel -BuildRequires: libdbusmenu-devel -BuildRequires: bamf-devel -BuildRequires: libindicator-gtk3-devel -BuildRequires: json-glib-devel -BuildRequires: libnotify-devel -BuildRequires: libsigc++20-devel -BuildRequires: libunity-devel -BuildRequires: doxygen -BuildRequires: pam-devel -BuildRequires: boost-devel -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: pkgconfig(libstartup-notification-1.0) -BuildRequires: pkgconfig(nux-4.0) -BuildRequires: compiz9-devel -BuildRequires: pkgconfig(unity-misc) -BuildRequires: chrpath -BuildRequires: systemd-rpm-macros -BuildRequires: pkgconfig(libunity-settings-daemon) -Requires: python3-gobject -Requires: dconf -Requires: gsettings-ubuntu-touch-schemas -Requires: %{name}-data = %{version}-%{release} -Requires: %{name}-core%{?_isa} = %{version}-%{release} -Requires: pam -Requires: bamf-daemon -Requires: unity-gtk-module-common -Requires: compiz9 -Requires: libindicator-gtk3 -Recommends: unity-greeter -Recommends: unity-scope-home +URL: https://gitlab.com/ubuntu-unity/unity/unity +Source0: %{url}/-/archive/%commit/unity-%commit.tar.bz2 +Patch0: 0001-Remove-xpathselect-dependency.patch +Patch1: 0002-Remove-ido-dependency.patch +Patch2: 0003-Remove-social-scope.patch + +BuildRequires: cmake +BuildRequires: g++ +BuildRequires: gcc +BuildRequires: dee-devel +BuildRequires: gnome-desktop3-devel +BuildRequires: pkgconfig(zeitgeist-2.0) +BuildRequires: libappstream-glib-devel +BuildRequires: libdbusmenu-devel +BuildRequires: bamf-devel +BuildRequires: libindicator-gtk3-devel +BuildRequires: json-glib-devel +BuildRequires: libnotify-devel +BuildRequires: libsigc++20-devel +BuildRequires: libunity-devel +BuildRequires: doxygen +BuildRequires: pam-devel +BuildRequires: boost-devel +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: pkgconfig(libstartup-notification-1.0) +BuildRequires: pkgconfig(nux-4.0) +BuildRequires: compiz9-devel +BuildRequires: pkgconfig(unity-misc) +BuildRequires: chrpath +BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(libunity-settings-daemon) +Requires: python3-gobject +Requires: dconf +Requires: gsettings-ubuntu-touch-schemas +Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: pam +Requires: bamf-daemon +Requires: unity-gtk-module-common +Requires: compiz9 +Requires: libindicator-gtk3 +Recommends: unity-greeter +Recommends: unity-scope-home %description Unity is a desktop experience that sings. Designed by Canonical and the Ayatana @@ -89,10 +89,10 @@ This package contains the development files the core Unity library. %package data Summary: Common files for the Unity shell -BuildArch: noarch +BuildArch: noarch Group: User Interface/Desktops # For /usr/etc/pam.d/unity -Recommends: gnome-keyring-pam +Recommends: gnome-keyring-pam Requires: %{name} = %{version}-%{release} %description data @@ -149,7 +149,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libunity-core-6.0.so.9.0.0 %postun if [ ${1} -eq 0 ]; then - glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : + glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : fi %posttrans diff --git a/anda/desktops/unityx-shell/unityx-shell.spec b/anda/desktops/unityx-shell/unityx-shell.spec index 53ebb79b14..57f9ae87bb 100644 --- a/anda/desktops/unityx-shell/unityx-shell.spec +++ b/anda/desktops/unityx-shell/unityx-shell.spec @@ -9,7 +9,7 @@ Version: 1.7.7 Release: %autorelease Summary: UnityX is a smaller shell based on Unity7 -License: GPLv3 AND LGPLv3 +License: GPL-3.0 AND LGPL-3.0 URL: https://gitlab.com/ubuntu-unity/unity-x/unityx Source0: %{url}/-/archive/%commit/unityx-%commit.tar.bz2 Source2: https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/-/commit/dee596492f006d02e2b39abd072ddd7b37fefe82.diff @@ -77,27 +77,27 @@ Requires: xfwm4 UnityX is a shell based off code from Unity7 with lighter dependencies and more customizability. %package xfce4-windowck-plugin -Summary: Core library for the Unity shell -Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Core library for the Unity shell +Requires: %{name}%{?_isa} = %{version}-%{release} %description xfce4-windowck-plugin This package contains the core library needed for Unity and Unity 2D. %package devel -Summary: Development files for the core Unity library -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig(dee-1.0) -Requires: pkgconfig(glib-2.0) -Requires: pkgconfig(sigc++-2.0) -Requires: pkgconfig(unity) -Requires: pkgconfig(nux-4.0) +Summary: Development files for the core Unity library +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig(dee-1.0) +Requires: pkgconfig(glib-2.0) +Requires: pkgconfig(sigc++-2.0) +Requires: pkgconfig(unity) +Requires: pkgconfig(nux-4.0) %description devel This package contains the development files the core Unity library. %package -n plotinus -Summary: Automatic testing for Unity -Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Automatic testing for Unity +Requires: %{name}%{?_isa} = %{version}-%{release} %description -n plotinus This package contains the autopilot framework, which allows for triggering diff --git a/anda/fonts/arphic-ukai/arphic-ukai-fonts.spec b/anda/fonts/arphic-ukai/arphic-ukai-fonts.spec index 9515b6a36b..5fe797cdd7 100644 --- a/anda/fonts/arphic-ukai/arphic-ukai-fonts.spec +++ b/anda/fonts/arphic-ukai/arphic-ukai-fonts.spec @@ -3,7 +3,7 @@ Version: 0.2.20080216.2 Release: %autorelease URL: https://www.freedesktop.org/wiki/Software/CJKUnifonts Source0: https://deb.debian.org/debian/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_%{version}.orig.tar.bz2 -License: custom +License: Arphic-1999 Summary: CJK Unicode font Kaiti style BuildArch: noarch diff --git a/anda/fonts/arphic-uming/arphic-uming-fonts.spec b/anda/fonts/arphic-uming/arphic-uming-fonts.spec index d65001c30c..0ae77eb780 100644 --- a/anda/fonts/arphic-uming/arphic-uming-fonts.spec +++ b/anda/fonts/arphic-uming/arphic-uming-fonts.spec @@ -3,7 +3,7 @@ Version: 0.2.20080216.2 Release: %autorelease URL: https://www.freedesktop.org/wiki/Software/CJKUnifonts Source0: https://deb.debian.org/debian/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_%{version}.orig.tar.bz2 -License: custom +License: Arphic-1999 Summary: CJK Unicode font Ming style BuildArch: noarch diff --git a/anda/fonts/hannom/hannom-fonts.spec b/anda/fonts/hannom/hannom-fonts.spec index 60e9ef42d7..395734ec92 100644 --- a/anda/fonts/hannom/hannom-fonts.spec +++ b/anda/fonts/hannom/hannom-fonts.spec @@ -4,7 +4,7 @@ Release: 2%{?dist} URL: https://vietunicode.sourceforge.net/fonts/fonts_hannom.html Source0: https://downloads.sourceforge.net/project/vietunicode/hannom/hannom%20v%{version}/hannomH.zip Source1: COPYING -License: custom +License: Unlicense Summary: Chinese and Vietnamese TrueType fonts BuildRequires: unzip BuildArch: noarch diff --git a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec index e8732750d5..ddbba4bc1a 100644 --- a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec +++ b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec @@ -6,7 +6,7 @@ Version: 21.1.1 Release: 1%{?dist} Summary: A custom font based on iosevka -License: SIL Open Font License Version 1.1 +License: OFL-1.1 URL: https://github.com/be5invis/Iosevka Source0: %{url}/archive/v%{version}.tar.gz Source1: iosevka-fusion.toml diff --git a/anda/fonts/kanjistrokeorders/kanjistrokeorders-fonts.spec b/anda/fonts/kanjistrokeorders/kanjistrokeorders-fonts.spec index d626d0ec58..0c957948aa 100644 --- a/anda/fonts/kanjistrokeorders/kanjistrokeorders-fonts.spec +++ b/anda/fonts/kanjistrokeorders/kanjistrokeorders-fonts.spec @@ -2,7 +2,7 @@ Name: kanjistrokeorders-fonts Version: 4.004 Release: %autorelease URL: https://sites.google.com/site/nihilistorguk -License: custom +License: BSD-3-Clause Summary: Kanji stroke order font BuildRequires: unzip BuildArch: noarch diff --git a/anda/fonts/manrope/manrope-fonts.spec b/anda/fonts/manrope/manrope-fonts.spec index dbd5281ede..ad5687874b 100644 --- a/anda/fonts/manrope/manrope-fonts.spec +++ b/anda/fonts/manrope/manrope-fonts.spec @@ -2,7 +2,7 @@ Summary: A modernist sans serif font Name: manrope-fonts Version: 1 Release: 3%{?dist} -License: OFL +License: OFL-1.1 URL: https://manropefont.com/ Source0: https://manropefont.com/manrope.zip diff --git a/anda/fonts/mini-wakuwaku/mini-wakuwaku-fonts.spec b/anda/fonts/mini-wakuwaku/mini-wakuwaku-fonts.spec index 7eb84018eb..574f9405cc 100644 --- a/anda/fonts/mini-wakuwaku/mini-wakuwaku-fonts.spec +++ b/anda/fonts/mini-wakuwaku/mini-wakuwaku-fonts.spec @@ -3,7 +3,7 @@ Version: 1.0 Release: %autorelease URL: http://mini-design.jp/font/mini-wakuwaku.html Source0: http://mini-design.jp/font/img/mini-wakuwaku.zip -License: custom +License: Unlicense Summary: A fat looking, rounded and cute Japanese font BuildRequires: unzip BuildArch: noarch diff --git a/anda/fonts/naikai/naikai-fonts.spec b/anda/fonts/naikai/naikai-fonts.spec index dd6c38b2ab..bc2e99fd77 100644 --- a/anda/fonts/naikai/naikai-fonts.spec +++ b/anda/fonts/naikai/naikai-fonts.spec @@ -3,7 +3,7 @@ Version: 1.89 Release: %autorelease URL: https://github.com/max32002/naikaifont Source0: %{url}/archive/refs/tags/%{version}.tar.gz -License: OFLv1.1 +License: OFL-1.1 Summary: A free font family derived from setofont BuildRequires: unzip BuildArch: noarch diff --git a/anda/fonts/nerd-fonts/nerd-fonts.spec b/anda/fonts/nerd-fonts/nerd-fonts.spec index 24a6e11b0b..fa5f69bd33 100644 --- a/anda/fonts/nerd-fonts/nerd-fonts.spec +++ b/anda/fonts/nerd-fonts/nerd-fonts.spec @@ -7,7 +7,7 @@ Release: 2%{?dist} URL: https://nerdfonts.com/ Source0: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%{version}/readme.md Source1: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%{version}/LICENSE -License: OFLv1.1 +License: OFL-1.1 Summary: All packaged Nerd fonts BuildArch: noarch Requires: %{lua: diff --git a/anda/fonts/seto/seto-fonts.spec b/anda/fonts/seto/seto-fonts.spec index 05459a9d5b..d0617bf61c 100644 --- a/anda/fonts/seto/seto-fonts.spec +++ b/anda/fonts/seto/seto-fonts.spec @@ -3,7 +3,7 @@ Version: 6.20 Release: %autorelease URL: https://setofont.osdn.jp/ Source0: https://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip -License: OFLv1.1 +License: OFL-1.1 Summary: A handwritten font that contains kanji up to JIS 4th level and difficult kanji BuildRequires: unzip BuildArch: noarch diff --git a/anda/games/opsu/opsu.spec b/anda/games/opsu/opsu.spec index e5ab3480d5..42ad7f9b5d 100644 --- a/anda/games/opsu/opsu.spec +++ b/anda/games/opsu/opsu.spec @@ -6,7 +6,7 @@ Source0: https://github.com/itdelatrisu/opsu/releases/download/%{version}/opsu-% Source1: https://github.com/itdelatrisu/opsu/raw/%{version}/res/logo.png Source2: https://raw.githubusercontent.com/itdelatrisu/opsu/%{version}/LICENSE Source3: https://raw.githubusercontent.com/itdelatrisu/opsu/%{version}/README.md -License: GPLv3 +License: GPL-3.0 Summary: An open source osu!-client written in Java Requires: java-latest-openjdk hicolor-icon-theme xrandr Recommends: ffmpeg diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index b323941b2b..19273e9288 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -7,7 +7,7 @@ Release: 1%{?dist} Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 URL: https://osu.ppy.sh/ -License: MIT, CC-BY-NC-4.0 +License: MIT AND CC-BY-NC-4.0 Requires: zlib osu-mime fuse Source0: https://github.com/ppy/osu/releases/download/%{version}/osu.AppImage Source1: https://raw.githubusercontent.com/ppy/osu/%{version}/assets/lazer.png diff --git a/anda/games/osu-mime/osu-mime.spec b/anda/games/osu-mime/osu-mime.spec index 423c2c5c94..4009d5796c 100644 --- a/anda/games/osu-mime/osu-mime.spec +++ b/anda/games/osu-mime/osu-mime.spec @@ -3,7 +3,7 @@ Version: 0.1 Release: 1%{?dist} Summary: Provides MIME types for osu! file formats BuildArch: noarch -License: AGPLv3 +License: AGPL-3.0 Requires: xdg-utils shared-mime-info desktop-file-utils BuildRequires: librsvg2-tools ImageMagick Recommends: osu-handler diff --git a/anda/go/gendesk/golang-github-xyproto-gendesk.spec b/anda/go/gendesk/golang-github-xyproto-gendesk.spec index 874a12ac08..a5b5d27ea4 100644 --- a/anda/go/gendesk/golang-github-xyproto-gendesk.spec +++ b/anda/go/gendesk/golang-github-xyproto-gendesk.spec @@ -7,16 +7,6 @@ Version: 1.0.9 %global tag 1.0.9 %global commit 7ac050a54c2f771ce41da2a38f633cefc3353383 -# REMOVE BEFORE SUBMITTING THIS FOR REVIEW -# --- -# New Fedora packages should use %%gometa -f, which makes the package -# ExclusiveArch to %%golang_arches_future and thus excludes the package from -# %%ix86. If the new package is needed as a dependency for another pacage, -# please consider removing that package from %%ix86 in the same way, instead of -# building more go packages for i686. If your package is not a leaf package, -# you'll need to coordinate the removal of the package's dependents first. -# --- -# REMOVE BEFORE SUBMITTING THIS FOR REVIEW %gometa -f %global common_description %{expand: diff --git a/anda/go/xyproto-textoutput/golang-github-xyproto-textoutput.spec b/anda/go/xyproto-textoutput/golang-github-xyproto-textoutput.spec index 30cd3bc8da..6c155dc79e 100644 --- a/anda/go/xyproto-textoutput/golang-github-xyproto-textoutput.spec +++ b/anda/go/xyproto-textoutput/golang-github-xyproto-textoutput.spec @@ -5,16 +5,6 @@ %global goipath github.com/xyproto/textoutput Version: 1.14.1 -# REMOVE BEFORE SUBMITTING THIS FOR REVIEW -# --- -# New Fedora packages should use %%gometa -f, which makes the package -# ExclusiveArch to %%golang_arches_future and thus excludes the package from -# %%ix86. If the new package is needed as a dependency for another pacage, -# please consider removing that package from %%ix86 in the same way, instead of -# building more go packages for i686. If your package is not a leaf package, -# you'll need to coordinate the removal of the package's dependents first. -# --- -# REMOVE BEFORE SUBMITTING THIS FOR REVIEW %gometa -f %global common_description %{expand: diff --git a/anda/go/xyproto-vt100/golang-github-xyproto-vt100.spec b/anda/go/xyproto-vt100/golang-github-xyproto-vt100.spec index 50315791d0..e782359da6 100644 --- a/anda/go/xyproto-vt100/golang-github-xyproto-vt100.spec +++ b/anda/go/xyproto-vt100/golang-github-xyproto-vt100.spec @@ -5,29 +5,19 @@ %global goipath github.com/xyproto/vt100 Version: 1.11.4 -# REMOVE BEFORE SUBMITTING THIS FOR REVIEW -# --- -# New Fedora packages should use %%gometa -f, which makes the package -# ExclusiveArch to %%golang_arches_future and thus excludes the package from -# %%ix86. If the new package is needed as a dependency for another pacage, -# please consider removing that package from %%ix86 in the same way, instead of -# building more go packages for i686. If your package is not a leaf package, -# you'll need to coordinate the removal of the package's dependents first. -# --- -# REMOVE BEFORE SUBMITTING THIS FOR REVIEW %gometa -f %global common_description %{expand: :computer: VT100 Terminal Package.} %global golicenses LICENSE -%global godocs TODO.md README.md cmd/widget/README.md +%global godocs README.md cmd/widget/README.md Name: golang-%{goname} -Release: 1%{?dist} -Summary: :computer: VT100 Terminal Package +Release: %autorelease +Summary: VT100 Terminal Package -License: # FIXME +License: BSD-3-Clause URL: %{gourl} Source: %{gosource} diff --git a/anda/go/yhat-scrape/golang-github-yhat-scrape.spec b/anda/go/yhat-scrape/golang-github-yhat-scrape.spec index 4bbf91a224..2f2259f3d0 100644 --- a/anda/go/yhat-scrape/golang-github-yhat-scrape.spec +++ b/anda/go/yhat-scrape/golang-github-yhat-scrape.spec @@ -6,16 +6,6 @@ %global goipath github.com/yhat/scrape %global commit 24b7890b0945459dbf91743e4d2ac5d75a51fee2 -# REMOVE BEFORE SUBMITTING THIS FOR REVIEW -# --- -# New Fedora packages should use %%gometa -f, which makes the package -# ExclusiveArch to %%golang_arches_future and thus excludes the package from -# %%ix86. If the new package is needed as a dependency for another pacage, -# please consider removing that package from %%ix86 in the same way, instead of -# building more go packages for i686. If your package is not a leaf package, -# you'll need to coordinate the removal of the package's dependents first. -# --- -# REMOVE BEFORE SUBMITTING THIS FOR REVIEW %gometa -f %global common_description %{expand: diff --git a/anda/lib/cmake-extras/cmake-extras.spec b/anda/lib/cmake-extras/cmake-extras.spec index b8ac58185f..3f0bc756a6 100644 --- a/anda/lib/cmake-extras/cmake-extras.spec +++ b/anda/lib/cmake-extras/cmake-extras.spec @@ -6,7 +6,7 @@ Name: cmake-extras Version: 1.6 Release: 1%{?dist} Summary: A collection of add-ons for the CMake build tool -License: GPLv3 +License: GPL-3.0 URL: https://gitlab.com/ubports/development/core/cmake-extras Source0: %{url}/-/archive/%commit/cmake-extras-%commit.tar.gz BuildArch: noarch diff --git a/anda/lib/dbus-test-runner/dbus-test-runner.spec b/anda/lib/dbus-test-runner/dbus-test-runner.spec index 7cd36542b9..22e0dfa3e5 100644 --- a/anda/lib/dbus-test-runner/dbus-test-runner.spec +++ b/anda/lib/dbus-test-runner/dbus-test-runner.spec @@ -2,7 +2,7 @@ Name: dbus-test-runner Version: 19.04.0 Release: %autorelease Summary: A small utility to run executables under a new DBus session for testing -License: GPLv3 +License: GPL-3.0 URL: https://launchpad.net/dbus-test-runner Source0: %{url}/19.04/%{version}/+download/dbus-test-runner-%{version}.tar.gz Source1: https://salsa.debian.org/debian/dbus-test-runner/-/raw/debian/sid/debian/man/dbus-test-runner.1 diff --git a/anda/lib/frame/frame.spec b/anda/lib/frame/frame.spec index 50d6288233..26dc59ba81 100644 --- a/anda/lib/frame/frame.spec +++ b/anda/lib/frame/frame.spec @@ -3,7 +3,7 @@ Version: 2.5.0 Release: %autorelease Summary: Touch Frame Library -License: GPLv3 AND LGPLv3 +License: GPL-3.0 AND LGPL-3.0 URL: https://launchpad.net/frame Source0: http://archive.ubuntu.com/ubuntu/pool/universe/f/frame/frame_%{version}daily13.06.05+16.10.20160809.orig.tar.gz Patch0: http://archive.ubuntu.com/ubuntu/pool/universe/f/frame/frame_%{version}daily13.06.05+16.10.20160809-0ubuntu3.diff.gz @@ -23,8 +23,8 @@ BuildRequires: asciidoc Frame handles the buildup and synchronization of a set of simultaneous touches. %package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for diff --git a/anda/lib/geis/geis.spec b/anda/lib/geis/geis.spec index d2b5d8712c..d20afede10 100644 --- a/anda/lib/geis/geis.spec +++ b/anda/lib/geis/geis.spec @@ -3,7 +3,7 @@ Version: 2.2.17 Release: %autorelease Summary: An implementation of the GEIS interface -License: GPLv3 AND LGPLv3 +License: GPL-3.0 AND LGPL-3.0 URL: https://launchpad.net/geis Source0: http://archive.ubuntu.com/ubuntu/pool/universe/g/geis/geis_%{version}+16.04.20160126.orig.tar.gz Patch0: http://archive.ubuntu.com/ubuntu/pool/universe/g/geis/geis_%{version}+16.04.20160126-0ubuntu8.diff.gz @@ -28,8 +28,8 @@ Requires: python3 An implementation of the GEIS (Gesture Engine Interface and Support) interface. %package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for diff --git a/anda/lib/geonames/geonames.spec b/anda/lib/geonames/geonames.spec index e11db786bf..c2302e57a3 100644 --- a/anda/lib/geonames/geonames.spec +++ b/anda/lib/geonames/geonames.spec @@ -6,7 +6,7 @@ Name: geonames Version: 0.3.0 Release: %autorelease Summary: Parse and query the geonames database -License: GPLv3 +License: GPL-3.0 URL: https://gitlab.com/ubports/development/core/geonames Source0: %{url}/-/archive/%commit/geonames-%commit.tar.gz diff --git a/anda/lib/glewmx/glewmx.spec b/anda/lib/glewmx/glewmx.spec index cc7a98f140..4e3886b6c8 100644 --- a/anda/lib/glewmx/glewmx.spec +++ b/anda/lib/glewmx/glewmx.spec @@ -1,22 +1,22 @@ # Can not find libraries for some reason %global debug_package %{nil} -Name: glewmx -Version: 1.13.0. -Release: 1%{?dist} -Summary: OpenGL Extension Wrangler MX +Name: glewmx +Version: 1.13.0. +Release: 1%{?dist} +Summary: OpenGL Extension Wrangler MX -License: GPLv3+ -URL: https://launchpad.net/ubuntu/+source/glewmx -Source0: http://archive.ubuntu.com/ubuntu/pool/universe/g/glewmx/glewmx_%{version}.orig.tar.gz -Source1: http://archive.ubuntu.com/ubuntu/pool/universe/g/glewmx/glewmx_%{version}-5.debian.tar.xz +License: GPL-3.0-or-later +URL: https://launchpad.net/ubuntu/+source/glewmx +Source0: http://archive.ubuntu.com/ubuntu/pool/universe/g/glewmx/glewmx_%{version}.orig.tar.gz +Source1: http://archive.ubuntu.com/ubuntu/pool/universe/g/glewmx/glewmx_%{version}-5.debian.tar.xz -BuildRequires: make -BuildRequires: gcc -BuildRequires: mesa-libGLU-devel -BuildRequires: pkgconfig(glu) -BuildRequires: libXmu-devel -BuildRequires: libXi-devel +BuildRequires: make +BuildRequires: gcc +BuildRequires: mesa-libGLU-devel +BuildRequires: pkgconfig(glu) +BuildRequires: libXmu-devel +BuildRequires: libXi-devel %description OpenGL Extension Wrangler MX. The MX version is discountinued but is maintained in Ubuntu. diff --git a/anda/lib/grail/grail.spec b/anda/lib/grail/grail.spec index 7459010614..c6ac7845aa 100644 --- a/anda/lib/grail/grail.spec +++ b/anda/lib/grail/grail.spec @@ -1,22 +1,22 @@ -Name: grail -Version: 3.1.1 -Release: %autorelease -Summary: Gesture Recognition And Instantiation Library +Name: grail +Version: 3.1.1 +Release: %autorelease +Summary: Gesture Recognition And Instantiation Library -License: GPLv3 AND LGPLv3 -URL: https://launchpad.net/grail -Source0: http://archive.ubuntu.com/ubuntu/pool/universe/g/grail/grail_%{version}.orig.tar.bz2 +License: GPL-3.0 AND LGPL-3.0-or-later +URL: https://launchpad.net/grail +Source0: http://archive.ubuntu.com/ubuntu/pool/universe/g/grail/grail_%{version}.orig.tar.bz2 -BuildRequires: automake libtool gnome-common -BuildRequires: intltool -BuildRequires: make -BuildRequires: gcc -BuildRequires: g++ -BuildRequires: libX11-devel -BuildRequires: libXi-devel -BuildRequires: libXext-devel -BuildRequires: xorg-x11-server-devel -BuildRequires: frame-devel +BuildRequires: automake libtool gnome-common +BuildRequires: intltool +BuildRequires: make +BuildRequires: gcc +BuildRequires: g++ +BuildRequires: libX11-devel +BuildRequires: libXi-devel +BuildRequires: libXext-devel +BuildRequires: xorg-x11-server-devel +BuildRequires: frame-devel %description Grail consists of an interface and tools for handling gesture recognition and gesture instantiation. @@ -40,10 +40,10 @@ PYTHON=%{__python3} export PYTHON %configure \ - --disable-integration-tests \ - --disable-silent-rules \ - --with-x11 \ - --disable-static + --disable-integration-tests \ + --disable-silent-rules \ + --with-x11 \ + --disable-static %make_build diff --git a/anda/lib/gsettings-qt/gsettings-qt.spec b/anda/lib/gsettings-qt/gsettings-qt.spec index 8c6f49f11b..1efaf9a160 100644 --- a/anda/lib/gsettings-qt/gsettings-qt.spec +++ b/anda/lib/gsettings-qt/gsettings-qt.spec @@ -6,7 +6,7 @@ Name: gsettings-qt Version: 0.2 Release: %autorelease Summary: QML Bindings for GSettings -License: LGPLv3 +License: LGPL-3.0 URL: https://gitlab.com/ubports/development/core/gsettings-qt Source0: %{url}/-/archive/%commit/gsettings-qt-%commit.tar.gz diff --git a/anda/lib/libbismuth/libbismuth.spec b/anda/lib/libbismuth/libbismuth.spec index 6289b25e28..a0ef6576f6 100644 --- a/anda/lib/libbismuth/libbismuth.spec +++ b/anda/lib/libbismuth/libbismuth.spec @@ -2,7 +2,7 @@ Summary: libadwaita responsive widgets, without all the baggage. Name: libbismuth Version: 1.0.4 Release: 1%{?dist} -License: LGPL-2.1+ +License: LGPL-2.1-or-later URL: https://github.com/tau-OS/libbismuth Source0: https://github.com/tau-OS/libbismuth/archive/refs/tags/%{version}.tar.gz diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index 517ea55107..6086cd422b 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -2,7 +2,7 @@ Summary: The Application Framework for tauOS apps Name: libhelium Version: 1.5.12 Release: 1%{?dist} -License: GPLv3 +License: GPL-3.0 URL: https://github.com/tau-OS/libhelium Source0: https://github.com/tau-OS/libhelium/archive/refs/tags/%{version}.tar.gz diff --git a/anda/lib/libindicator/libindicator.spec b/anda/lib/libindicator/libindicator.spec index 9c11653cb9..54c4bb1432 100644 --- a/anda/lib/libindicator/libindicator.spec +++ b/anda/lib/libindicator/libindicator.spec @@ -1,27 +1,26 @@ -Name: libindicator -Version: 16.10.0 -Release: %autorelease -Summary: Shared functions for Ayatana indicators - -License: GPLv3 -URL: https://launchpad.net/libindicator -Source0: http://archive.ubuntu.com/ubuntu/pool/universe/libi/libindicator/libindicator_16.10.0+18.04.20180321.1.orig.tar.gz -Source1: https://raw.githubusercontent.com/ubports/libindicator/097906132ffb479205be15a92cae97e5daf4e154/data/indicators.target +Name: libindicator +Version: 16.10.0 +Release: %autorelease +Summary: Shared functions for Ayatana indicators + +License: GPL-3.0 +URL: https://launchpad.net/libindicator +Source0: http://archive.ubuntu.com/ubuntu/pool/universe/libi/libindicator/libindicator_16.10.0+18.04.20180321.1.orig.tar.gz +Source1: https://raw.githubusercontent.com/ubports/libindicator/097906132ffb479205be15a92cae97e5daf4e154/data/indicators.target # From GLib 2.62 -Patch1: http://archive.ubuntu.com/ubuntu/pool/universe/libi/libindicator/libindicator_16.10.0+18.04.20180321.1-0ubuntu5.diff.gz +Patch1: http://archive.ubuntu.com/ubuntu/pool/universe/libi/libindicator/libindicator_16.10.0+18.04.20180321.1-0ubuntu5.diff.gz BuildRequires: chrpath BuildRequires: gtk-doc BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(systemd) BuildRequires: dbus-glib-devel BuildRequires: gtk2-devel BuildRequires: gtk3-devel -BuildRequires: systemd-rpm-macros -#Requires: ido-devel +BuildRequires: systemd-rpm-macros BuildRequires: gnome-common -BuildRequires: make +BuildRequires: make %description A set of symbols and convenience functions that all Ayatana indicators are @@ -39,7 +38,7 @@ developing applications that use %{name}. %package gtk3 Summary: GTK+3 build of %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description gtk3 A set of symbols and convenience functions that all Ayatana indicators @@ -131,7 +130,7 @@ popd ) # Ubuntu doesn't package the dummy indicator -#rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so +%dnl rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so # Remove libtool files find %{buildroot} -type f -name '*.la' -delete diff --git a/anda/lib/libunity-misc/libunity-misc.spec b/anda/lib/libunity-misc/libunity-misc.spec index bc9d80438a..c921804e06 100644 --- a/anda/lib/libunity-misc/libunity-misc.spec +++ b/anda/lib/libunity-misc/libunity-misc.spec @@ -1,21 +1,21 @@ -Name: libunity-misc -Version: 4.0.5 -Release: %autorelease -Summary: Misc Unity shell libs - -License: LGPLv2 AND LGPLv2 AND GPLv2 -URL: https://launchpad.net/libunity-misc -Source0: http://archive.ubuntu.com/ubuntu/pool/universe/libu/libunity-misc/libunity-misc_%{version}+14.04.20140115.orig.tar.gz - -BuildRequires: make -BuildRequires: g++ -BuildRequires: gcc -BuildRequires: libX11-devel -BuildRequires: gnome-common -BuildRequires: gtk-doc -BuildRequires: libX11-devel -BuildRequires: gtk3-devel -BuildRequires: glib2-devel +Name: libunity-misc +Version: 4.0.5 +Release: %autorelease +Summary: Misc Unity shell libs + +License: LGPL-2.0 AND LGPL-2.0 AND GPL-2.0 +URL: https://launchpad.net/libunity-misc +Source0: http://archive.ubuntu.com/ubuntu/pool/universe/libu/libunity-misc/libunity-misc_%{version}+14.04.20140115.orig.tar.gz + +BuildRequires: make +BuildRequires: g++ +BuildRequires: gcc +BuildRequires: libX11-devel +BuildRequires: gnome-common +BuildRequires: gtk-doc +BuildRequires: libX11-devel +BuildRequires: gtk3-devel +BuildRequires: glib2-devel %description A simple library that implements a subset of the XPath spec to allow selecting nodes in an object tree @@ -36,8 +36,8 @@ NOCONFIGURE=1 \ %build %configure \ - --disable-silent-rules \ - --disable-static + --disable-silent-rules \ + --disable-static %make_build %install diff --git a/anda/lib/libunity/libunity.spec b/anda/lib/libunity/libunity.spec index 751dfb4c2e..f441dc26b4 100644 --- a/anda/lib/libunity/libunity.spec +++ b/anda/lib/libunity/libunity.spec @@ -3,7 +3,7 @@ Summary: Supporting library for Unity shell Version: 7.1.4+19.04 Release: %autorelease -License: GPLv3+ AND LGPLv3+ +License: GPL-3.0-or-later AND LGPL-3.0-or-later URL: https://launchpad.net/libunity # same sources as shipped in ubuntu packages Source0: http://archive.ubuntu.com/ubuntu/pool/main/libu/libunity/libunity_7.1.4+19.04.20190319.orig.tar.gz diff --git a/anda/lib/lomiri-api/lomiri-api.spec b/anda/lib/lomiri-api/lomiri-api.spec index 0375bcede3..03658829b0 100644 --- a/anda/lib/lomiri-api/lomiri-api.spec +++ b/anda/lib/lomiri-api/lomiri-api.spec @@ -7,7 +7,7 @@ Version: 0.2.0 Release: 1%{?dist} Summary: API for Lomiri -License: LGPLv3+ +License: LGPL-3.0-or-later URL: https://gitlab.com/ubports/development/core/lomiri-api Source0: %{url}/-/archive/%commit/lomiri-api-%commit.tar.gz diff --git a/anda/lib/lomiri-app-launch/lomiri-app-launch.spec b/anda/lib/lomiri-app-launch/lomiri-app-launch.spec index 9f13b9cf4f..aee0c7abfd 100644 --- a/anda/lib/lomiri-app-launch/lomiri-app-launch.spec +++ b/anda/lib/lomiri-app-launch/lomiri-app-launch.spec @@ -6,7 +6,7 @@ Name: lomiri-app-launch Version: 0.1.6 Release: %autorelease Summary: Provides the Lomiri App Launch user space daemon -License: GPLv3 +License: GPL-3.0 URL: https://gitlab.com/ubports/development/core/lomiri-app-launch Source0: %{url}/-/archive/%commit/lomiri-app-launch-%commit.tar.gz diff --git a/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec b/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec index 955e74b5f0..85b161f036 100644 --- a/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec +++ b/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec @@ -7,7 +7,7 @@ Version: 1.3.5010 Release: %autorelease Summary: QML components to ease the creation of beautiful applications in QML for Lomiri -License: LGPLv3 +License: LGPL-3.0 URL: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit Source0: %{url}/-/archive/%commit/lomiri-ui-toolkit-%commit.tar.gz Patch0: https://sources.debian.org/data/main/l/lomiri-ui-toolkit/1.3.5010%2Bdfsg-1/debian/patches/0002-fix-tests-on-qt-5.15.5.patch diff --git a/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec b/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec index 8522a9ba91..1aa1e22715 100644 --- a/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec +++ b/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec @@ -7,7 +7,7 @@ Version: 0.1.2 Release: %autorelease Summary: A small library for handling URLs over dbus -License: LGPLv3 +License: LGPL-3.0 URL: https://gitlab.com/ubports/development/core/lomiri-url-dispatcher Source0: %{url}/-/archive/%commit/lomiri-url-dispatcher-%commit.tar.gz diff --git a/anda/lib/marble-gtk/marble-gtk.spec b/anda/lib/marble-gtk/marble-gtk.spec index 6bb9e2eb22..242dfca20d 100644 --- a/anda/lib/marble-gtk/marble-gtk.spec +++ b/anda/lib/marble-gtk/marble-gtk.spec @@ -2,7 +2,7 @@ Name: marble-gtk Version: 1.3.0 Release: 1%{?dist} Summary: My GTK library -License: GPLv3 +License: GPL-3.0 URL: https://gitlab.gnome.org/raggesilver/marble BuildRequires: vala pkgconfig(gtk4) meson >= 0.50.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.24 diff --git a/anda/lib/nux/nux.spec b/anda/lib/nux/nux.spec index 128fb888dc..a01d5448fc 100644 --- a/anda/lib/nux/nux.spec +++ b/anda/lib/nux/nux.spec @@ -7,7 +7,7 @@ Version: 4.0.8 Release: %autorelease Summary: An OpenGL toolkit -License: GPLv3+ AND LGPLv3+ AND LGPLv2+ +License: GPL-3.0-or-later AND LGPL-3.0-or-later AND LGPL-2.0-or-later URL: https://gitlab.com/ubuntu-unity/unity-x/nux Source0: %{url}/-/archive/%commit/nux-%commit.tar.bz2 Patch0: https://gitlab.com/cat-master21/nux/-/commit/0e834a556818281b9e023b47f0667e8da0f5cebd.patch diff --git a/anda/lib/process-cpp/process-cpp.spec b/anda/lib/process-cpp/process-cpp.spec index 8c15d5ba9b..c543cd69f4 100644 --- a/anda/lib/process-cpp/process-cpp.spec +++ b/anda/lib/process-cpp/process-cpp.spec @@ -7,7 +7,7 @@ Version: 3.0.1 Release: %autorelease Summary: A simple convenience library for handling processes in C++ -License: LGPLv3+ +License: LGPL-3.0-or-later URL: https://gitlab.com/ubports/development/core/lib-cpp/process-cpp Source0: %{url}/-/archive/%commit/process-cpp-%commit.tar.gz Patch0: https://sources.debian.org/data/main/p/process-cpp/3.0.1-9/debian/patches/2001-Don-t-run-tests.patch diff --git a/anda/lib/properties-cpp-devel/properties-cpp-devel.spec b/anda/lib/properties-cpp-devel/properties-cpp-devel.spec index c3c645e5f3..b2449177e4 100644 --- a/anda/lib/properties-cpp-devel/properties-cpp-devel.spec +++ b/anda/lib/properties-cpp-devel/properties-cpp-devel.spec @@ -8,7 +8,7 @@ Version: 0.0.2 Release: %autorelease Summary: A very simple convenience library for handling properties and signals in C++11 -License: LGPLv3 +License: LGPL-3.0 URL: https://gitlab.com/ubports/development/core/lib-cpp/properties-cpp Source0: %{url}/-/archive/%commit/properties-cpp-%commit.tar.gz diff --git a/anda/lib/qt5-pim/qt5-pim.spec b/anda/lib/qt5-pim/qt5-pim.spec index df5e774213..bb9ee851d0 100644 --- a/anda/lib/qt5-pim/qt5-pim.spec +++ b/anda/lib/qt5-pim/qt5-pim.spec @@ -3,7 +3,7 @@ Summary: Qt5 PIM Framework Version: 5.15 Release: %autorelease -License: GPLv3 +License: GPL-3.0 URL: https://invent.kde.org/qt/qt/qtpim Source0: %{url}/-/archive/kde/5.15/qtpim-kde-%{version}.tar.gz Source1: https://salsa.debian.org/qt-kde-team/qt/qtpim/-/archive/master/qtpim-master.tar.gz diff --git a/anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec b/anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec index 351ee2d687..3a4c4cb204 100644 --- a/anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec +++ b/anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec @@ -6,7 +6,7 @@ Name: qt5-qtdbustest Version: 0.3.0 Release: %autorelease Summary: Library for testing DBus interactions using Qt5 -License: LGPLv3 +License: LGPL-3.0 URL: https://gitlab.com/ubports/development/core/libqtdbustest Source0: %url/-/archive/%version/qtdbustest-%version.tar.gz diff --git a/anda/lib/qt5-qtsystems/qt5-qtsystems.spec b/anda/lib/qt5-qtsystems/qt5-qtsystems.spec index e90ec3ce34..9100d80eab 100644 --- a/anda/lib/qt5-qtsystems/qt5-qtsystems.spec +++ b/anda/lib/qt5-qtsystems/qt5-qtsystems.spec @@ -6,7 +6,7 @@ Summary: Qt5 Mobility Framework Version: 5.15 Release: %autorelease -License: GPLv3 +License: GPL-3.0 URL: https://invent.kde.org/qt/qt/qtsystems Source0: %{url}/-/archive/%commit/qt5-mobility-%commit.tar.gz Source1: https://salsa.debian.org/qt-kde-team/qt/qtsystems/-/archive/master/qtsystems-master.tar.gz diff --git a/anda/lib/qtdbusmock/qtdbusmock.spec b/anda/lib/qtdbusmock/qtdbusmock.spec index cddb98b2d8..ff1e4904eb 100644 --- a/anda/lib/qtdbusmock/qtdbusmock.spec +++ b/anda/lib/qtdbusmock/qtdbusmock.spec @@ -6,7 +6,7 @@ Name: qtdbusmock Version: 0.9.0 Release: %autorelease Summary: Library for mocking DBus interactions using Qt -License: LGPLv3 +License: LGPL-3.0 URL: https://gitlab.com/ubports/development/core/libqtdbusmock Source0: %{url}/-/archive/%commit/libqtdbusmock-%commit.tar.gz diff --git a/anda/lib/unity-settings-daemon/unity-settings-daemon.spec b/anda/lib/unity-settings-daemon/unity-settings-daemon.spec index 669eb2f4de..ed0be46719 100644 --- a/anda/lib/unity-settings-daemon/unity-settings-daemon.spec +++ b/anda/lib/unity-settings-daemon/unity-settings-daemon.spec @@ -3,7 +3,7 @@ Version: 15.04.1+21.10.20220802 Release: %autorelease Summary: Daemon handling for Unity session settings -License: GPLv2 AND LGPLv2+ +License: GPL-2.0 AND LGPL-2.0-or-later URL: https://launchpad.net/unity-settings-daemon Source0: http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-settings-daemon/unity-settings-daemon_%{version}.orig.tar.gz Source1: unity-settings-daemon.service diff --git a/anda/others/blackbox-terminal/blackbox-terminal.spec b/anda/others/blackbox-terminal/blackbox-terminal.spec index 0239b50b09..10bfd07734 100644 --- a/anda/others/blackbox-terminal/blackbox-terminal.spec +++ b/anda/others/blackbox-terminal/blackbox-terminal.spec @@ -2,7 +2,7 @@ Name: blackbox-terminal Version: 0.13.2 Release: %autorelease Summary: A beautiful GTK 4 terminal -License: GPLv3 +License: GPL-3.0 URL: https://gitlab.gnome.org/raggesilver/blackbox BuildRequires: vala meson gettext BuildRequires: pkgconfig(gtk4) >= 4.6.2 diff --git a/anda/others/click/click.spec b/anda/others/click/click.spec index 433ba79ff0..8df1d70cc1 100644 --- a/anda/others/click/click.spec +++ b/anda/others/click/click.spec @@ -6,7 +6,7 @@ Name: click Version: 0.5.0 Release: %autorelease Summary: Click is a app building method -License: LGPLv3 +License: LGPL-3.0 URL: https://gitlab.com/ubports/development/core/click Source0: %{url}/-/archive/%commit/click-%commit.tar.gz diff --git a/anda/others/gsettings-ubuntu-touch-schemas/gsettings-ubuntu-touch-schemas.spec b/anda/others/gsettings-ubuntu-touch-schemas/gsettings-ubuntu-touch-schemas.spec index b0d34c000c..df48349ea7 100644 --- a/anda/others/gsettings-ubuntu-touch-schemas/gsettings-ubuntu-touch-schemas.spec +++ b/anda/others/gsettings-ubuntu-touch-schemas/gsettings-ubuntu-touch-schemas.spec @@ -4,7 +4,7 @@ Release: %autorelease Summary: Shared GSettings schemas for Ubuntu touch and Unity BuildArch: noarch -License: GPLv2 AND LGPLv2 +License: GPL-2.0 AND LGPL-2.0 URL: https://launchpad.net/gsettings-ubuntu-touch-schemas Source0: http://archive.ubuntu.com/ubuntu/pool/main/g/gsettings-ubuntu-touch-schemas/gsettings-ubuntu-touch-schemas_%{version}.orig.tar.gz diff --git a/anda/others/lomiri-schemas/lomiri-schemas.spec b/anda/others/lomiri-schemas/lomiri-schemas.spec index a43a8f112f..61a50dc47d 100644 --- a/anda/others/lomiri-schemas/lomiri-schemas.spec +++ b/anda/others/lomiri-schemas/lomiri-schemas.spec @@ -6,7 +6,7 @@ Name: lomiri-schemas Version: 0.1.3 Release: %autorelease Summary: Configuration schemas for lomiri -License: LGPLv2+ +License: LGPL-2.0-or-later URL: https://gitlab.com/ubports/development/core/lomiri-schemas Source0: %url/-/archive/%commit/lomiri-schemas-%commit.tar.gz Patch0: https://gitlab.com/cat-master21/lomiri-schemas/-/commit/e32de385c858f9096c6014a3749117fa6f94f231.patch diff --git a/anda/others/tau-helium/tau-helium.spec b/anda/others/tau-helium/tau-helium.spec index 4fbc5a2cf6..482868d582 100644 --- a/anda/others/tau-helium/tau-helium.spec +++ b/anda/others/tau-helium/tau-helium.spec @@ -2,7 +2,7 @@ Summary: tauOS GTK/GNOME Shell Themes Name: tau-helium Version: 1.5.0 Release: 1%{?dist} -License: GPLv3 +License: GPL-3.0 URL: https://github.com/tau-OS/tau-helium Source0: https://github.com/tau-OS/tau-helium/archive/refs/tags/%{version}.tar.gz BuildArch: noarch diff --git a/anda/others/tau-hydrogen/tau-hydrogen.spec b/anda/others/tau-hydrogen/tau-hydrogen.spec index 15eb9cf024..6c1fd68aba 100644 --- a/anda/others/tau-hydrogen/tau-hydrogen.spec +++ b/anda/others/tau-hydrogen/tau-hydrogen.spec @@ -2,7 +2,7 @@ Summary: tauOS Icon Theme Name: tau-hydrogen Version: 1.0.11 Release: 1%{?dist} -License: GPLv3 +License: GPL-3.0 URL: https://github.com/tau-OS/tau-hydrogen Source0: https://github.com/tau-OS/tau-hydrogen/archive/refs/tags/%{version}.tar.gz BuildArch: noarch diff --git a/anda/others/ubuntu-sdk/ubuntu-sdk.spec b/anda/others/ubuntu-sdk/ubuntu-sdk.spec index b9af4dc400..a9dbde760f 100644 --- a/anda/others/ubuntu-sdk/ubuntu-sdk.spec +++ b/anda/others/ubuntu-sdk/ubuntu-sdk.spec @@ -7,7 +7,7 @@ Summary: Assets and icons for Unity Version: 20.04 Release: %autorelease -License: GPLv3+ +License: GPL-3.0-or-later URL: https://gitlab.com/ubports/development/core/ubuntu-touch-meta Source0: %{url}/-/archive/%commit/ubuntu-touch-meta-%commit.tar.gz BuildArch: noarch diff --git a/anda/others/unity-greeter/unity-greeter.spec b/anda/others/unity-greeter/unity-greeter.spec index c206e7fc0c..767333de64 100644 --- a/anda/others/unity-greeter/unity-greeter.spec +++ b/anda/others/unity-greeter/unity-greeter.spec @@ -3,7 +3,7 @@ Version: 22.04.1 Release: %autorelease Summary: Unity Greeter for Lightdm -License: GPLv3 +License: GPL-3.0 URL: https://launchpad.net/unity-greeter Source0: http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-greeter/unity-greeter_%{version}-0ubuntu2.tar.xz Patch1: 0001-Remove-libido.patch diff --git a/anda/others/unity-scope-home/unity-scope-home.spec b/anda/others/unity-scope-home/unity-scope-home.spec index 7fd2892f19..65b79e1b49 100644 --- a/anda/others/unity-scope-home/unity-scope-home.spec +++ b/anda/others/unity-scope-home/unity-scope-home.spec @@ -2,7 +2,7 @@ Name: unity-scope-home Summary: Home scope that aggregates results from multiple scopes Version: 19.04.20190412 Release: %autorelease -License: GPLv3 +License: GPL-3.0 URL: https://launchpad.net/unity-scope-home Source0: http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-scope-home/unity-scope-home_6.8.2+%{version}.orig.tar.gz Patch0: https://gitlab.com/unity-for-arch/unity-scope-home/-/raw/main/fix-vala-0.56-errors.patch diff --git a/anda/others/unity-session/unity-session.spec b/anda/others/unity-session/unity-session.spec index d42e75c9db..15315efae4 100644 --- a/anda/others/unity-session/unity-session.spec +++ b/anda/others/unity-session/unity-session.spec @@ -5,7 +5,7 @@ Summary: Lightdm profile for Unity 7 Version: 43.0 Release: %autorelease -License: GPLv2 +License: GPL-2.0 URL: https://packages.ubuntu.com/jammy/unity-session Source0: http://archive.ubuntu.com/ubuntu/pool/universe/g/gnome-session/unity-session_%{version}-%{_ubuntu_rel}_all.deb Source1: https://salsa.debian.org/gnome-team/gnome-session/-/raw/ubuntu/master/debian/data/run-systemd-session diff --git a/anda/python/orjson/python3-orjson.spec b/anda/python/orjson/python3-orjson.spec index 166fe57afd..5e98b7cebf 100644 --- a/anda/python/orjson/python3-orjson.spec +++ b/anda/python/orjson/python3-orjson.spec @@ -4,7 +4,7 @@ Name: python3-orjson Version: 3.8.9 Release: 1%{?dist} Summary: Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy -License: MIT or APACHE-2.0 +License: MIT OR Apache-2.0 URL: https://github.com/ijl/orjson Source0: %{url}/archive/refs/tags/%{version}.tar.gz BuildRequires: python3-installer python3.11 python3-pip maturin cargo diff --git a/anda/rust/pop-launcher/pop-launcher.spec b/anda/rust/pop-launcher/pop-launcher.spec index 95703efa70..de9e35b674 100644 --- a/anda/rust/pop-launcher/pop-launcher.spec +++ b/anda/rust/pop-launcher/pop-launcher.spec @@ -10,7 +10,7 @@ Release: 1%{?dist} Summary: Library for writing plugins and frontends for pop-launcher # Upstream license specification: MPL-2.0 -License: MPLv2.0 +License: MPL-2.0 URL: https://github.com/pop-os/launcher/ Source: https://github.com/pop-os/launcher/archive/refs/tags/%{version}.tar.gz Patch: 0001-Copy-instead-of-symlink.patch diff --git a/anda/rust/rnote/rnote.spec b/anda/rust/rnote/rnote.spec index 003436a2cd..9f0436d5ce 100644 --- a/anda/rust/rnote/rnote.spec +++ b/anda/rust/rnote/rnote.spec @@ -2,7 +2,7 @@ Name: rnote Version: 0.5.18 Release: 1%{?dist} Summary: Sketch and take handwritten notes. -License: GPLv3 +License: GPL-3.0 URL: https://github.com/flxzt/rnote Source0: %{url}/releases/download/v%{version}/rnote-%{version}.tar.xz Requires: libadwaita poppler-glib glib2 gtk4 diff --git a/anda/themes/adwaita++-icons/adwaita++-icons.spec b/anda/themes/adwaita++-icons/adwaita++-icons.spec index 7dfd21c2ab..1010332288 100644 --- a/anda/themes/adwaita++-icons/adwaita++-icons.spec +++ b/anda/themes/adwaita++-icons/adwaita++-icons.spec @@ -6,7 +6,7 @@ Version: 6.1 Release: 1%{?dist} Summary: GNOME++, a third-party icons theme, based on new GNOME 3.32's Adwaita -License: GPLv3 and LGPLv3 and CC-BY-SA +License: GPL-3.0 and LGPL-3.0 and CC-BY-SA URL: https://github.com/Bonandry/adwaita-plus Source0: %{url}/archive/refs/tags/v%{version}.tar.gz BuildArch: noarch diff --git a/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec b/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec index dffddaa549..23f328b2e8 100644 --- a/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec +++ b/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec @@ -5,7 +5,7 @@ URL: https://github.com/ful1e5/Bibata_Cursor Source0: %{url}/releases/download/v%{version}/Bibata.tar.gz Source1: https://raw.githubusercontent.com/ful1e5/Bibata_Cursor/v%{version}/README.md Source2: https://raw.githubusercontent.com/ful1e5/Bibata_Cursor/v%{version}/LICENSE -License: GPLv3 +License: GPL-3.0 Summary: Open source, compact, and material designed cursor set. BuildArch: noarch diff --git a/anda/tools/graalvm/graalvm.spec b/anda/tools/graalvm/graalvm.spec index 3b1dc8316b..00d316ce32 100644 --- a/anda/tools/graalvm/graalvm.spec +++ b/anda/tools/graalvm/graalvm.spec @@ -11,7 +11,7 @@ Version: 22.3.1 Release: 1%{?dist} URL: https://www.graalvm.org/ Summary: %{gsummary} -License: GPLv2 +License: GPL-2.0 %description %{desc} diff --git a/anda/tools/melody/melody.spec b/anda/tools/melody/melody.spec index b0cf231e65..eab3273cef 100644 --- a/anda/tools/melody/melody.spec +++ b/anda/tools/melody/melody.spec @@ -6,7 +6,7 @@ Summary: An advanced rpm-ostree compose system Version: 1 Release: 8%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/tau-OS/melody Source0: https://github.com/tau-OS/melody/archive/refs/heads/main.zip @@ -50,4 +50,4 @@ Summary: %{summary} %license LICENSE %doc README.md -%dir %{python3_sitelib}/melody \ No newline at end of file +%dir %{python3_sitelib}/melody diff --git a/anda/tools/muon/muon.spec b/anda/tools/muon/muon.spec index 2a036d7577..87c4982ec8 100644 --- a/anda/tools/muon/muon.spec +++ b/anda/tools/muon/muon.spec @@ -4,7 +4,7 @@ Release: 1%{?dist} Summary: A meson-compatible build system. # muon is licensed under the GPL version 3 (see LICENSE). Tests under tests/project were copied from the meson project tests and are licensed under Apache 2.0. -License: GPLv3 and ASL 2.0 +License: GPL-3.0 AND Apache-2.0 URL: https://muon.build/ Source: https://git.sr.ht/~lattis/muon/archive/%{version}.tar.gz diff --git a/anda/tools/vala-language-server-nightly/vala-language-server-nightly.spec b/anda/tools/vala-language-server-nightly/vala-language-server-nightly.spec index da5361e1de..6fd0e19e75 100644 --- a/anda/tools/vala-language-server-nightly/vala-language-server-nightly.spec +++ b/anda/tools/vala-language-server-nightly/vala-language-server-nightly.spec @@ -13,7 +13,7 @@ Release: 1%{?dist} # The entire source is LGPLv2+, except plugins/gnome-builder/vala_langserv.py, which is GPLv3+. # It is not installed when the "plugins" meson option is set to false. # Since GNOME Builder 41, the VLS the plugin has been included. -License: LGPLv2+ +License: LGPL-2.0+ URL: https://github.com/vala-lang/vala-language-server Source0: https://github.com/vala-lang/vala-language-server/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz diff --git a/anda/tools/vala-lint-nightly/vala-lint-nightly.spec b/anda/tools/vala-lint-nightly/vala-lint-nightly.spec index f32c163ae2..b748527953 100644 --- a/anda/tools/vala-lint-nightly/vala-lint-nightly.spec +++ b/anda/tools/vala-lint-nightly/vala-lint-nightly.spec @@ -10,7 +10,7 @@ Name: vala-lint-nightly Summary: Check Vala code files for code-style errors Version: 0.1.0^%{snapshot_info} Release: 1%{?dist} -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/vala-lang/vala-lint Source0: https://github.com/vala-lang/vala-lint/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz From 90c1feb55c5a7a5ae013e76b32916ae4651329d4 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Thu, 30 Mar 2023 19:06:26 -0700 Subject: [PATCH 73/82] fix: get `click` partially working (#311) * fix: get click partially working * rm(click): remove autoupdate Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --------- Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> Co-authored-by: lleyton --- anda/others/click/click.spec | 14 +++++++++----- anda/others/click/update.rhai | 3 --- 2 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 anda/others/click/update.rhai diff --git a/anda/others/click/click.spec b/anda/others/click/click.spec index 8df1d70cc1..10160908d0 100644 --- a/anda/others/click/click.spec +++ b/anda/others/click/click.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/click -%global commit ff697fae4259e7b0f4bef27e3817f848bc06233a +%global commit 5cb9cd655453bb158fc49e5501c98fe4170b25a8 %forgemeta Name: click @@ -41,9 +41,12 @@ Development files and headers for Click. %package -n python3-lomiri-click Summary: Python3 files for Click Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: ubuntu-sdk +Requires: python3-debian +Requires: python3-gobject %description -n python3-lomiri-click -Python3 files for Click. +Python3 files and the main interface for Click. %package doc Summary: Documentation files for Click @@ -75,9 +78,6 @@ mv _build/html %{buildroot}%_pkgdocdir popd mv README %{buildroot}%_pkgdocdir -# Debian / debhelper stuff not needed -rm -rf %{buildroot}%{_bindir}/dh_click %{buildroot}%{_datarootdir}/debhelper %{buildroot}%{_datarootdir}/perl5 %{buildroot}%{_mandir}/man1/dh_click.1 - %files %license LICENSE %{_sysconfdir}/dbus-1/system.d/com.lomiri.click.conf @@ -103,7 +103,11 @@ rm -rf %{buildroot}%{_bindir}/dh_click %{buildroot}%{_datarootdir}/debhelper %{b %dir %{_sysconfdir}/schroot %dir %{_sysconfdir}/schroot/click %{_sysconfdir}/schroot/click/fstab +%{_bindir}/dh_click %{_bindir}/click +%{_mandir}/man1/dh_click.1.gz +%{_datarootdir}/debhelper/ +%{_datarootdir}/perl5/* %{_unitdir}/click-system-hooks.service %{_userunitdir}/click-user-hooks.service %dir %{python3_sitelib}/click_package diff --git a/anda/others/click/update.rhai b/anda/others/click/update.rhai deleted file mode 100644 index 4fdddac26c..0000000000 --- a/anda/others/click/update.rhai +++ /dev/null @@ -1,3 +0,0 @@ -let o = get("https://gitlab.com/api/v4/projects/25034025/repository/tags").json_arr()[0]; -rpm.global("commit", o.commit.id); -rpm.version(o.name); From 9b93d4f50601cf11b112830e2458812b075731e8 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Thu, 30 Mar 2023 21:13:11 -0700 Subject: [PATCH 74/82] feat: add lomiri (#343) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- ...both-older-qtmir-and-newer-qtmir-wit.patch | 196 ++++++++++++++++++ anda/desktops/lomiri/anda.hcl | 5 + anda/desktops/lomiri/lomiri.spec | 160 ++++++++++++++ 3 files changed, 361 insertions(+) create mode 100644 anda/desktops/lomiri/0001-Add-support-for-both-older-qtmir-and-newer-qtmir-wit.patch create mode 100644 anda/desktops/lomiri/anda.hcl create mode 100644 anda/desktops/lomiri/lomiri.spec diff --git a/anda/desktops/lomiri/0001-Add-support-for-both-older-qtmir-and-newer-qtmir-wit.patch b/anda/desktops/lomiri/0001-Add-support-for-both-older-qtmir-and-newer-qtmir-wit.patch new file mode 100644 index 0000000000..5192b8988e --- /dev/null +++ b/anda/desktops/lomiri/0001-Add-support-for-both-older-qtmir-and-newer-qtmir-wit.patch @@ -0,0 +1,196 @@ +From f97954332706aad8b615637a8ccfa63f3683e16c Mon Sep 17 00:00:00 2001 +From: cat-master21 <96554164+cat-master21@users.noreply.github.com> +Date: Wed, 29 Mar 2023 17:01:45 -0700 +Subject: [PATCH] Add support for both older qtmir and newer qtmir with miroil + +Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> +--- + CMakeLists.txt | 8 ++++++++ + plugins/WindowManager/CMakeLists.txt | 1 + + src/CMakeLists.txt | 2 ++ + src/DisplayConfigurationStorage.cpp | 12 ++++++++---- + src/DisplayConfigurationStorage.h | 11 ++++++++--- + tests/mocks/WindowManager/CMakeLists.txt | 1 + + tests/mocks/WindowManager/MockScreens.cpp | 10 +++++++--- + 7 files changed, 35 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 16243ffcf..2546dda37 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -97,6 +97,14 @@ pkg_check_modules(MIRAL REQUIRED miral) + pkg_check_modules(DEVICEINFO REQUIRED deviceinfo) + pkg_check_modules(LOMIRISCHEMA REQUIRED lomiri-schemas>=0.1.3) + ++if (QTMIRSERVER_VERSION VERSION_GREATER_EQUAL 0.8.0) ++ message("Bulding with miroil") ++ pkg_check_modules(MIROIL REQUIRED miroil) ++ add_definitions(-DUSE_MIROIL=1) ++else() ++ message("Bulding without miroil") ++endif() ++ + ### Check LomiriGestures private headers. No pkg-config (.pc) file is provided for them + find_path(LOMIRIGESTUREPRIV + NAMES LomiriGestures/private/damper_p.h LomiriGestures/private/ucswipearea_p.h LomiriGestures/private/ucswipearea_p_p.h +diff --git a/plugins/WindowManager/CMakeLists.txt b/plugins/WindowManager/CMakeLists.txt +index 4519fd789..02a504891 100644 +--- a/plugins/WindowManager/CMakeLists.txt ++++ b/plugins/WindowManager/CMakeLists.txt +@@ -2,6 +2,7 @@ include_directories( + SYSTEM + ${QTMIRSERVER_INCLUDE_DIRS} + ${Qt5Gui_PRIVATE_INCLUDE_DIRS} ++ ${MIROIL_INCLUDE_DIRS} + ) + + include_directories( +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ac03204b6..2f64d64cc 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -10,6 +10,7 @@ include_directories( + ${GSETTINGS_QT_INCLUDE_DIRS} + ${CONNECTIVITY_INCLUDE_DIRS} + ${QTMIRSERVER_INCLUDE_DIRS} ++ ${MIROIL_INCLUDE_DIRS} + ) + + include_directories( +@@ -56,6 +57,7 @@ target_link_libraries(${SHELL_APP} + ${GSETTINGS_QT_LDFLAGS} + ${QTMIRSERVER_LDFLAGS} + ${SYSTEMD_LDFLAGS} ++ ${MIROIL_LDFLAGS} + LomiriGestures + lomiri-connectivity-qt1 + lomiri-private +diff --git a/src/DisplayConfigurationStorage.cpp b/src/DisplayConfigurationStorage.cpp +index 6cfc478a3..69f73bad1 100644 +--- a/src/DisplayConfigurationStorage.cpp ++++ b/src/DisplayConfigurationStorage.cpp +@@ -23,7 +23,11 @@ + + namespace { + +-inline QString stringFromEdid(const miral::Edid& edid) ++#ifndef USE_MIROIL ++namespace miroil = miral; ++#endif ++ ++inline QString stringFromEdid(const miroil::Edid& edid) + { + QString str; + str += QString::fromStdString(edid.vendor); +@@ -41,7 +45,7 @@ DisplayConfigurationStorage::DisplayConfigurationStorage() + { + } + +-void DisplayConfigurationStorage::save(const miral::DisplayId &displayId, const miral::DisplayConfigurationOptions &options) ++void DisplayConfigurationStorage::save(const miroil::DisplayId &displayId, const miroil::DisplayConfigurationOptions &options) + { + const QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/lomiri/"); + QFile f(dbPath + stringFromEdid(displayId.edid) + ".edid"); +@@ -69,7 +73,7 @@ void DisplayConfigurationStorage::save(const miral::DisplayId &displayId, const + } + } + +-bool DisplayConfigurationStorage::load(const miral::DisplayId &displayId, miral::DisplayConfigurationOptions &options) const ++bool DisplayConfigurationStorage::load(const miroil::DisplayId &displayId, miroil::DisplayConfigurationOptions &options) const + { + const QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/lomiri/"); + QFile f(dbPath + stringFromEdid(displayId.edid) + ".edid"); +@@ -92,7 +96,7 @@ bool DisplayConfigurationStorage::load(const miral::DisplayId &displayId, miral: + QStringList geo = sz.split("x", QString::SkipEmptyParts); + #endif + if (geo.count() == 2) { +- miral::DisplayConfigurationOptions::DisplayMode mode; ++ miroil::DisplayConfigurationOptions::DisplayMode mode; + mode.size = mir::geometry::Size(geo[0].toInt(), geo[1].toInt()); + mode.refresh_rate = jsonMode["refresh_rate"].toDouble(); + options.mode = mode; +diff --git a/src/DisplayConfigurationStorage.h b/src/DisplayConfigurationStorage.h +index bd6a9e479..ab91b372f 100644 +--- a/src/DisplayConfigurationStorage.h ++++ b/src/DisplayConfigurationStorage.h +@@ -17,15 +17,20 @@ + #ifndef LOMIRI_DISPLAYCONFIGURATIONSTORAGE_H + #define LOMIRI_DISPLAYCONFIGURATIONSTORAGE_H + ++#ifndef USE_MIROIL + #include ++namespace miroil = miral; ++#else ++#include ++#endif + +-class DisplayConfigurationStorage : public miral::DisplayConfigurationStorage ++class DisplayConfigurationStorage : public miroil::DisplayConfigurationStorage + { + public: + DisplayConfigurationStorage(); + +- void save(const miral::DisplayId& displayId, const miral::DisplayConfigurationOptions& options) override; +- bool load(const miral::DisplayId& displayId, miral::DisplayConfigurationOptions& options) const override; ++ void save(const miroil::DisplayId& displayId, const miroil::DisplayConfigurationOptions& options) override; ++ bool load(const miroil::DisplayId& displayId, miroil::DisplayConfigurationOptions& options) const override; + }; + + #endif // LOMIRI_DISPLAYCONFIGURATIONSTORAGE_H +diff --git a/tests/mocks/WindowManager/CMakeLists.txt b/tests/mocks/WindowManager/CMakeLists.txt +index 419f7c3d8..6d48450d3 100644 +--- a/tests/mocks/WindowManager/CMakeLists.txt ++++ b/tests/mocks/WindowManager/CMakeLists.txt +@@ -9,6 +9,7 @@ include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/plugins/WindowManager + ${liblomiri-private_SOURCE_DIR} ++ ${MIROIL_INCLUDE_DIRS} + ) + + add_library(mockwindowmanagmentpolicy SHARED +diff --git a/tests/mocks/WindowManager/MockScreens.cpp b/tests/mocks/WindowManager/MockScreens.cpp +index 35ab3f9df..e96b604e8 100644 +--- a/tests/mocks/WindowManager/MockScreens.cpp ++++ b/tests/mocks/WindowManager/MockScreens.cpp +@@ -26,6 +26,10 @@ + + namespace { + ++#ifndef USE_MIROIL ++namespace miroil = miral; ++#endif ++ + QWeakPointer m_screens; + + class MockScreen : public qtmir::Screen +@@ -82,7 +86,7 @@ public: + } + } + +- miral::DisplayId displayId() const override { return m_id; } ++ miroil::DisplayId displayId() const override { return m_id; } + bool used() const override { return m_used; } + QString name() const override { return m_name; } + float scale() const override { return m_scale; } +@@ -141,7 +145,7 @@ Q_SIGNALS: + void outputTypeNameChanged(); + + public: +- miral::DisplayId m_id; ++ miroil::DisplayId m_id; + bool m_active{false}; + bool m_used{true}; + QString m_name; +@@ -167,7 +171,7 @@ MockScreens::MockScreens() + QPoint lastPoint(0,0); + for (int i = 0; i < screenCount; ++i) { + auto screen = new MockScreen(); +- screen->m_id.output_id = miral::OutputId{i}; ++ screen->m_id.output_id = miroil::OutputId{i}; + screen->m_active = i == 0; + screen->m_name = QString("Monitor %1").arg(i); + screen->m_position = QPoint(lastPoint.x(), lastPoint.y()); +-- +2.39.2 + diff --git a/anda/desktops/lomiri/anda.hcl b/anda/desktops/lomiri/anda.hcl new file mode 100644 index 0000000000..26e6e3563e --- /dev/null +++ b/anda/desktops/lomiri/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "lomiri.spec" + } +} diff --git a/anda/desktops/lomiri/lomiri.spec b/anda/desktops/lomiri/lomiri.spec new file mode 100644 index 0000000000..6cdc4ef2a1 --- /dev/null +++ b/anda/desktops/lomiri/lomiri.spec @@ -0,0 +1,160 @@ +%global forgeurl https://gitlab.com/ubports/development/core/lomiri +%global commit c6f7dc9dc556cd003144be79259a6fe71cc09a55 +%forgemeta + +Name: lomiri +Version: 0.1.2 +Release: %autorelease +Summary: A convergent desktop environment by Ubports + +License: GPLv3 AND LGPLv3 +URL: https://gitlab.com/ubports/development/core/lomiri +Source0: %{url}/-/archive/%commit/lomiri-%commit.tar.gz +Patch0: https://sources.debian.org/data/main/l/lomiri/0.1.2-3/debian/patches/disable-broken-test-mir2.patch +Patch1: 0001-Add-support-for-both-older-qtmir-and-newer-qtmir-wit.patch +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: pkgconfig +BuildRequires: g++ +BuildRequires: gcc +#BuildRequires: doxygen +#BuildRequires: doxyqml +BuildRequires: pkgconfig(lomiri-schemas) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(lomiri-shell-application) +BuildRequires: pkgconfig(qtmirserver) +BuildRequires: pkgconfig(geonames) +BuildRequires: pkgconfig(lomiri-shell-launcher) +BuildRequires: pkgconfig(qmenumodel) +BuildRequires: pkgconfig(gnome-desktop-3.0) +BuildRequires: pkgconfig(lomiri-app-launch-0) +BuildRequires: pkgconfig(LomiriGestures) +BuildRequires: pkgconfig(miral) +BuildRequires: pkgconfig(miroil) +BuildRequires: pkgconfig(deviceinfo) +BuildRequires: pkgconfig(gsettings-qt) +BuildRequires: pkgconfig(libqtdbustest-1) +BuildRequires: pkgconfig(libqtdbusmock-1) +BuildRequires: pkgconfig(LomiriSystemSettings) +BuildRequires: pkgconfig(liblightdm-qt5-3) +BuildRequires: pkgconfig(lomiri-connectivity-qt1) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(libusermetricsoutput-1) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(ldm-common) +BuildRequires: pkgconfig(libevdev) +BuildRequires: dbus-test-runner-devel +BuildRequires: dpkg-dev +BuildRequires: pam-devel +BuildRequires: properties-cpp-devel +BuildRequires: qt-devel +BuildRequires: qt5-qtbase-private-devel +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: systemd-rpm-macros +Recommends: lomiri-desktop-session +Requires: xorg-x11-server-Xwayland +Requires: ayatana-indicator-messages +Requires: ayatana-indicator-datetime +Requires: lomiri-sounds +Requires: lomiri-ui-toolkit +Requires: lomiri-download-manager +Requires: suru-icon-theme +Requires: lomiri-schemas + +%description +Lomiri, Previously Unity8 is a convergent desktop environment built with Qt. + +# Documentation needs doxyqml +#package doc +#Summary: Documentation files for {name} +#BuildArch: noarch + +#description doc +#The {name}-doc package contains documenation files for {name}. + +%package tests +Summary: Test files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tests +The %{name}-tests package contains test files for %{name}. + +%prep +%autosetup -n lomiri-%commit -p1 + +%build +%cmake -DWerror=OFF -DDEB_HOST_MULTIARCH=%{_arch} -DCMAKE_INSTALL_LOCALSTATEDIR="%{_localstatedir}" -DDISPLAYED_DISTRO_NAME="Fedora" -DUSE_MIROIL=1 +%cmake_build + +%install +%cmake_install +#cd tests/autopilot && python setup.py install +%find_lang %{name} + +%ldconfig_scriptlets + +%files -f %{name}.lang +%license COPYING COPYING.LGPL +%{_bindir}/indicators-client +%{_bindir}/lomiri +%{_userunitdir}/*.service +%{_libdir}/liblomiri-private.so* +%dir %{_libdir}/lomiri +%dir %{_libdir}/lomiri/qml +%{_libdir}/lomiri/qml/AccountsService/ +%{_libdir}/lomiri/qml/Cursor/ +%{_libdir}/lomiri/qml/GlobalShortcut/ +%{_libdir}/lomiri/qml/Greeter/ +%{_libdir}/lomiri/qml/LightDM/ +%{_libdir}/lomiri/qml/Lomiri/ +%{_libdir}/lomiri/qml/Powerd/ +%{_libdir}/lomiri/qml/ScreenshotDirectory/ +%{_libdir}/lomiri/qml/SessionBroadcast/ +%{_libdir}/lomiri/qml/UInput/ +%{_libdir}/lomiri/qml/Utils/ +%{_libdir}/lomiri/qml/WindowManager/ +%{_libdir}/lomiri/qml/Wizard/ +%{_libexecdir}/lomiri-systemd-wrapper +%{_libexecdir}/Xwayland.lomiri +%{_datadir}/accountsservice/interfaces/com.lomiri.shell.AccountsService.xml +%{_datadir}/applications/*.desktop +%{_datadir}/dbus-1/interfaces/com.lomiri.shell.AccountsService.xml +%{_datadir}/lightdm/greeters/lomiri-greeter.desktop +%{_datadir}/lightdm/lightdm.conf.d/51-lomiri-greeter.conf +%dir %{_datadir}/lomiri +%{_datadir}/lomiri/unlock-device +%{_datadir}/lomiri/qmldir +%{_datadir}/lomiri/*.qml +%{_datadir}/lomiri/ApplicationMenus/ +%{_datadir}/lomiri/Components/ +%{_datadir}/lomiri/Notifications/ +%{_datadir}/lomiri/Stage/ +%{_datadir}/lomiri/Panel/ +%{_datadir}/lomiri/Tutorial/ +%{_datadir}/lomiri/graphics/ +%{_datadir}/lomiri/Rotation/ +%{_datadir}/lomiri/Greeter/ +%{_datadir}/lomiri/Wizard/ +%{_datadir}/lomiri/Launcher/ +%dir %{_sharedstatedir}/lomiri +%{_sharedstatedir}/lomiri/version +%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.wizard.pkla + +%files tests +%{_bindir}/lomiri-mock-indicator-service +%{_libdir}/lomiri/qml/mocks/ +%{_libdir}/lomiri/qml/utils/ +%dir %{_libexecdir}/lomiri +%{_libexecdir}/lomiri/uqmlscene +%dir %{_libexecdir}/lomiri/tests +%{_libexecdir}/lomiri/tests/plugins/ +%{_libexecdir}/lomiri/tests/qmltests/ +%{_libexecdir}/lomiri/tests/scripts/ +%{_datadir}/lomiri/mocks/ +%{_datadir}/lomiri/tests/ + +%changelog +%autochangelog From 291179b62b5aedc52d599f420a48740b6c293b18 Mon Sep 17 00:00:00 2001 From: lleyton Date: Fri, 31 Mar 2023 01:20:46 -0700 Subject: [PATCH 75/82] fix: Remove sync from the update workflows (#344) --- .github/workflows/update-nightly.yml | 7 ------- .github/workflows/update.yml | 7 ------- 2 files changed, 14 deletions(-) diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index 307869ae1b..32d088c92a 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -38,12 +38,5 @@ jobs: git config user.signingkey "${{ runner.temp }}/signing_key" msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')" git commit -S -a -m "$msg" - git format-patch HEAD^ - git checkout f38 - for file in *.patch; do - git apply $file || true - done - rm *.patch - git commit -S -a -m "$msg" git push -u origin --all fi diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 564ea80e66..2396c2d847 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -39,12 +39,5 @@ jobs: git config user.signingkey "${{ runner.temp }}/signing_key" msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')" git commit -S -a -m "$msg" - git format-patch HEAD^ - git checkout f38 - for file in *.patch; do - git apply $file || true - done - rm *.patch - git commit -S -a -m "$msg" git push -u origin --all fi From 3e054fd0c05cf79752ed1c6cf76fa9f69373f8fc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 31 Mar 2023 08:38:27 +0000 Subject: [PATCH 76/82] bump: anki-bin anki-qt5 anki discord-openasar discord dart libhelium ruff youki --- anda/apps/anki-bin/anki-bin.spec | 2 +- anda/apps/anki-qt5/anki-qt5.spec | 2 +- anda/apps/anki/anki.spec | 2 +- anda/apps/discord-openasar/discord-openasar.spec | 2 +- anda/apps/discord/discord.spec | 2 +- anda/dart/dart.spec | 2 +- anda/lib/libhelium/libhelium.spec | 2 +- anda/python/ruff/python3-ruff.spec | 2 +- anda/rust/youki/youki.spec | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec index a58a337069..6cc33ba347 100644 --- a/anda/apps/anki-bin/anki-bin.spec +++ b/anda/apps/anki-bin/anki-bin.spec @@ -1,5 +1,5 @@ Name: anki-bin -Version: 2.1.60 +Version: 2.1.61 Release: 1%{?dist} Summary: Flashcard program for using space repetition learning (Installed with wheel) License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 diff --git a/anda/apps/anki-qt5/anki-qt5.spec b/anda/apps/anki-qt5/anki-qt5.spec index 8015ef7e91..93410b57e9 100644 --- a/anda/apps/anki-qt5/anki-qt5.spec +++ b/anda/apps/anki-qt5/anki-qt5.spec @@ -1,5 +1,5 @@ Name: anki-qt5 -Version: 2.1.60 +Version: 2.1.61 Release: 1%{?dist} Summary: Flashcard program for using space repetition learning License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 diff --git a/anda/apps/anki/anki.spec b/anda/apps/anki/anki.spec index 1e30ac991a..ff6b1f1cc2 100644 --- a/anda/apps/anki/anki.spec +++ b/anda/apps/anki/anki.spec @@ -1,5 +1,5 @@ Name: anki -Version: 2.1.60 +Version: 2.1.61 Release: 1%{?dist} Summary: Flashcard program for using space repetition learning License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index 22787cc172..d4798335a9 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: discord-openasar -Version: 0.0.25 +Version: 0.0.26 Release: 1%{?dist} Summary: OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index dbfe001a54..a8e068f5a1 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: discord -Version: 0.0.25 +Version: 0.0.26 Release: 1%{?dist} Summary: Free Voice and Text Chat for Gamers. URL: discord.com diff --git a/anda/dart/dart.spec b/anda/dart/dart.spec index 9c6bb7f9e4..5cd6e26422 100644 --- a/anda/dart/dart.spec +++ b/anda/dart/dart.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: dart -Version: 2.19.5 +Version: 2.19.6 Release: 1%{?dist} Summary: The Dart Language License: BSD-3-Clause diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index 6086cd422b..2abfc881c8 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -1,6 +1,6 @@ Summary: The Application Framework for tauOS apps Name: libhelium -Version: 1.5.12 +Version: 1.5.14 Release: 1%{?dist} License: GPL-3.0 URL: https://github.com/tau-OS/libhelium diff --git a/anda/python/ruff/python3-ruff.spec b/anda/python/ruff/python3-ruff.spec index dfd3af166e..861a3cf57b 100644 --- a/anda/python/ruff/python3-ruff.spec +++ b/anda/python/ruff/python3-ruff.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: python3-ruff -Version: 0.0.259 +Version: 0.0.260 Release: 1%{?dist} Summary: An extremely fast Python linter, written in Rust License: MIT diff --git a/anda/rust/youki/youki.spec b/anda/rust/youki/youki.spec index 43cc601a86..2ab5af5683 100644 --- a/anda/rust/youki/youki.spec +++ b/anda/rust/youki/youki.spec @@ -1,6 +1,6 @@ Name: youki -Version: 0.0.4 -Release: 2%{?dist} +Version: 0.0.5 +Release: 1%{?dist} Summary: A container runtime written in Rust License: Apache-2.0 From a88cdddbcff4cfa0a4baff83aa0f09c63f639289 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 31 Mar 2023 21:54:02 -0700 Subject: [PATCH 77/82] fix(lomiri-schemas): revert remove feature (#345) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/others/lomiri-schemas/lomiri-schemas.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/anda/others/lomiri-schemas/lomiri-schemas.spec b/anda/others/lomiri-schemas/lomiri-schemas.spec index 61a50dc47d..e76904320e 100644 --- a/anda/others/lomiri-schemas/lomiri-schemas.spec +++ b/anda/others/lomiri-schemas/lomiri-schemas.spec @@ -9,7 +9,6 @@ Summary: Configuration schemas for lomiri License: LGPL-2.0-or-later URL: https://gitlab.com/ubports/development/core/lomiri-schemas Source0: %url/-/archive/%commit/lomiri-schemas-%commit.tar.gz -Patch0: https://gitlab.com/cat-master21/lomiri-schemas/-/commit/e32de385c858f9096c6014a3749117fa6f94f231.patch BuildArch: noarch BuildRequires: cmake @@ -22,7 +21,7 @@ BuildRequires: intltool Configuration schemas for lomiri desktop enviroment. %prep -%autosetup -n %{name}-%commit -p1 +%autosetup -n %{name}-%commit %build %cmake -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=true From 1c991c34927d487fcd61c8e6b6ba99e61ea172d3 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 31 Mar 2023 21:58:36 -0700 Subject: [PATCH 78/82] add: lomiri-session (#348) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/others/lomiri-session/anda.hcl | 5 ++ .../others/lomiri-session/lomiri-session.spec | 58 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 anda/others/lomiri-session/anda.hcl create mode 100644 anda/others/lomiri-session/lomiri-session.spec diff --git a/anda/others/lomiri-session/anda.hcl b/anda/others/lomiri-session/anda.hcl new file mode 100644 index 0000000000..7f84a8142d --- /dev/null +++ b/anda/others/lomiri-session/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "lomiri-desktop-session.spec" + } +} diff --git a/anda/others/lomiri-session/lomiri-session.spec b/anda/others/lomiri-session/lomiri-session.spec new file mode 100644 index 0000000000..7f1ce2fb0c --- /dev/null +++ b/anda/others/lomiri-session/lomiri-session.spec @@ -0,0 +1,58 @@ +%global forgeurl https://gitlab.com/ubports/development/core/lomiri-session +%global commit 94a0d8d12e63fd4a298fb4cdce5f11e0a20bdb8c +%forgemeta + +Name: lomiri-session +Version: 0.2 +Release: %autorelease +Summary: Configuration schemas for lomiri +License: LGPLv3 +URL: https://gitlab.com/ubports/development/core/lomiri-session +Source0: %{url}/-/archive/%commit/lomiri-desktop-session-%commit.tar.gz +Patch0: https://sources.debian.org/data/main/l/lomiri-session/0.2-3/debian/patches/0001_desktop-dm-lomiri-session-Drop-old-wizard-has-run-ch.patch +Patch1: https://sources.debian.org/data/main/l/lomiri-session/0.2-3/debian/patches/0002_lomiri-session-Put-evaluation-of-ps-call-in-quotes.patch +Patch2: https://sources.debian.org/data/main/l/lomiri-session/0.2-3/debian/patches/0003_lomiri-session-Properly-differentiate-between-Ubuntu.patch +Patch3: https://sources.debian.org/data/main/l/lomiri-session/0.2-3/debian/patches/0004_lomiri-session-Check-for-presence-of-Xwayland-use-th.patch +Patch4: https://sources.debian.org/data/main/l/lomiri-session/0.2-3/debian/patches/0005_systemd-lomiri.service-Drop-Before-and-Wants-for-ind.patch +BuildArch: noarch + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(libsystemd) +BuildRequires: inotify-tools +BuildRequires: lomiri +BuildRequires: systemd-rpm-macros +Recommends: libayatana-common +Requires: dbus-common +Requires: inotify-tools +Requires: lomiri + +%description +Configuration schemas for lomiri. + +%prep +%autosetup -n %{name}-%commit -p1 + +%build +%cmake -DENABLE_TOUCH_SESSION=OFF +%cmake_build + +%install +%cmake_install + +%files +%license LICENSE +%{_bindir}/dm-lomiri-session +%{_bindir}/lomiri-* +%dir %{_prefix}/lib/lomiri-session +%{_prefix}/lib/lomiri-session/run-systemd-session +%{_userunitdir}/lomiri.service +# Touch session, needs lomiri-system-compositor +#{_datadir}/lightdm/lightdm.conf.d/52-lomiri-touch.conf +#{_datadir}/lightdm/sessions/lomiri-touch.desktop +#dir {_datadir}/lomiri-session +#{_datadir}/lomiri-session/lsc-wrapper +%{_datadir}/wayland-sessions/lomiri.desktop + +%changelog +%autochangelog From a89442b109a3d9c90d10d8cc70c487b9da9d5193 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 31 Mar 2023 21:59:01 -0700 Subject: [PATCH 79/82] fix(lomiri-indicator-network): make sure gmenuharness is included (#346) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec b/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec index 1907de60e2..c0e6130a83 100644 --- a/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec +++ b/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec @@ -31,6 +31,7 @@ BuildRequires: pkgconfig(libgmenuharness) BuildRequires: pkgconfig(ofono) BuildRequires: pkgconfig(qofono-qt5) BuildRequires: pkgconfig(lomiri-url-dispatcher) +Requires: gmenuharness %description The "Network" indicator for Ubuntu Touch and Lomiri. From f5ec16fa0cfc6a16946645852c2533f532de805c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 1 Apr 2023 12:25:19 +0000 Subject: [PATCH 80/82] bump: iosevka-fusion --- anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec index ddbba4bc1a..3654bb6e4c 100644 --- a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec +++ b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: iosevka-fusion-fonts -Version: 21.1.1 +Version: 22.0.0 Release: 1%{?dist} Summary: A custom font based on iosevka From 1af7097946b5de2d58c7c477d93d4b71d72d26e7 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Sat, 1 Apr 2023 21:24:16 -0700 Subject: [PATCH 81/82] fix(lomiri): add missing dependencies (#347) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> Co-authored-by: madomado --- anda/desktops/lomiri/lomiri.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anda/desktops/lomiri/lomiri.spec b/anda/desktops/lomiri/lomiri.spec index 6cdc4ef2a1..e0ea69952a 100644 --- a/anda/desktops/lomiri/lomiri.spec +++ b/anda/desktops/lomiri/lomiri.spec @@ -54,7 +54,9 @@ BuildRequires: qt-devel BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtdeclarative-devel BuildRequires: systemd-rpm-macros -Recommends: lomiri-desktop-session +Recommends: lomiri-session +Requires: lomiri-system-settings +Requires: qmenumodel Requires: xorg-x11-server-Xwayland Requires: ayatana-indicator-messages Requires: ayatana-indicator-datetime From 870abef427d5a9ceee2a9a2672ad07688ba5d94b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 2 Apr 2023 11:11:07 +0000 Subject: [PATCH 82/82] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index 19273e9288..bafc72c5c1 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -1,4 +1,4 @@ -%define osuresver 2023.320.0 +%define osuresver 2023.402.0 %global debug_package %{nil} Name: osu-lazer