Update gradle.spec

Signed-off-by: madomado <madonuko@outlook.com>
Update gradle.spec
2026-06-23 12:00:40 +00:00 · 2024-07-12 14:18:21 +08:00 · 2024-07-12 14:05:45 +08:00 · 2024-07-12 01:26:57 +08:00 · 2024-07-11 15:30:02 +00:00 · 2024-07-11 18:32:54 +07:00
61 changed files with 502 additions and 145 deletions
@@ -5,16 +5,41 @@ on:
      packages:
        description: "Packages to Build"
        required: true
+      custom_builder:
+        description: "Custom Builder"
+        required: false
+        default: ""
+      architecture:
+        description: "Architecture"
+        required: false
+        default: all
+        type: string
+    
+

 jobs:
  parse:
    outputs:
      pkgs: ${{ steps.parsing.outputs.pkgs }}
+      builder: ${{ inputs.custom_builder }}
+      arch: ${{ steps.parsing.outputs.arch }}
    runs-on: "ubuntu-latest"
    steps:
      - name: Parse Input
        id: parsing
-        run: echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
+        run: |
+            echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
+            echo "builder=${{ inputs.custom_builder }}" >> $GITHUB_OUTPUT
+            arch="${{ inputs.architecture }}"
+            # Convert to json array using jq
+            # if arch is not all, convert to array
+            if [ "$arch" != "all" ]; then
+              # jq, array with single element as string
+               arch=$(echo $arch | sed 's/,/\n/g')
+               echo "arch=$(echo $arch | jq -Rs 'split("\n")' | jq 'map(select(length > 0))' | jq -c .)" >> $GITHUB_OUTPUT
+            else
+               echo "arch=$(echo '["aarch64", "x86_64"]' | jq -c .)" >> $GITHUB_OUTPUT
+            fi

  build:
    needs: parse
@@ -22,9 +47,9 @@ jobs:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
        version: ["rawhide"]
-        arch: ["x86_64", "aarch64"]
+        arch: ${{ fromJson(needs.parse.outputs.arch) }}
      fail-fast: false
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
    container:
      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.444
+Version:        0.0.452
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary
-Version:        0.0.444
+Version:        0.0.452
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-openasar
-Version:        0.0.58
+Version:        0.0.59
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.58
+Version:		0.0.59
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -3,7 +3,7 @@
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision
-Version:        %commit_date.%commit
+Version:        %commit_date.%shortcommit
 Release:        1%?dist
 Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
 License:        AGPL-3.0-or-later
@@ -1,6 +1,6 @@
-%global commit bcc72f97ef1106b8ed028ebcdd1897351f10caa7
+%global commit 14571f0f7793fe60ca14a25fc45adbe1e5b6a1e8
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240706
+%global commit_date 20240711
 %global ver v0.38.0

 Name:           mpv-nightly
@@ -0,0 +1,6 @@
+project pkg {
+    arches = ["x86_64"]
+    rpm {
+        spec = "mugshot.spec"
+    }
+}
@@ -0,0 +1,62 @@
+%global app org.bluesabre.Mugshot
+%global _description %{expand:
+Mugshot is a lightweight user configuration utility for Linux designed for simplicity and ease of
+use. Quickly update your personal profile and sync your updates across applications.}
+
+
+Name:           python-mugshot
+Version:        0.4.3
+Release:        1%?dist
+Summary:        User Management Utility for Linux
+License:        GPL-3.0
+URL:            https://github.com/bluesabre/mugshot
+Source0:        %url/archive/refs/tags/mugshot-%version.tar.gz
+BuildArch:      noarch
+BuildRequires:  python3-devel
+BuildRequires:  python3-pip
+BuildRequires:  python3-distutils-extra
+BuildRequires:  python3-wheel
+BuildRequires:  python3-setuptools
+BuildRequires:  glib2
+BuildRequires:  desktop-file-utils
+BuildRequires:  libappstream-glib
+
+%description %_description
+
+%package -n mugshot
+Requires:       util-linux-user
+Requires:       python3-cairo
+Requires:       python3-pexpect
+Requires:       python3-gobject
+Summary:        User Management Utility for Linux
+
+%description -n mugshot %_description
+
+%prep
+%autosetup -n mugshot-mugshot-%version
+
+%build
+%pyproject_wheel
+
+%install
+%pyproject_install
+%pyproject_save_files -L 'mugshot*'
+install -Dm644 data/glib-2.0/schemas/%{lower:%app}.gschema.xml %buildroot%_datadir/glib-2.0/schemas/
+
+%find_lang mugshot
+
+%check
+#pyproject_check_import
+desktop-file-validate %buildroot%_datadir/applications/%app.desktop
+appstream-util validate-relax --nonet %buildroot%_metainfodir/mugshot.appdata.xml
+
+%files -n mugshot -f %{pyproject_files} -f mugshot.lang
+%doc README.md NEWS
+%license COPYING
+%_bindir/mugshot
+%_datadir/glib-2.0/schemas/%{lower:%app}.gschema.xml
+%_datadir/applications/%app.desktop
+%_datadir/mugshot/
+%_metainfodir/mugshot.appdata.xml
+%_mandir/man1/mugshot.1.gz
+%_iconsdir/hicolor/*/apps/mugshot.svg
@@ -0,0 +1,3 @@
+let v = gh("bluesabre/mugshot");
+v.crop(8);
+rpm.version(v);
@@ -3,8 +3,8 @@
 
 Name:           elementary-sideload
 Summary:        Sideload flatpaks on Pantheon
-Version:        6.2.1
-Release:        1%{?dist}
+Version:        6.2.2
+Release:        1%?dist
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/sideload
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "pantheon-tweaks.spec"
-	}
-}
@@ -1,37 +0,0 @@
-Name:			pantheon-tweaks
-Version:		2.0.2
-Release:		1%?dist
-Summary:		A system settings panel for the Pantheon desktop environment
-License:		GPL-3.0
-URL:			https://github.com/pantheon-tweaks/pantheon-tweaks
-Source0:		%{url}/archive/refs/tags/%{version}.tar.gz
-BuildRequires:	vala switchboard-devel pkgconfig(gee-0.8) pkgconfig(glib-2.0)
-BuildRequires:	granite-devel >= 6.0.0 pkgconfig(gtk+-3.0) meson vala
-Requires:		gtk3 granite
-
-%description
-A system settings panel for the Pantheon Desktop that
-lets you easily and safely customise your desktop's appearance.
-
-%prep
-%autosetup
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%files
-%doc README.md
-%license COPYING
-/usr/lib64/switchboard/personal/libpantheon-tweaks.so
-%{_datadir}/icons/hicolor/32x32/categories/preferences-desktop-tweaks.svg
-%{_datadir}/locale/*/LC_MESSAGES/pantheon-tweaks-plug.mo
-%{_datadir}/metainfo/pantheon-tweaks.metainfo.xml
-
-
-%changelog
-* Tue Jan 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 1.0.4-1
- Initial package
@@ -1 +0,0 @@
-rpm.version(gh("pantheon-tweaks/pantheon-tweaks"));
@@ -2,16 +2,20 @@

 %global plug_type personal
 %global plug_name pantheon-tweaks
+%global app io.github.pantheon_tweaks.pantheon-tweaks

 Name:           switchboard-plug-tweaks
 Summary:        Switchboard Tweaks Plug
 Version:        2.0.2
-Release:        1%?dist
+Release:        2%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/pantheon-tweaks/pantheon-tweaks
 Source0:        %{url}/archive/%{version}/%{plug_name}-%{version}.tar.gz

+Provides:       pantheon-tweaks = %version-%release
+Obsoletes:      pantheon-tweaks < 2.0.2-2
+
 BuildRequires:  gcc
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -22,7 +26,7 @@ BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite) >= 6.0.0
 BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(switchboard-2.0)
+BuildRequires:  pkgconfig(switchboard-3)

 Requires:       switchboard%{?_isa}

@@ -63,28 +67,22 @@ de trabalho.
 %install
 %meson_install

-%find_lang %{plug_name}-plug
+%find_lang %{plug_name}

 # remove the specified stock icon from metainfo (invalid in libappstream-glib)
-sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_name}.metainfo.xml
+sed -i '/icon type="stock"/d' %buildroot%_metainfodir/%app.metainfo.xml

 %check
-appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{plug_name}.metainfo.xml
+appstream-util validate-relax --nonet %buildroot%_metainfodir/%app.metainfo.xml


-%files -f %{plug_name}-plug.lang
+%files -f %{plug_name}.lang
 %license COPYING
 %doc README.md
 %doc AUTHORS
 %doc CONTRIBUTORS

-%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
-
-%{_datadir}/metainfo/%{plug_name}.metainfo.xml
-%{_datadir}/icons/hicolor/*/categories/preferences-*.svg
-
-
-%changelog
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
- Repackaged for Terra
+%_bindir/pantheon-tweaks
+%_datadir/applications/%app.desktop
+%_iconsdir/hicolor/*/apps/%app.svg
+%_metainfodir/io.github.pantheon_tweaks.pantheon-tweaks.metainfo.xml
@@ -4,7 +4,7 @@

 %global plug_type hardware
 %global plug_name wacom
-%global plug_rdnn io.elementary.switchboard.wacom
+%global plug_rdnn io.elementary.settings.wacom

 Name:           switchboard-plug-wacom
 Summary:        Switchboard Wacom Plug
@@ -25,7 +25,7 @@ BuildRequires:  pkgconfig(libwacom)
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xi)
-BuildRequires:  switchboard-devel
+BuildRequires:  pkgconfig(switchboard-3)

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -45,22 +45,18 @@ Supplements:    switchboard%{?_isa}
 %install
 %meson_install

-%find_lang %{plug_name}-plug
+%find_lang %{plug_rdnn}


 %check
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


-%files -f %{plug_name}-plug.lang
+%files -f %{plug_rdnn}.lang
 %doc README.md
 %license COPYING

-%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
+%{_libdir}/switchboard-3/%{plug_type}/lib%{plug_name}.so

-%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
-
-%changelog
-* Tue Jun 13 2023 windowsboy111 <windowsboy111@fyralabs.com> - 1.0.1-1
- Initial package.
+%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit 99fa99c6e8af868f64dbfdb973eebeb2ca3ad14a
+%global commit af441bdb31bb76b207119a8c91eef3fa93c0c078
 %forgemeta

 Name:           lomiri-app-launch
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 1a80200cd84b1b71715f91bf9e278ef46a8cbb6b
+%global commit 73c2249ea78d2ca080ed907a9d60c18ce42db25f
 %forgemeta

 Name:       lomiri-system-settings
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
-%global commit 28178b0be8fc2c66934da155dee1c6238ecc98c0
+%global commit 8f490672f9853278b0aec6435a68d56b9eaf8207
 %forgemeta

 Name:           lomiri-ui-toolkit
-Version:        1.3.5012
-Release:        1%{?dist}
+Version:        1.3.5100
+Release:        1%?dist
 Summary:        QML components to ease the creation of beautiful applications in QML for Lomiri

 License:        LGPL-3.0
@@ -1,4 +1,5 @@
 rpm.version(gitlab_tag("19057685"));
 if rpm.changed() {
-	rpm.global("commit", gitlab_commit("19057685"));
+	rpm.global("commit", gitlab_commit("19057685", "main"));
+	rpm.release();
 }
@@ -12,7 +12,7 @@
 %endif

 Name:			codium
-Version:		1.90.2.24171
+Version:		1.91.0.24190
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
@@ -1,7 +1,7 @@
 if filters.contains("nightly") {
  rpm.global("commit", gh_commit("zed-industries/zed"));
  if rpm.changed() {
-    let v = find("(\\d+\\.\\d+\\d+\\.\\d+)", find("\nversion = \"(\\d+\\.\\d+\\d+\\.\\d+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1), 1);
+    let v = find("\nversion = \"([.\\d]+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1);
    rpm.global("ver", v);
    rpm.global("commit_date", date());
    rpm.release();
@@ -5,6 +5,10 @@ for release in releases {
  }
  let tag = release.tag_name;
  tag.pop(4); // remove the "-pre" suffix
+  tag.crop(1); // remove "v"
  rpm.global("ver", tag);
-  terminate();
+  break;
+  if rpm.changed() {
+    rpm.release();
+  }
 }
@@ -1,6 +1,6 @@
 %bcond_without check
 %global debug_package %{nil}
-%global ver 0.142.1
+%global ver 0.144.0

 %global crate zed
 %global app_id dev.zed.Zed-Preview
@@ -0,0 +1,8 @@
+project pkg {
+  rpm {
+    spec = "zed.spec"
+  }
+  labels {
+    large = 1
+  }
+}
@@ -0,0 +1 @@
+rpm.version(gh("zed-industries/zed"));
@@ -0,0 +1,93 @@
+%bcond_without check
+
+# Exclude input files from mangling
+%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
+
+%global crate zed
+%global app_id dev.zed.Zed
+
+Name:           zed
+Version:        0.143.6
+Release:        1%?dist
+Summary:        Zed is a high-performance, multiplayer code editor
+
+License:        MIT
+URL:            https://zed.dev/
+Source0:        https://github.com/zed-industries/zed/archive/refs/tags/v%{version}.tar.gz
+
+Conflicts:      zed
+Provides:       zed
+
+BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  anda-srpm-macros
+BuildRequires:  gcc
+BuildRequires:  g++
+BuildRequires:  clang
+BuildRequires:  mold
+BuildRequires:  alsa-lib-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  wayland-devel
+BuildRequires:  libxkbcommon-x11-devel
+BuildRequires:  openssl-devel
+BuildRequires:  libzstd-devel
+BuildRequires:  perl-FindBin
+BuildRequires:  perl-IPC-Cmd
+BuildRequires:  perl-File-Compare
+BuildRequires:  perl-File-Copy
+BuildRequires:  perl-lib
+BuildRequires:  vulkan-loader
+BuildRequires:  libcurl-devel
+
+%description
+Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep_online
+
+export DO_STARTUP_NOTIFY="true"
+export APP_ID="%app_id"
+export APP_ICON="%app_id"
+export APP_NAME="Zed Editor"
+export APP_CLI="zed"
+export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed from Terra."
+export ZED_RELEASE_CHANNEL=stable
+export BRANDING_LIGHT="#e9aa6a"
+export BRANDING_DARK="#1a5fb4"
+
+echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
+envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
+
+envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
+
+%build
+export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed from Terra."
+echo "stable" > crates/zed/RELEASE_CHANNEL
+
+%cargo_build -- --package zed --package cli
+script/generate-licenses
+
+%install
+install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
+install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
+
+install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
+install -Dm644 crates/zed/resources/app-icon.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
+
+install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files
+%{_libexecdir}/zed-editor
+%{_bindir}/zed
+%{_datadir}/applications/%app_id.desktop
+%{_datadir}/pixmaps/%app_id.png
+%{_metainfodir}/%app_id.metainfo.xml
+%license assets/licenses.md
+
+%changelog
+%autochangelog
@@ -1,11 +1,11 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit 5973c1c45e8afef8ca19da80ef216b3cac89df4d
+%global commit 5f345cedea44ec0037e684436d1bcd94e1ae5b95
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f

-%global commit_date 20240706
+%global commit_date 20240710
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_without qt6
@@ -1,7 +1,7 @@
 %define debug_package %nil

 Name:			crystal
-Version:		1.12.2
+Version:		1.13.0
 Release:		1%?dist
 Summary:		The Crystal Programming Language
 License:		Apache-2.0
@@ -1,2 +1 @@
-let html = get("https://crystal-lang.org/");
-rpm.version(find("Latest release: <strong>(.+?)</strong>", html, 1))
+rpm.version(gh("crystal-lang/crystal"));
@@ -2,4 +2,7 @@ project pkg {
  rpm {
    spec = "albius.spec"
  }
+  labels {
+    nightly = 1
+  }
 }
@@ -1 +1,7 @@
-rpm.version(gh("Vanilla-OS/Albius"));
+if filters.contains("nightly") {
+  rpm.global("commit", gh_commit("Vanilla-OS/Albius"));
+  if rpm.changed() {
+    rpm.global("commit_date", date());
+    rpm.release();
+  }
+}
@@ -1,8 +1,8 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 05df263b84de9008266b3d53e2c28b009890ca61
+%global commit e53a2ed19bf452c2f5db7b691c403a43a26fd5c3
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.1
-%global commit_date 20240704
+%global commit_date 20240711
 %global debug_package %nil

 Name:			nim-nightly
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "python3-pillow-heif.spec"
+	}
+}
@@ -0,0 +1,115 @@
+%global py3_incdir %(RPM_BUILD_ROOT= %{python3} -Ic 'import sysconfig; print(sysconfig.get_path("include"))')
+
+%global srcname pillow-heif
+
+# Dependencies are missing to build the documentation
+%bcond_with doc
+
+Name:           python-%{srcname}
+Version:        0.17.0
+Release:        0%{?dist}
+Summary:        Python library for working with HEIF images and plugin for Pillow
+
+License:        BSD-3-Clause
+URL:            https://github.com/bigcat88/pillow_heif
+Source0:        https://github.com/bigcat88/pillow_heif/archive/refs/tags/v%{version}/pillow-heif-%{version}.tar.gz
+Source1:        test.py
+
+BuildRequires:  gcc
+BuildRequires:  python%{python3_pkgversion}-pytest
+BuildRequires:  python%{python3_pkgversion}
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-pillow-devel
+BuildRequires:  libheif-devel
+%if %{with doc}
+BuildRequires:  make
+BuildRequires:  python%{python3_pkgversion}-sphinx
+BuildRequires:  python%{python3_pkgversion}-sphinx-copybutton
+BuildRequires:  python%{python3_pkgversion}-sphinx-issues
+BuildRequires:  python%{python3_pkgversion}-sphinx_rtd_theme
+%endif
+
+%description
+Python library for working with HEIF images and plugin for Pillow
+
+There are two subpackages: devel (development) and doc (documentation).
+
+%package -n python%{python3_pkgversion}-%{srcname}
+Summary:        Python library for working with HEIF images and plugin for Pillow
+Requires:       python%{python3_pkgversion}-pillow
+Requires:       libheif
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
+
+%description -n python%{python3_pkgversion}-%{srcname}
+Python library for working with HEIF images and plugin for Pillow
+
+There are two subpackages: devel (development) and doc (documentation).
+
+%package -n python%{python3_pkgversion}-%{srcname}-devel
+Summary:        Development files for %{srcname}
+Requires:       python%{python3_pkgversion}-devel, libheif-devel
+Requires:       python%{python3_pkgversion}-%{srcname}%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}-devel}
+
+%description -n python%{python3_pkgversion}-%{srcname}-devel
+Development files for %{srcname}.
+
+
+%package -n python%{python3_pkgversion}-%{srcname}-doc
+Summary:        Documentation for %{srcname}
+BuildArch:      noarch
+Requires:       python%{python3_pkgversion}-%{srcname} = %{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}-doc}
+
+%description -n python%{python3_pkgversion}-%{srcname}-doc
+Documentation for %{srcname}.
+
+
+%prep
+%autosetup -p1 -n pillow_heif-%{version}
+
+
+%build
+# Native build
+%py3_build
+
+# Doc build
+%if %{with doc}
+PYTHONPATH=$(echo $PWD/build/lib.linux-*) make -C docs html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version
+rm -f docs/_build_py3/html/.buildinfo
+%endif
+
+
+%install
+# Native build
+%py3_install
+
+%check
+# Check Python 3 modules
+cp %{SOURCE1} $(echo $PWD/build/lib.linux-*)/
+pushd build/lib.linux-*
+PYTHONPATH=$PWD %{__python3} test.py
+pytest pillow_heif && echo "Test done"
+popd
+
+%files -n python%{python3_pkgversion}-%{srcname}
+%doc README.md CHANGELOG.md
+%license LICENSE.txt
+%{python3_sitearch}/pillow_heif/
+%{python3_sitearch}/pillow_heif-%{version}-py%{python3_version}.egg-info/
+%{python3_sitearch}/_pillow_heif.*.so
+
+%files -n python%{python3_pkgversion}-%{srcname}-devel
+
+%if %{with doc}
+%files -n python%{python3_pkgversion}-%{srcname}-doc
+%doc docs/_build_py3/html
+%endif
+
+%changelog
+* Wed Jul 10 2024 Trung Lê <8@tle.id.au> - 0.17.0-0
+- New upstream release
+
+* Thu Jun 27 2024 Trung Lê <8@tle.id.au> - 0.16.0-1
+- Initial RPM package
@@ -0,0 +1,2 @@
+import pillow_heif;
+print(pillow_heif.libheif_info());
@@ -0,0 +1 @@
+rpm.version(pypi("pillow-heif"));
@@ -6,7 +6,7 @@ Release:		1%?dist
 Summary:		An extremely fast Python linter, written in Rust
 License:		MIT
 URL:			https://beta.ruff.rs/
-Source0:		https://github.com/astral-sh/ruff/archive/refs/tags/v%{version}.tar.gz
+Source0:		https://github.com/astral-sh/ruff/archive/refs/tags/%{version}.tar.gz
 BuildRequires:	python3-installer python3-pip maturin cargo
 Provides:		python3.11dist(ruff) = %{version}

@@ -2,7 +2,7 @@
 %global crate maturin

 Name:           rust-terra-maturin
-Version:        1.6.0
+Version:        1.7.0
 Release:        1%?dist
 Summary:        Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages

@@ -3,7 +3,7 @@
 %bcond_with tests

 Name:           apparmor
-Version:        4.0.0~alpha3
+Version:        4.0.1
 Release:        2%{?dist}
 Summary:        AppArmor userspace components

@@ -11,8 +11,8 @@ Summary:        AppArmor userspace components
 %global normver %(echo %version | sed 's/~/-/')

 License:        GPL-2.0
-URL:            https://launchpad.net/apparmor
-Source0:        %{url}/%{baseversion}/%normver/+download/%{name}-%{version}.tar.gz
+URL:            https://gitlab.com/apparmor/apparmor
+Source0:        %url/-/archive/v%version/apparmor-v%version.tar.gz
 Source1:        apparmor.preset
 Patch01:        0001-fix-avahi-daemon-authselect-denial-in-fedora.patch

@@ -32,6 +32,7 @@ BuildRequires:  gettext
 BuildRequires:  pam-devel
 BuildRequires:  httpd-devel
 BuildRequires:  systemd-rpm-macros
+BuildRequires:  autoconf-archive
 BuildRequires:  gawk
 BuildRequires:  which
 %if %{with tests}
@@ -138,7 +139,7 @@ confinement policies when running virtual hosts in the webserver by using the
 changehat abilities exposed through libapparmor.

 %prep
-%autosetup -p1 -n %{name}-%{version}
+%autosetup -p1 -n %name-v%version
 sed -i 's/@VERSION@/%normver/g' libraries/libapparmor/swig/python/setup.py.in
 sed -i 's/${VERSION}/%normver/g' utils/Makefile

@@ -265,7 +266,6 @@ make -C utils check
 %doc parser/README
 %doc parser/*.[1-9].html
 %doc common/apparmor.css
-%doc parser/techdoc.pdf
 %{_sbindir}/apparmor_parser
 %{_bindir}/aa-enabled
 %{_bindir}/aa-exec
@@ -276,8 +276,8 @@ make -C utils check
 %{_presetdir}/70-apparmor.preset
 %{_prefix}/lib/apparmor
 %dir %{_sysconfdir}/apparmor
+%config(noreplace) %{_sysconfdir}/apparmor.d/
 %config(noreplace) %{_sysconfdir}/apparmor/parser.conf
-%{_sharedstatedir}/apparmor
 %{_mandir}/man1/aa-enabled.1.gz
 %{_mandir}/man1/aa-exec.1.gz
 %{_mandir}/man1/aa-features-abi.1.gz
@@ -1,4 +1 @@
-let html = get("https://launchpad.net/apparmor");
-let v = find("Latest version is ([\\d.\\w\\-]+)", html, 1);
-v.replace('-', '~');
-rpm.version(v);
+rpm.version(gitlab_tag("4484878"));
@@ -1,5 +1,5 @@
-%global commit 3cd93569871cad8b8f6d0639d462ea2140f99ad8
-%global ver 1.8.32
+%global commit cb164927417f22811c74cd8678ed4a5ab7cb80ba
+%global ver 1.8.33
 %global commit_date 20240219
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

@@ -1,5 +1,5 @@
-%global commit 7cb289b6466b662fdf9f7d7ccc9f3c08a7dc0cac
-%global commit_date 20240219
+%global commit e1176e63ccbee51ab59fdb8afaed2bf5af8427d1
+%global commit_date 20240711
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global debug_package %{nil}
 %define __os_install_post %{nil}
@@ -1,5 +1,5 @@
-%global commit 1889baff16c08ddf2382d95ca18caa37001d5971
-%global commit_date 20240418
+%global commit 5f56dd60b256061a036e5f5b494da570a299cdee
+%global commit_date 20240708
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global debug_package %{nil}
 %define __os_install_post %{nil}
@@ -1,5 +1,5 @@
 Name:		limine
-Version:	7.9.1
+Version:	7.9.2
 Release:	1%?dist
 Summary:	Modern, advanced, portable, multiprotocol bootloader
 License:	BSD-2-Clause
@@ -1,6 +1,8 @@
 project "pkg" {
    rpm {
        spec = "nvidia-patch.spec"
-        nightly = "1"
    }
+   	labels {
+		nightly = "1"
+	}
 }
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
-%global commit 564c0661a942f7163cb2cfa6cb1b14b4bcff3a30
+%global commit 87fe7b874b3db1489d7313c667130ef22c445bd7
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240218
+%global commit_date 20240711


 %global patches %{_datadir}/src/nvidia-patch
@@ -3,14 +3,18 @@
 %elifarch aarch64
 %global arch arm64
 %endif
+# do not strip binaries
+%define __strip /bin/true
+%define debug_package %{nil}
+

 Name:			submarine
 Version:		0.2.1
-Release:		1%?dist
+Release:		2%?dist
 Summary:		Experimental bootloader for ChomeOS's depthcharge
 License:		GPL-3.0
 URL:			https://github.com/FyraLabs/submarine
-BuildRequires:	make gcc flex bison elfutils-devel parted vboot-utils golang xz bc openssl-devel git depthcharge-tools
+BuildRequires:	make gcc flex bison elfutils-devel parted vboot-utils golang xz bc openssl-devel git depthcharge-tools uboot-tools

 %description
 An experimental bootloader for ChomeOS's depthcharge.
@@ -20,18 +24,33 @@ Submarine provides a minimal Linux environmemt that lives in a small partition
 (or a different system if you're brave.)

 %prep
-go install github.com/u-root/u-root@v0.11.0
-git clone --recurse-submodules --shallow-submodules -b v%version %url .
+git clone --recurse-submodules --shallow-submodules -b v%version %url %{name}-build
+
+pushd %{name}-build/u-root
+go install
+popd
+

 %build
+pushd %{name}-build
 export PATH=$PATH:$HOME/go/bin
 %make_build %arch
+popd

 %install
+pushd %{name}-build
 mkdir -p %buildroot/boot %buildroot%_datadir/submarine
 install -Dm644 build/submarine-*.kpart %buildroot%_datadir/submarine/
+# Symlink the installed kpart to just submarine.kpart
+pushd %buildroot%_datadir/submarine/
+find . -name 'submarine-*.kpart' -exec ln -srf {} submarine.kpart \;
+popd
+
 install -Dm644 build/submarine-*.bin %buildroot%_datadir/submarine/

+popd
+
 %files
 %_datadir/submarine/submarine-*.kpart
+%_datadir/submarine/submarine.kpart
 %_datadir/submarine/submarine-*.bin
@@ -1,5 +1,5 @@
 Name:           terra-mock-configs
-Version:        8
+Version:        9
 Release:        1%{?dist}
 Summary:        Mock configs for Terra repos

@@ -4,6 +4,7 @@ config_opts['macros']['%dist'] = '.fc{{ releasever }}'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['package_manager'] = 'dnf5'
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['bootstrap_image'] = 'registry.fedoraproject.org/fedora:{{ releasever }}'
 config_opts['mirrored'] = True
 config_opts['plugin_conf']['root_cache_enable'] = True
 config_opts['plugin_conf']['yum_cache_enable'] = True
@@ -1,10 +1,12 @@
+%global _ver 8.9
+
 Name:			gradle
-Version:		8.8.0
+Version:		8.9.0
 Release:		1%?dist
 Summary:		Powerful build system for the JVM
 URL:			https://gradle.org/
-Source0:		https://services.gradle.org/distributions/%{name}-%{version}-src.zip
-Source1:		https://services.gradle.org/distributions/%{name}-%{version}-all.zip
+Source0:		https://services.gradle.org/distributions/%{name}-%_ver-src.zip
+Source1:		https://services.gradle.org/distributions/%{name}-%_ver-all.zip
 License:		Apache-2.0
 Requires:		java-latest-openjdk coreutils findutils sed which bash
 BuildRequires:	java-11-openjdk-devel asciidoc xmlto groovy unzip git
@@ -29,14 +31,13 @@ Sources for gradle, a powerful build system for the JVM.
 # See PKGBUILD on Arch Linux

 %prep
-unzip %{SOURCE1} %{name}-%{version}/{README,LICENSE}
-mv %{name}-%{version}/README .
-mv %{name}-%{version}/LICENSE .
-rmdir %{name}-%{version}
+unzip %{SOURCE1} %{name}-%_ver/{README,LICENSE}
+mv %{name}-%_ver/README .
+mv %{name}-%_ver/LICENSE .
+rmdir %{name}-%_ver
 unzip %{SOURCE0}
-cd %{name}-%{version}

-cat <<EOF > dist/gradle.sh
+cat <<EOF > gradle.sh
 #!/bin/sh
 export GRADLE_HOME=/usr/share/java/gradle
 EOF
@@ -53,7 +54,7 @@ sed -i "s#distributionUrl=.*#distributionUrl=file\:%{SOURCE1}#" \


 %build
-cd %{name}-%{version}
+cd %{name}-%_ver
 export PATH="/usr/lib/jvm/java-11-openjdk/bin:${PATH}"
 ./gradlew installAll \
 	-Porg.gradle.java.installations.auto-download=false \
@@ -63,10 +64,10 @@ export PATH="/usr/lib/jvm/java-11-openjdk/bin:${PATH}"


 %install
-cd %{name}-%{version}/dist
+cd %{name}-%_ver/dist

 # install profile.d script
-install -Dm755 gradle.sh %{buildroot}/etc/profile.d/
+install -Dm755 ../../gradle.sh %{buildroot}/etc/profile.d/

 # create the necessary directory structure
 install -d "%{buildroot}/usr/share/java/%{name}/bin"
@@ -12,7 +12,7 @@
 %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so

 Name:			electron
-Version:		31.1.0
+Version:		31.2.0
 Release:		1%?dist
 Summary:		Build cross platform desktop apps with web technologies
 License:		MIT
@@ -6,7 +6,7 @@
 %global forgeurl https://github.com/GitCredentialManager/git-credential-manager

 Name:           gcm-core
-Version:        2.5.0
+Version:        2.5.1
 %forgemeta
 Release:        1%?dist
 Summary:        Secure, cross-platform Git credential storage
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "open-in-mpv.spec"
+	}
+}
@@ -0,0 +1,44 @@
+#%global debug_package %{nil}
+
+Name:           open-in-mpv
+Version:        2.2.2
+Release:        1%?dist
+Summary:        CLI component of open-in-mpv browser extension
+
+License:        MIT
+URL:            https://github.com/Baldomo/open-in-mpv
+Source0:        https://github.com/Baldomo/open-in-mpv/archive/refs/tags/v%{version}.tar.gz
+
+ExclusiveArch:  %{golang_arches}
+
+BuildRequires:  go-rpm-macros
+BuildRequires:  git
+BuildRequires:  elfutils
+
+%description
+This is a simple web extension (for Chrome and Firefox) which helps open any video in the currently open tab in the mpv player.
+
+The extension itself shares a lot of code with the one from the awesome iina, while the (bare) native binary is written in Go (this is a rewrite from C++).
+
+%prep
+%autosetup -p1
+
+%build
+make build/linux/open-in-mpv
+
+%install
+install -Dm755 build/linux/open-in-mpv %{buildroot}%{_bindir}/open-in-mpv
+install -Dm644 scripts/open-in-mpv.desktop %{buildroot}%{_datarootdir}/applications/open-in-mpv.desktop
+
+%post
+update-desktop-database %{_datarootdir}/applications
+xdg-mime default open-in-mpv.desktop x-scheme-handler/mpv
+
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/open-in-mpv
+%{_datarootdir}/applications/open-in-mpv.desktop
+
+%changelog
+%autochangelog
@@ -0,0 +1 @@
+rpm.version(gh("Baldomo/open-in-mpv"));
@@ -1 +1,3 @@
-rpm.version("pypi_version", gh("Ultramarine-Linux/stellar"));
+let v = gh("Ultramarine-Linux/stellar");
+v.crop(1); // remove "v" prefix
+rpm.global("pypi_version", v);
@@ -1,8 +1,8 @@
 #bcond_without tests
-%global commit 2469119490d7e0397ebbf5c5ae327316f955eef2
+%global commit 705f5b84dec75cc7af97f42fd1530e8062735970
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240706
-%global ver 2024.07.02
+%global commit_date 20240711
+%global ver 2024.07.09

 Name:           yt-dlp-nightly
 Version:        %ver^%commit_date.%shortcommit
Author	SHA1	Message	Date
madomado	dd124b0b3e	Update gradle.spec Signed-off-by: madomado <madonuko@outlook.com>	2024-07-12 14:18:21 +08:00
madomado	ec5f2b54db	Update gradle.spec Signed-off-by: madomado <madonuko@outlook.com>	2024-07-12 14:05:45 +08:00
madomado	19f3c5a588	fix: gradle Signed-off-by: madomado <madonuko@outlook.com>	2024-07-12 01:26:57 +08:00
Raboneko	1b6b9fb92b	bump: gradle	2024-07-11 15:30:02 +00:00
Cappy Ishihara	17f149c1a5	fix: nvidia-patch (#1501 ) * Attempt to fix nvidia-patch nightly updates * bump spec	2024-07-11 18:32:54 +07:00
Cappy Ishihara	9c6eda5d9e	add: zed/stable (#1502 ) * add: zed/stable * chore: remove nightly label * fix: change spec path * oops * fix: add libcurl to dependencies	2024-07-11 09:25:54 +08:00
Raboneko	31e5b2be7f	bump(nightly): mpv nim-nightly avstplg yt-dlp	2024-07-11 01:18:05 +00:00
Raboneko	f29d408be0	bump: elementary-sideload	2024-07-10 22:17:49 +00:00
Raboneko	859a3bf5ab	bump: discord-canary-openasar discord-canary	2024-07-10 21:26:28 +00:00
Raboneko	3d5fd30c32	bump: discord-canary-openasar discord-canary	2024-07-10 21:16:00 +00:00
Raboneko	cc89e2f243	bump: gcm-core	2024-07-10 19:15:10 +00:00
Raboneko	766ab49ebe	bump: discord-canary-openasar discord-canary	2024-07-10 18:40:32 +00:00
Raboneko	1879797994	bump: discord-canary-openasar discord-canary	2024-07-10 17:40:08 +00:00
madomado	a91016b1a6	fix(envision): use better versioning (#1496 ) Signed-off-by: madomado <madonuko@outlook.com>	2024-07-10 12:03:10 -05:00
Raboneko	eed353ab37	bump: preview	2024-07-10 16:40:02 +00:00
madomado	3115afa549	bump: crystal (#1489 ) * bump: crystal Signed-off-by: madomado <madonuko@outlook.com> * bump crystal to 1.13.0 Signed-off-by: madomado <madonuko@outlook.com> --------- Signed-off-by: madomado <madonuko@outlook.com>	2024-07-10 11:27:01 -05:00
Raboneko	5db23ec3af	bump: mugshot preview umstellar	2024-07-10 16:21:10 +00:00
madomado	d6af42083c	fix(update): umstellar (#1488 ) Signed-off-by: madomado <madonuko@outlook.com>	2024-07-10 11:07:32 -05:00
madomado	995bd8aed0	fix(update): zed-preview (#1485 ) Signed-off-by: madomado <madonuko@outlook.com>	2024-07-10 11:03:48 -05:00
madomado	7991182fc9	fix: switchboard-plug-wacom (#1412 ) Signed-off-by: madomado <madonuko@outlook.com>	2024-07-10 11:01:41 -05:00
madomado	127f736636	fix(update): mugshot (#1482 ) Signed-off-by: madomado <madonuko@outlook.com>	2024-07-10 11:01:16 -05:00
Raboneko	b1f33cbf4a	bump: mugshot lomiri-ui-toolkit preview umstellar	2024-07-10 15:23:42 +00:00
madomado	4da543d721	fix: apparmor (#1472 )	2024-07-10 10:14:40 -05:00
madomado	acc804ebe3	fix: switchboard-plug-tweaks (#1471 ) * fix: switchboard-plug-tweaks Signed-off-by: madomado <madonuko@outlook.com> * feat: obsolete old `pantheon-tweaks` package and more fixes --------- Signed-off-by: madomado <madonuko@outlook.com>	2024-07-10 10:13:47 -05:00
madomado	5d384c83c5	fix(update): authy lomiri-ui-toolkit zed-* manrope albius stellar (#1468 )	2024-07-10 10:13:00 -05:00
madomado	e1841bfc88	add: mugshot (#1466 )	2024-07-10 10:12:40 -05:00
Raboneko	510834f4e6	bump: lomiri-system-settings	2024-07-10 10:19:22 +00:00
Trung Lê	fbe232b4f1	add: python3-pillow-heif (#1464 )	2024-07-10 17:45:25 +08:00
Raboneko	1ea388e860	bump: lomiri-app-launch	2024-07-10 05:55:52 +00:00
Raboneko	7cc3cbf4df	bump: lomiri-system-settings	2024-07-10 04:20:20 +00:00
Raboneko	8ac454d8e8	bump(nightly): mpv prismlauncher-nightly nim-nightly yt-dlp	2024-07-10 01:17:52 +00:00
Raboneko	d195906e60	bump: electron	2024-07-09 22:45:23 +00:00
Raboneko	494c843722	bump: discord-canary-openasar discord-canary	2024-07-09 17:40:48 +00:00
Raboneko	2b3912a9fd	bump: discord-canary-openasar discord-canary	2024-07-09 16:41:35 +00:00
madomado	9d0afe095c	fix: ruff (#1455 ) Signed-off-by: madomado <madonuko@outlook.com>	2024-07-09 12:53:03 +07:00
Cappy Ishihara	6e2287f098	fix: submarine git pull (#1451 ) * fix: submarine git pull * fix: create empty directory * oops, we only popd once	2024-07-09 13:49:56 +08:00
madomado	c8679dada7	fix: manual build arch parsing (#1454 ) (#1456 )	2024-07-09 12:49:40 +07:00
Raboneko	cc46576a58	bump: submarine (#1446 ) (#1448 ) (cherry picked from commit `7c912f55dd`) Co-authored-by: Cappy Ishihara <cappy@cappuchino.xyz>	2024-07-09 11:55:35 +08:00
Raboneko	4404bab36c	fix: Do not strip binaries in submarine (#1428 ) (#1444 ) * fix: Do not strip binaries in submarine * Update anda/system/submarine/submarine.spec Co-authored-by: lea <lleyton@fyralabs.com> Signed-off-by: Cappy Ishihara <cappy@cappuchino.xyz> --------- Signed-off-by: Cappy Ishihara <cappy@cappuchino.xyz> Co-authored-by: lea <lleyton@fyralabs.com> (cherry picked from commit `3c49f8ce23`) Co-authored-by: Cappy Ishihara <cappy@cappuchino.xyz>	2024-07-09 11:53:24 +08:00
lea	c2676b7a1a	fix: specify bootstrap image for mock configs (#1442 )	2024-07-09 11:51:44 +08:00
lea	169224b364	ci: custom runner option for custom build workflow call (#1419 ) (#1436 ) (cherry picked from commit `42ccbc7665`) # Conflicts: # .github/workflows/build.yml Co-authored-by: Cappy Ishihara <cappy@cappuchino.xyz>	2024-07-08 20:03:16 -07:00
Raboneko	47c1779a02	bump(nightly): mpv prismlauncher-nightly nim-nightly yt-dlp	2024-07-09 01:17:32 +00:00
Raboneko	c327e150c1	bump: discord-openasar discord	2024-07-08 19:56:29 +00:00
Raboneko	745d2b4870	bump: discord-canary-openasar discord-canary	2024-07-08 19:36:08 +00:00
Raboneko	77c4002994	bump: discord-canary-openasar discord-canary	2024-07-08 18:28:20 +00:00
Raboneko	5f438fa6f2	bump: codium	2024-07-08 16:41:00 +00:00
june	7b667bbc5a	add open-in-mpv (#1434 )	2024-07-07 22:27:29 -07:00
Raboneko	10696e1b10	bump(nightly): prismlauncher-nightly nim-nightly tdlib cros-keyboard-map yt-dlp	2024-07-08 01:18:33 +00:00
Raboneko	b3dda3e0a0	bump: maturin	2024-07-07 02:59:31 +00:00
Raboneko	3f8e328cb0	bump(nightly): mpv prismlauncher-nightly nim-nightly yt-dlp	2024-07-07 01:22:42 +00:00
Raboneko	9a4907ddf2	bump: limine	2024-07-06 19:14:12 +00:00
				`@@ -1 +0,0 @@`
				`rpm.version(gh("pantheon-tweaks/pantheon-tweaks"));`