diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000000..9d911cb3ac --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,10 @@ +ARG VARIANT="37" +FROM fedora:${VARIANT} + +RUN useradd -m vscode +RUN groupadd mock +RUN usermod -aG mock vscode +RUN echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode +RUN dnf -y install git 'dnf-command(config-manager)' mock createrepo_c +RUN dnf config-manager --add-repo='https://raw.githubusercontent.com/terrapkg/subatomic-repos/main/terra.repo' +RUN dnf -y install anda diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..cb097274fe --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,11 @@ +{ + "name": "Fedora", + "build": { + "dockerfile": "Dockerfile", + "args": { "VARIANT": "37" } + }, + "settings": {}, + "extensions": [], + "remoteUser": "vscode", + "runArgs": ["--privileged"] +} diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml new file mode 100644 index 0000000000..c343b923a4 --- /dev/null +++ b/.github/workflows/update-comps.yml @@ -0,0 +1,30 @@ +name: Push comps updates + +on: + push: + branches: + - main + paths: + - comps.xml + workflow_dispatch: + +jobs: + update-comps: + runs-on: ubuntu-latest + container: + image: fedora:37 + steps: + - uses: actions/checkout@v3 + - name: Install repositories + run: | + sudo dnf install -y dnf-plugins-core + sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo + - name: Install dependencies + run: | + sudo dnf install -y subatomic-cli + - name: Push to subatomic + run: | + subatomic-cli upload-comps \ + --server https://subatomic.fyralabs.com \ + --token ${{ secrets.SUBATOMIC_TOKEN }} \ + terra37 comps.xml diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 006b752237..5ba1c6db5f 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -4,7 +4,7 @@ name: Automatically check for updates on: schedule: - - cron: "0 */2 * * *" + - cron: "*/30 * * * *" workflow_dispatch: jobs: @@ -25,8 +25,6 @@ jobs: - name: Run Update (Python) run: bash ./update.sh -<<<<<<< Updated upstream -======= env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -34,7 +32,6 @@ jobs: run: anda update env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ->>>>>>> Stashed changes - name: Save run: | diff --git a/anda/apps/authy/authy.spec b/anda/apps/authy/authy.spec index c0465480cc..325a343dc3 100644 --- a/anda/apps/authy/authy.spec +++ b/anda/apps/authy/authy.spec @@ -1,5 +1,5 @@ Name: authy -Version: 2.2.1 +Version: 2.2.2 Release: 2%{?dist} Summary: Two factor authentication desktop application License: Unknown diff --git a/anda/apps/authy/chkupdate.py b/anda/apps/authy/chkupdate.py new file mode 100644 index 0000000000..7dd012e65e --- /dev/null +++ b/anda/apps/authy/chkupdate.py @@ -0,0 +1,38 @@ +import os +import re +from requests import get +import json + +NAME = "authy" +SPEC = f"{NAME}.spec" +REGEX_VER = r'Version:(\s*)([\.\d]+)\n' +REGEX_SRC = r'Source0:(\s*)([^\n]+)\n' + +def run_cmds(*cmds: str): + for cmd in cmds: + print(f"{NAME}: $ {cmd}") + if rc := os.system(cmd): + exit(f"{NAME}: Stopping because {rc=}") + +raw = get('https://api.snapcraft.io/v2/snaps/info/authy', headers={'Snap-Device-Series': '16'}).text +data = json.loads(raw) +ver = data['channel-map'][0]['version'] +f = open(SPEC, 'r') +content = f.read() +found = re.findall(REGEX_VER, content) +try: + assert found + curver = found[0][1] + if ver == curver: + exit(f"{NAME}: Up to date!") + print(f"{NAME}: {curver} -> {ver}") +except IndexError or AssertionError: + exit(f"{NAME}: Failed to read spec!") + +link = data['channel-map'][0]['download']['url'] +newspec = re.sub(REGEX_VER, f'Version:{found[0][0]}{ver}\n', content) +newspec = re.sub(REGEX_SRC, f'Source0:{found[0][0]}{link}\n', newspec) +f.close() +f = open(SPEC, 'w') +f.write(newspec) +f.close() diff --git a/anda/apps/authy/update.rhai b/anda/apps/authy/update.rhai deleted file mode 100644 index 1a8fe6223e..0000000000 --- a/anda/apps/authy/update.rhai +++ /dev/null @@ -1,6 +0,0 @@ -let req = new_req("https://api.snapcraft.io/v2/snaps/info/authy"); -req.head("Snap-Device-Series", "16"); -let obj = json(req.get()); -let obj2 = get_json(obj, "channel-map"); -let obj3 = get_json(obj2, 0); -rpm.version(string_json(get_json(obj3, "version"))); diff --git a/anda/desktops/elementary/editorconfig/editorconfig.spec b/anda/desktops/elementary/editorconfig/editorconfig.spec index 53d2a99d61..4d9be0a672 100644 --- a/anda/desktops/elementary/editorconfig/editorconfig.spec +++ b/anda/desktops/elementary/editorconfig/editorconfig.spec @@ -12,8 +12,8 @@ editors.} Name: editorconfig Summary: Parser for EditorConfig files written in C -Version: 0.12.5 -Release: 4%{?dist} +Version: v0.12.5 +Release: 1%{?dist} License: BSD URL: https://github.com/editorconfig/editorconfig-core-c @@ -90,6 +90,9 @@ rm %{buildroot}/%{_libdir}/libeditorconfig_static.a %changelog +* Sun Nov 27 2022 root - v0.12.5-1 +- new version + * Sat Oct 15 2022 windowsboy111 - Repackaged for Terra diff --git a/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec b/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec index e7d424f589..6b62ab7d8a 100644 --- a/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec +++ b/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec @@ -3,7 +3,7 @@ Name: elementary-calculator Summary: Calculator app designed for elementary -Version: 1.7.2 +Version: 2.0.0 Release: %autorelease License: GPLv3+ @@ -16,9 +16,8 @@ BuildRequires: libappstream-glib BuildRequires: meson >= 0.49 BuildRequires: vala -BuildRequires: pkgconfig(granite) >= 6.0.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.11.6 -BuildRequires: pkgconfig(libhandy-1) >= 0.91.0 +BuildRequires: pkgconfig(granite-7) >= 7.0.0 +BuildRequires: pkgconfig(gtk4) Requires: hicolor-icon-theme diff --git a/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec b/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec index 17ca442661..955fad00da 100644 --- a/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec +++ b/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec @@ -12,28 +12,26 @@ License: GPLv3+ URL: https://github.com/elementary/calendar Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +Patch0: https://patch-diff.githubusercontent.com/raw/elementary/calendar/pull/758.patch + BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libappstream-glib +BuildRequires: pkgconfig(champlain-0.12) +BuildRequires: pkgconfig(libecal-2.0) +BuildRequires: pkgconfig(granite) +BuildRequires: pkgconfig(libhandy-1) +BuildRequires: folks-devel +BuildRequires: libgee-devel +BuildRequires: pkgconfig(geocode-glib-2.0) +BuildRequires: geoclue2-devel +BuildRequires: glib2-devel +BuildRequires: gtk+-devel +BuildRequires: libical +BuildRequires: libhandy >= 0.90.0 BuildRequires: meson BuildRequires: vala - -BuildRequires: pkgconfig(champlain-0.12) -BuildRequires: pkgconfig(champlain-gtk-0.12) -BuildRequires: pkgconfig(clutter-1.0) -BuildRequires: pkgconfig(clutter-gtk-1.0) -BuildRequires: pkgconfig(folks) -BuildRequires: pkgconfig(gee-0.8) -BuildRequires: pkgconfig(geocode-glib-1.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gmodule-2.0) -BuildRequires: pkgconfig(granite) >= 6.2.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.22 -# BuildRequires: pkgconfig(libecal-2.0) -BuildRequires: pkgconfig(libgeoclue-2.0) -BuildRequires: pkgconfig(libhandy-1) >= 0.90.0 -BuildRequires: pkgconfig(libical-glib) -BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: evolution-data-server-devel Requires: hicolor-icon-theme diff --git a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec index d2093c4062..0751b5f049 100644 --- a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec +++ b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec @@ -3,7 +3,7 @@ Name: elementary-greeter Summary: LightDM Login Screen for the elementary desktop -Version: 6.1.0 +Version: 6.1.1 Release: %autorelease License: GPLv3 @@ -33,9 +33,9 @@ BuildRequires: pkgconfig(granite) >= 5.0 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(liblightdm-gobject-1) -BuildRequires: pkgconfig(mutter-clutter-10) -BuildRequires: pkgconfig(mutter-cogl-10) -BuildRequires: pkgconfig(mutter-cogl-pango-10) +BuildRequires: pkgconfig(mutter-clutter-11) +BuildRequires: pkgconfig(mutter-cogl-11) +BuildRequires: pkgconfig(mutter-cogl-pango-11) BuildRequires: pkgconfig(x11) Provides: pantheon-greeter = %{version}-%{release} diff --git a/anda/desktops/elementary/elementary-music/elementary-music.spec b/anda/desktops/elementary/elementary-music/elementary-music.spec index 573f8582ab..1c703333ad 100644 --- a/anda/desktops/elementary/elementary-music/elementary-music.spec +++ b/anda/desktops/elementary/elementary-music/elementary-music.spec @@ -11,7 +11,7 @@ utilizes Granite for a consistent and slick UI.} Name: elementary-music Summary: Music player and library from elementary Version: 7.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://github.com/elementary/%{srcname} @@ -28,7 +28,7 @@ BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(granite) >= 6.0.0 +BuildRequires: pkgconfig(granite-7) >= 7.0.0 BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-pbutils-1.0) BuildRequires: pkgconfig(gstreamer-tag-1.0) @@ -75,7 +75,6 @@ This package contains files needed for developing with Music. %install %meson_install - %find_lang %{appname} @@ -89,35 +88,17 @@ appstream-util validate-relax --nonet \ %files -f %{appname}.lang %doc README.md -%license COPYING +%license LICENSE %{_bindir}/%{appname} -%{_libdir}/lib%{appname}-core.so.0 -%{_libdir}/lib%{appname}-core.so.0.1 - -%dir %{_libdir}/%{appname} -%dir %{_libdir}/%{appname}/plugins - -%{_libdir}/%{appname}/plugins/audioplayer-device.plugin -%{_libdir}/%{appname}/plugins/libaudioplayer-device.so -%{_libdir}/%{appname}/plugins/ipod-device.plugin -%{_libdir}/%{appname}/plugins/libipod-device.so - %{_datadir}/applications/%{appname}.desktop %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{appname}.svg %{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/locale/*/LC_MESSAGES/%{appname}.mo %files devel -%{_libdir}/lib%{appname}-core.so -%{_libdir}/pkgconfig/%{appname}-core.pc - -%{_includedir}/%{appname}-core.h - -%{_datadir}/vala/vapi/%{appname}-core.deps -%{_datadir}/vala/vapi/%{appname}-core.vapi - %changelog * Thu Nov 17 2022 windowsboy111 - 7.0.0-1 diff --git a/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec b/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec index 6753b72f69..8a4301b3c7 100644 --- a/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec +++ b/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec @@ -3,7 +3,7 @@ Name: elementary-onboarding Summary: Onboarding app for new users -Version: 6.1.0 +Version: 7.0.1 Release: %autorelease License: GPLv3+ @@ -12,7 +12,7 @@ Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz # Patch to fix "NotShowIn" in group "Desktop Entry" contains an unregistered value "Installer" # https://github.com/elementary/onboarding/issues/154 -Patch0: %{url}/pull/155.patch +# Patch0: %%{url}/pull/155.patch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -23,9 +23,9 @@ BuildRequires: vala BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(glib-2.0) >= 2.64.0 BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(granite) >= 5.5.0 -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libhandy-1) >= 0.80.0 +BuildRequires: pkgconfig(granite-7) >= 7.0.0 +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(libadwaita-1) Requires: hicolor-icon-theme diff --git a/anda/desktops/elementary/elementary-photos/elementary-photos.spec b/anda/desktops/elementary/elementary-photos/elementary-photos.spec index d9aea2a123..8c222db626 100644 --- a/anda/desktops/elementary/elementary-photos/elementary-photos.spec +++ b/anda/desktops/elementary/elementary-photos/elementary-photos.spec @@ -5,7 +5,7 @@ Name: elementary-photos Summary: Photo manager and viewer from elementary -Version: 2.7.5 +Version: 2.8.0 Release: %autorelease License: LGPLv2+ @@ -92,6 +92,7 @@ appstream-util validate-relax --nonet \ %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %{_datadir}/glib-2.0/schemas/%{appname}-extras.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{appname}.svg +%{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg %{_datadir}/metainfo/%{appname}.appdata.xml diff --git a/anda/desktops/elementary/elementary-shortcut-overlay/0001-meson-remove-deprecated-positional-arguments-from-i1.patch b/anda/desktops/elementary/elementary-shortcut-overlay/0001-meson-remove-deprecated-positional-arguments-from-i1.patch deleted file mode 100644 index 664e1745d3..0000000000 --- a/anda/desktops/elementary/elementary-shortcut-overlay/0001-meson-remove-deprecated-positional-arguments-from-i1.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0ab2622c947396a43cf325324d693898751b126e Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Wed, 13 Jul 2022 14:21:29 +0200 -Subject: [PATCH] meson: remove deprecated positional arguments from - i18n.merge_file calls - ---- - data/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/data/meson.build b/data/meson.build -index 77a7909..09feaa7 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -8,7 +8,6 @@ i18n.merge_file ( - ) - - i18n.merge_file ( -- 'desktop', - input: 'shortcut-overlay.desktop.in', - output: meson.project_name() + '.desktop', - po_dir: join_paths(meson.source_root (), 'po', 'extra'), --- -2.37.1 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 9c08e01a27..ce3bb6c8bb 100644 --- a/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec +++ b/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec @@ -3,16 +3,13 @@ Name: elementary-shortcut-overlay Summary: Native, OS-wide shortcut overlay -Version: 1.2.1 +Version: 2.0.1 Release: %autorelease License: GPLv3 URL: https://github.com/elementary/shortcut-overlay Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -# meson: remove deprecated positional arguments from i18n.merge_file calls -Patch1: 0001-meson-remove-deprecated-positional-arguments-from-i1.patch - BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libappstream-glib @@ -20,9 +17,8 @@ BuildRequires: meson BuildRequires: vala BuildRequires: pkgconfig(gee-0.8) -BuildRequires: pkgconfig(granite) >= 5.2.0 -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libhandy-1) >= 0.80.0 +BuildRequires: pkgconfig(granite-7) >= 7.0.0 +BuildRequires: pkgconfig(gtk4) %description This GTK+ applet reads window manager and OS keyboard shortcuts from diff --git a/anda/desktops/elementary/elementary-sideload/anda.hcl b/anda/desktops/elementary/elementary-sideload/anda.hcl new file mode 100644 index 0000000000..71364a6647 --- /dev/null +++ b/anda/desktops/elementary/elementary-sideload/anda.hcl @@ -0,0 +1,6 @@ +project "pkg" { + rpm { + spec = "elementary-sideload.spec" + sources = "." + } +} diff --git a/anda/desktops/elementary/elementary-sideload/chkupdate.py b/anda/desktops/elementary/elementary-sideload/chkupdate.py new file mode 100644 index 0000000000..0c5faa1d4d --- /dev/null +++ b/anda/desktops/elementary/elementary-sideload/chkupdate.py @@ -0,0 +1,19 @@ +import os +import requests +import re + +NAME = 'elementary-sideload' +REPO = "elementary/sideload" +REGEX_VER = r'Version:\s*([\.\d]+)\n' +SPEC = f"{NAME}.spec" +LINK = f'https://api.github.com/repos/{REPO}/releases/latest' + + +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] +with open(SPEC, 'r') as f: + matches = re.findall(REGEX_VER, f.read()) +if not len(matches): exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: exit(f'{NAME}: Up to date!') +print(f'{NAME}: {cur} -> {ver}') +os.system(f'rpmdev-bumpspec -n {ver} {SPEC}') diff --git a/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec new file mode 100644 index 0000000000..6cd235db03 --- /dev/null +++ b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec @@ -0,0 +1,68 @@ +%global srcname sideload +%global appname io.elementary.sideload + +Name: elementary-sideload +Summary: Sideload flatpaks on Pantheon +Version: 6.1.0 +Release: %autorelease +License: GPLv3+ + +URL: https://github.com/elementary/sideload +Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz + +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: libappstream-glib +BuildRequires: meson +BuildRequires: vala + +BuildRequires: pkgconfig(flatpak) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(granite-7) >= 7.0.0 +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(libxml-2.0) + +Requires: hicolor-icon-theme + +%description +Sideload is a simple application that lets users install flatpaks on +Pantheon without needing to use a command line application. + + +%prep +%autosetup -n %{srcname}-%{version} -p1 + + +%build +%meson +%meson_build + +%install +%meson_install +%find_lang %{appname} + + +%check +desktop-file-validate \ + %{buildroot}/%{_datadir}/applications/%{appname}.desktop + +appstream-util validate-relax --nonet \ + %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + + +%files -f %{appname}.lang +%license LICENSE +%doc README.md + +%{_bindir}/%{appname} + +%{_datadir}/applications/%{appname}.desktop +%{_datadir}/icons/hicolor/*/apps/%{appname}.svg +%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml +%{_datadir}/metainfo/%{appname}.appdata.xml + + +%changelog +* Tue Nov 22 2022 Lleyton Gray +- Repackaged for Terra diff --git a/anda/desktops/elementary/elementary-sound-theme/chkupdate.py b/anda/desktops/elementary/elementary-sound-theme/chkupdate.py index 1097665687..dad03b026c 100644 --- a/anda/desktops/elementary/elementary-sound-theme/chkupdate.py +++ b/anda/desktops/elementary/elementary-sound-theme/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/elementary-tasks/elementary-tasks.spec b/anda/desktops/elementary/elementary-tasks/elementary-tasks.spec deleted file mode 100644 index 5aa52ffdb1..0000000000 --- a/anda/desktops/elementary/elementary-tasks/elementary-tasks.spec +++ /dev/null @@ -1,83 +0,0 @@ -%global srcname tasks -%global appname io.elementary.tasks - -Name: elementary-tasks -Summary: Synced tasks and reminders application -Version: 6.3.0 -Release: %autorelease -License: GPLv3+ - -URL: https://github.com/elementary/tasks -Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz - -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: libappstream-glib -BuildRequires: meson >= 0.49 -BuildRequires: vala - -BuildRequires: pkgconfig(champlain-0.12) -BuildRequires: pkgconfig(champlain-gtk-0.12) -BuildRequires: pkgconfig(clutter-1.0) -BuildRequires: pkgconfig(clutter-gtk-1.0) -BuildRequires: pkgconfig(geocode-glib-1.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(granite) >= 6.2.0 -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libecal-2.0) -BuildRequires: pkgconfig(libedataserver-1.2) -BuildRequires: pkgconfig(libgdata) -BuildRequires: pkgconfig(libgeoclue-2.0) -BuildRequires: pkgconfig(libhandy-1) >= 0.90.0 -BuildRequires: pkgconfig(libical-glib) - -Requires: hicolor-icon-theme - -%description -%{summary}. - - -%prep -%autosetup -n %{srcname}-%{version} -p1 - - -%build -%meson -%meson_build - - -%install -%meson_install - -%find_lang %{appname} - - -%check -desktop-file-validate \ - %{buildroot}/%{_datadir}/applications/%{appname}.desktop - -desktop-file-validate \ - %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop - -appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml - - -%files -f %{appname}.lang -%license LICENSE -%doc README.md - -%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop - -%{_bindir}/%{appname} - -%{_datadir}/applications/%{appname}.desktop -%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml -%{_datadir}/icons/hicolor/*/apps/%{appname}.svg -%{_datadir}/metainfo/%{appname}.appdata.xml - - -%changelog -* Sat Oct 15 2022 windowsboy111 -- Repackaged for Terra diff --git a/anda/desktops/elementary/elementary-terminal/chkupdate.py b/anda/desktops/elementary/elementary-terminal/chkupdate.py index d9cb68e9f9..cfc1429c86 100644 --- a/anda/desktops/elementary/elementary-terminal/chkupdate.py +++ b/anda/desktops/elementary/elementary-terminal/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/elementary-theme/chkupdate.py b/anda/desktops/elementary/elementary-theme/chkupdate.py index c9ead73f47..d81f060e6a 100644 --- a/anda/desktops/elementary/elementary-theme/chkupdate.py +++ b/anda/desktops/elementary/elementary-theme/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/elementary-theme/elementary-theme.spec b/anda/desktops/elementary/elementary-theme/elementary-theme.spec index 164acd1068..253d450cf1 100644 --- a/anda/desktops/elementary/elementary-theme/elementary-theme.spec +++ b/anda/desktops/elementary/elementary-theme/elementary-theme.spec @@ -3,7 +3,7 @@ Name: elementary-theme Summary: elementary GTK+ Stylesheet -Version: 6.1.1 +Version: 7.0.1 Release: %autorelease License: GPLv3 @@ -66,6 +66,7 @@ appstream-util validate-relax --nonet \ %dir %{_datadir}/themes/%{appname}.*/ %{_datadir}/themes/%{appname}.*/gtk-3.0/ +%{_datadir}/themes/%{appname}.*/gtk-4.0/ %{_datadir}/metainfo/%{appname}.appdata.xml diff --git a/anda/desktops/elementary/elementary-videos/chkupdate.py b/anda/desktops/elementary/elementary-videos/chkupdate.py index fea2278962..ed85bdbc2f 100644 --- a/anda/desktops/elementary/elementary-videos/chkupdate.py +++ b/anda/desktops/elementary/elementary-videos/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/elementary-wallpapers/chkupdate.py b/anda/desktops/elementary/elementary-wallpapers/chkupdate.py index 81208a436c..2adeefd693 100644 --- a/anda/desktops/elementary/elementary-wallpapers/chkupdate.py +++ b/anda/desktops/elementary/elementary-wallpapers/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/elementary-wallpapers/elementary-wallpapers.spec b/anda/desktops/elementary/elementary-wallpapers/elementary-wallpapers.spec index e27f68c1f1..a8a290cbb7 100644 --- a/anda/desktops/elementary/elementary-wallpapers/elementary-wallpapers.spec +++ b/anda/desktops/elementary/elementary-wallpapers/elementary-wallpapers.spec @@ -1,5 +1,5 @@ %global srcname wallpapers -%global default_wallpaper "Ryan Schroeder.jpg" +%global default_wallpaper "Photo of Valley.jpg" Name: elementary-wallpapers Summary: Collection of wallpapers from the elementary project @@ -51,20 +51,22 @@ wallpapers show up in gnome-control-center. %install +cd backgrounds # copy wallpapers to install location mkdir -p %{buildroot}/%{_datadir}/backgrounds/elementary -sh -c "cp -pav *.jpg %{buildroot}/%{_datadir}/backgrounds/elementary/" +cp -pav *.jpg %{buildroot}/%{_datadir}/backgrounds/elementary/ # create default wallpaper symlink ln -s ./%{default_wallpaper} %{buildroot}/%{_datadir}/backgrounds/elementary/default # copy backgrounds list for gnome-control-center to install location mkdir -p %{buildroot}/%{_datadir}/gnome-background-properties +cd .. cp -pav %{SOURCE1} %{buildroot}/%{_datadir}/gnome-background-properties/ %files -%license debian/copyright +%license LICENSE.md %doc README.md %{_datadir}/backgrounds/elementary/ diff --git a/anda/desktops/elementary/evolution-data-server/anda.hcl b/anda/desktops/elementary/evolution-data-server/anda.hcl index 0c01795989..d2a8a71d55 100644 --- a/anda/desktops/elementary/evolution-data-server/anda.hcl +++ b/anda/desktops/elementary/evolution-data-server/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "evolution-data-server.spec" - sources = "." } } diff --git a/anda/desktops/elementary/evolution-data-server/evolution-data-server.spec b/anda/desktops/elementary/evolution-data-server/evolution-data-server.spec index 628b63e3b8..9cd98c2d23 100644 --- a/anda/desktops/elementary/evolution-data-server/evolution-data-server.spec +++ b/anda/desktops/elementary/evolution-data-server/evolution-data-server.spec @@ -15,19 +15,20 @@ %global with_docs 0 %endif -%define glib2_version 2.46 -%define gtk3_version 3.16 +%define glib2_version 2.68 +%define gtk3_version 3.20 %define gcr_version 3.4 %define gtk_doc_version 1.9 +%define gtk4_version 4.4 %define goa_version 3.8 %define libsecret_version 0.5 %define libgdata_version 0.15.1 %define libgweather_version 3.10 %define libical_version 3.0.7 -%define libsoup_version 2.58 +%define libsoup_version 3.1.1 %define nss_version 3.14 %define sqlite_version 3.7.17 -%define webkit2gtk_version 2.28.0 +%define webkit2gtk_version 2.34.0 %define json_glib_version 1.0.4 %define credential_modules_dir %{_libdir}/evolution-data-server/credential-modules @@ -52,12 +53,13 @@ ### Abstract ### Name: evolution-data-server -Version: 3.44.4 +Version: 3.46.1 +Epoch: 1 Release: 1%{?dist} Summary: Backend data server for Evolution License: LGPLv2+ URL: https://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.44/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz Provides: evolution-webcal = %{version} Obsoletes: evolution-webcal < 2.24.0 @@ -92,6 +94,7 @@ BuildRequires: pkgconfig(gcr-3) >= %{gcr_version} BuildRequires: pkgconfig(gcr-base-3) >= %{gcr_version} BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gtk4) >= %{gtk4_version} BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} @@ -100,14 +103,16 @@ BuildRequires: pkgconfig(libgdata) >= %{libgdata_version} BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version} BuildRequires: pkgconfig(libical-glib) >= %{libical_version} BuildRequires: pkgconfig(libsecret-unstable) >= %{libsecret_version} -BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version} +BuildRequires: pkgconfig(libsoup-3.0) >= %{libsoup_version} BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(nspr) BuildRequires: pkgconfig(nss) >= %{nss_version} BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version} -BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version} +BuildRequires: pkgconfig(webkit2gtk-4.1) >= %{webkit2gtk_version} +BuildRequires: pkgconfig(webkit2gtk-5.0) >= 2.36.0 BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version} BuildRequires: pkgconfig(libcanberra-gtk3) +BuildRequires: pkgconfig(gweather4) >= 3.91 %if %{ldap_support} BuildRequires: openldap-devel >= 2.0.11 @@ -142,7 +147,6 @@ Requires: pkgconfig(libgdata) >= %{libgdata_version} Requires: pkgconfig(gweather-3.0) >= %{libgweather_version} Requires: pkgconfig(libical-glib) >= %{libical_version} Requires: pkgconfig(libsecret-unstable) >= %{libsecret_version} -Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version} Requires: pkgconfig(sqlite3) >= %{sqlite_version} Requires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version} Requires: pkgconfig(json-glib-1.0) >= %{json_glib_version} @@ -283,24 +287,27 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; %files %license COPYING %doc README ChangeLog NEWS -%{_libdir}/libcamel-1.2.so.63 -%{_libdir}/libcamel-1.2.so.63.0.0 -%{_libdir}/libebackend-1.2.so.10 -%{_libdir}/libebackend-1.2.so.10.0.0 -%{_libdir}/libebook-1.2.so.20 -%{_libdir}/libebook-1.2.so.20.1.3 -%{_libdir}/libebook-contacts-1.2.so.3 -%{_libdir}/libebook-contacts-1.2.so.3.0.0 -%{_libdir}/libecal-2.0.so.1 -%{_libdir}/libecal-2.0.so.1.0.0 -%{_libdir}/libedata-book-1.2.so.26 -%{_libdir}/libedata-book-1.2.so.26.0.0 -%{_libdir}/libedata-cal-2.0.so.1 -%{_libdir}/libedata-cal-2.0.so.1.0.0 -%{_libdir}/libedataserver-1.2.so.26 -%{_libdir}/libedataserver-1.2.so.26.0.0 -%{_libdir}/libedataserverui-1.2.so.3 -%{_libdir}/libedataserverui-1.2.so.3.0.0 +%{_libdir}/libcamel-1.2.so.64 +%{_libdir}/libcamel-1.2.so.64.0.0 +%{_libdir}/libebackend-1.2.so.11 +%{_libdir}/libebackend-1.2.so.11.0.0 +%{_libdir}/libebook-1.2.so.21 +%{_libdir}/libebook-1.2.so.21.1.3 +%{_libdir}/libebook-contacts-1.2.so.4 +%{_libdir}/libebook-contacts-1.2.so.4.0.0 +%{_libdir}/libecal-2.0.so.2 +%{_libdir}/libecal-2.0.so.2.0.0 +%{_libdir}/libedata-book-1.2.so.27 +%{_libdir}/libedata-book-1.2.so.27.0.0 +%{_libdir}/libedata-cal-2.0.so.2 +%{_libdir}/libedata-cal-2.0.so.2.0.0 +%{_libdir}/libedataserver-1.2.so.27 +%{_libdir}/libedataserver-1.2.so.27.0.0 +%{_libdir}/libedataserverui-1.2.so.4 +%{_libdir}/libedataserverui-1.2.so.4.0.0 +%{_libdir}/libedataserverui4-1.0.so +%{_libdir}/libedataserverui4-1.0.so.0 +%{_libdir}/libedataserverui4-1.0.so.0.0.0 %{_libdir}/girepository-1.0/Camel-1.2.typelib %{_libdir}/girepository-1.0/EBackend-1.2.typelib @@ -311,6 +318,7 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; %{_libdir}/girepository-1.0/EDataCal-2.0.typelib %{_libdir}/girepository-1.0/EDataServer-1.2.typelib %{_libdir}/girepository-1.0/EDataServerUI-1.2.typelib +%{_libdir}/girepository-1.0/EDataServerUI4-1.0.typelib %{_libexecdir}/camel-gpg-photo-saver %{_libexecdir}/camel-index-control-1.2 @@ -424,6 +432,7 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; %{_libdir}/pkgconfig/libedata-cal-2.0.pc %{_libdir}/pkgconfig/libedataserver-1.2.pc %{_libdir}/pkgconfig/libedataserverui-1.2.pc +%{_libdir}/pkgconfig/libedataserverui4-1.0.pc %{_datadir}/gir-1.0/Camel-1.2.gir %{_datadir}/gir-1.0/EBackend-1.2.gir %{_datadir}/gir-1.0/EBook-1.2.gir @@ -433,6 +442,7 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; %{_datadir}/gir-1.0/EDataCal-2.0.gir %{_datadir}/gir-1.0/EDataServer-1.2.gir %{_datadir}/gir-1.0/EDataServerUI-1.2.gir +%{_datadir}/gir-1.0/EDataServerUI4-1.0.gir %{_datadir}/vala/vapi/camel-1.2.deps %{_datadir}/vala/vapi/camel-1.2.vapi %{_datadir}/vala/vapi/libebackend-1.2.deps @@ -451,6 +461,18 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; %{_datadir}/vala/vapi/libedataserver-1.2.vapi %{_datadir}/vala/vapi/libedataserverui-1.2.deps %{_datadir}/vala/vapi/libedataserverui-1.2.vapi +%{_datadir}/vala/vapi/libedataserverui4-1.0.deps +%{_datadir}/vala/vapi/libedataserverui4-1.0.vapi +/usr/lib/debug/usr/lib64/libcamel-1.2.so.*.debug +/usr/lib/debug/usr/lib64/libebackend-1.2.so.*.debug +/usr/lib/debug/usr/lib64/libebook-1.2.so.*.debug +/usr/lib/debug/usr/lib64/libebook-contacts-1.2.so.*.debug +/usr/lib/debug/usr/lib64/libecal-2.0.so.*.debug +/usr/lib/debug/usr/lib64/libedata-book-1.2.so.*.debug +/usr/lib/debug/usr/lib64/libedata-cal-2.0.so.*.debug +/usr/lib/debug/usr/lib64/libedataserver-1.2.so.*.debug +/usr/lib/debug/usr/lib64/libedataserverui-1.2.so.*.debug +/usr/lib/debug/usr/lib64/libedataserverui4-1.0.so.*.debug %files langpacks -f %{name}.lang diff --git a/anda/desktops/elementary/gala/chkupdate.py b/anda/desktops/elementary/gala/chkupdate.py index 65b799e726..b43215fc75 100644 --- a/anda/desktops/elementary/gala/chkupdate.py +++ b/anda/desktops/elementary/gala/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/granite/anda.hcl b/anda/desktops/elementary/granite-7/anda.hcl similarity index 63% rename from anda/desktops/elementary/granite/anda.hcl rename to anda/desktops/elementary/granite-7/anda.hcl index 9df96bff7c..8c9f18fdd0 100644 --- a/anda/desktops/elementary/granite/anda.hcl +++ b/anda/desktops/elementary/granite-7/anda.hcl @@ -1,6 +1,6 @@ project "pkg" { rpm { - spec = "granite.spec" + spec = "granite-7.spec" sources = "." } } diff --git a/anda/desktops/elementary/granite/chkupdate.py b/anda/desktops/elementary/granite-7/chkupdate.py similarity index 78% rename from anda/desktops/elementary/granite/chkupdate.py rename to anda/desktops/elementary/granite-7/chkupdate.py index 873df2e70a..55014548fb 100644 --- a/anda/desktops/elementary/granite/chkupdate.py +++ b/anda/desktops/elementary/granite-7/chkupdate.py @@ -2,14 +2,14 @@ import os import requests import re -NAME = 'granite' +NAME = 'granite-7' REPO = "elementary/granite" REGEX_VER = r'Version:\s*([\.\d]+)\n' SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/granite/granite.spec b/anda/desktops/elementary/granite-7/granite-7.spec similarity index 98% rename from anda/desktops/elementary/granite/granite.spec rename to anda/desktops/elementary/granite-7/granite-7.spec index 75f00aa21b..77da59b086 100644 --- a/anda/desktops/elementary/granite/granite.spec +++ b/anda/desktops/elementary/granite-7/granite-7.spec @@ -3,7 +3,7 @@ Granite is a companion library for GTK+ and GLib. Among other things, it provides complex widgets and convenience functions designed for use in apps built for elementary.} -Name: granite +Name: granite-7 Summary: elementary companion library for GTK+ and GLib Version: 7.1.0 Release: 1%{?dist} diff --git a/anda/desktops/elementary/pantheon-agent-geoclue2/chkupdate.py b/anda/desktops/elementary/pantheon-agent-geoclue2/chkupdate.py index 04527639e4..9db3dd9c3d 100644 --- a/anda/desktops/elementary/pantheon-agent-geoclue2/chkupdate.py +++ b/anda/desktops/elementary/pantheon-agent-geoclue2/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") 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 f6acd750c2..3d730c0623 100644 --- a/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec +++ b/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec @@ -3,7 +3,7 @@ Name: pantheon-agent-geoclue2 Summary: Pantheon Geoclue2 Agent -Version: 1.0.5 +Version: 1.0.6 Release: %autorelease License: GPLv3 @@ -21,6 +21,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libgeoclue-2.0) +BuildRequires: pkgconfig(granite) %description Provides a dialog asking for the user's permission when an application diff --git a/anda/desktops/elementary/pantheon-agent-polkit/chkupdate.py b/anda/desktops/elementary/pantheon-agent-polkit/chkupdate.py index 54d5c1bc56..9e1410b56a 100644 --- a/anda/desktops/elementary/pantheon-agent-polkit/chkupdate.py +++ b/anda/desktops/elementary/pantheon-agent-polkit/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-a11y/chkupdate.py b/anda/desktops/elementary/switchboard-plug-a11y/chkupdate.py index a4a1a7bf38..cee5d484ab 100644 --- a/anda/desktops/elementary/switchboard-plug-a11y/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-a11y/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-about/chkupdate.py b/anda/desktops/elementary/switchboard-plug-about/chkupdate.py index f36706c9f1..162dba982d 100644 --- a/anda/desktops/elementary/switchboard-plug-about/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-about/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-applications/chkupdate.py b/anda/desktops/elementary/switchboard-plug-applications/chkupdate.py index 48378a42e2..69c4064178 100644 --- a/anda/desktops/elementary/switchboard-plug-applications/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-applications/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-bluetooth/chkupdate.py b/anda/desktops/elementary/switchboard-plug-bluetooth/chkupdate.py index 33132f2afe..7d12043907 100644 --- a/anda/desktops/elementary/switchboard-plug-bluetooth/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-bluetooth/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-display/chkupdate.py b/anda/desktops/elementary/switchboard-plug-display/chkupdate.py index 950689226f..08fe02cc93 100644 --- a/anda/desktops/elementary/switchboard-plug-display/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-display/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-keyboard/chkupdate.py b/anda/desktops/elementary/switchboard-plug-keyboard/chkupdate.py index d2343faf7b..6b5c2861e0 100644 --- a/anda/desktops/elementary/switchboard-plug-keyboard/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-keyboard/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-mouse-touchpad/chkupdate.py b/anda/desktops/elementary/switchboard-plug-mouse-touchpad/chkupdate.py index dc50a3cf32..5ece641e3f 100644 --- a/anda/desktops/elementary/switchboard-plug-mouse-touchpad/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-mouse-touchpad/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-networking/chkupdate.py b/anda/desktops/elementary/switchboard-plug-networking/chkupdate.py index 2c38f08d4a..ed8fdb95a2 100644 --- a/anda/desktops/elementary/switchboard-plug-networking/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-networking/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-notifications/chkupdate.py b/anda/desktops/elementary/switchboard-plug-notifications/chkupdate.py index dffff8dc07..18c70c1502 100644 --- a/anda/desktops/elementary/switchboard-plug-notifications/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-notifications/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-onlineaccounts/chkupdate.py b/anda/desktops/elementary/switchboard-plug-onlineaccounts/chkupdate.py index b88f00c37f..dbf4263e07 100644 --- a/anda/desktops/elementary/switchboard-plug-onlineaccounts/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-onlineaccounts/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") 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 4a8daf6f8c..4cacd7c515 100644 --- a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec +++ b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec @@ -20,12 +20,12 @@ BuildRequires: vala Patch0: b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch -BuildRequires: pkgconfig(camel-1.2) = 3.44.4 +BuildRequires: pkgconfig(camel-1.2) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(granite) >= 6.0.0 BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: evolution-data-server-devel = 3.44.4 +BuildRequires: evolution-data-server-devel BuildRequires: pkgconfig(libhandy-1) >= 1.0.0 BuildRequires: pkgconfig(switchboard-2.0) diff --git a/anda/desktops/elementary/switchboard-plug-pantheon-shell/chkupdate.py b/anda/desktops/elementary/switchboard-plug-pantheon-shell/chkupdate.py index 8bd713dcba..74815b4451 100644 --- a/anda/desktops/elementary/switchboard-plug-pantheon-shell/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-pantheon-shell/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-printers/chkupdate.py b/anda/desktops/elementary/switchboard-plug-printers/chkupdate.py index c5db29fefb..5db7a343f1 100644 --- a/anda/desktops/elementary/switchboard-plug-printers/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-printers/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-sharing/chkupdate.py b/anda/desktops/elementary/switchboard-plug-sharing/chkupdate.py index 4f3b94c55f..4dbf59921c 100644 --- a/anda/desktops/elementary/switchboard-plug-sharing/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-sharing/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-sound/chkupdate.py b/anda/desktops/elementary/switchboard-plug-sound/chkupdate.py index ab3af9d72b..e39c74ba33 100644 --- a/anda/desktops/elementary/switchboard-plug-sound/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-sound/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard-plug-tweaks/chkupdate.py b/anda/desktops/elementary/switchboard-plug-tweaks/chkupdate.py index b0329c2a99..3c46bd9988 100644 --- a/anda/desktops/elementary/switchboard-plug-tweaks/chkupdate.py +++ b/anda/desktops/elementary/switchboard-plug-tweaks/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/switchboard/chkupdate.py b/anda/desktops/elementary/switchboard/chkupdate.py index 1585ec23e7..0dfbb87376 100644 --- a/anda/desktops/elementary/switchboard/chkupdate.py +++ b/anda/desktops/elementary/switchboard/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/wingpanel-applications-menu/chkupdate.py b/anda/desktops/elementary/wingpanel-applications-menu/chkupdate.py index dd0a4b41e8..24b1c8a8a4 100644 --- a/anda/desktops/elementary/wingpanel-applications-menu/chkupdate.py +++ b/anda/desktops/elementary/wingpanel-applications-menu/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/wingpanel-indicator-bluetooth/chkupdate.py b/anda/desktops/elementary/wingpanel-indicator-bluetooth/chkupdate.py index fdc7aeac32..e57651bc21 100644 --- a/anda/desktops/elementary/wingpanel-indicator-bluetooth/chkupdate.py +++ b/anda/desktops/elementary/wingpanel-indicator-bluetooth/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/wingpanel-indicator-datetime/chkupdate.py b/anda/desktops/elementary/wingpanel-indicator-datetime/chkupdate.py index d8ef50bd4d..3db34f14a8 100644 --- a/anda/desktops/elementary/wingpanel-indicator-datetime/chkupdate.py +++ b/anda/desktops/elementary/wingpanel-indicator-datetime/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/wingpanel-indicator-keyboard/chkupdate.py b/anda/desktops/elementary/wingpanel-indicator-keyboard/chkupdate.py index 416775f7a4..5f6c0e9cb3 100644 --- a/anda/desktops/elementary/wingpanel-indicator-keyboard/chkupdate.py +++ b/anda/desktops/elementary/wingpanel-indicator-keyboard/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/wingpanel-indicator-network/chkupdate.py b/anda/desktops/elementary/wingpanel-indicator-network/chkupdate.py index 1124e4442d..bf66febba5 100644 --- a/anda/desktops/elementary/wingpanel-indicator-network/chkupdate.py +++ b/anda/desktops/elementary/wingpanel-indicator-network/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/wingpanel-indicator-nightlight/chkupdate.py b/anda/desktops/elementary/wingpanel-indicator-nightlight/chkupdate.py index cd3ac8c158..d2dbd1fe1e 100644 --- a/anda/desktops/elementary/wingpanel-indicator-nightlight/chkupdate.py +++ b/anda/desktops/elementary/wingpanel-indicator-nightlight/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/wingpanel-indicator-notifications/chkupdate.py b/anda/desktops/elementary/wingpanel-indicator-notifications/chkupdate.py index 15a617b87f..b81c2c3905 100644 --- a/anda/desktops/elementary/wingpanel-indicator-notifications/chkupdate.py +++ b/anda/desktops/elementary/wingpanel-indicator-notifications/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/wingpanel-indicator-power/chkupdate.py b/anda/desktops/elementary/wingpanel-indicator-power/chkupdate.py index 5078808779..42a74717de 100644 --- a/anda/desktops/elementary/wingpanel-indicator-power/chkupdate.py +++ b/anda/desktops/elementary/wingpanel-indicator-power/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") 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 6b842c5b75..636ba53729 100644 --- a/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec +++ b/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec @@ -52,9 +52,9 @@ A power indicator for wingpanel. sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml -%check -appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml +# %check +# appstream-util validate-relax --nonet \ +# %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml %files -f power-indicator.lang diff --git a/anda/desktops/elementary/wingpanel-indicator-session/chkupdate.py b/anda/desktops/elementary/wingpanel-indicator-session/chkupdate.py index d183f09fd3..52c713deb7 100644 --- a/anda/desktops/elementary/wingpanel-indicator-session/chkupdate.py +++ b/anda/desktops/elementary/wingpanel-indicator-session/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/wingpanel-indicator-sound/chkupdate.py b/anda/desktops/elementary/wingpanel-indicator-sound/chkupdate.py index 0a250e2712..43784f5b63 100644 --- a/anda/desktops/elementary/wingpanel-indicator-sound/chkupdate.py +++ b/anda/desktops/elementary/wingpanel-indicator-sound/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/wingpanel/chkupdate.py b/anda/desktops/elementary/wingpanel/chkupdate.py index 5cbe79e075..e0a8ef91a2 100644 --- a/anda/desktops/elementary/wingpanel/chkupdate.py +++ b/anda/desktops/elementary/wingpanel/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/fonts/arphic-ukai/anda.hcl b/anda/fonts/arphic-ukai/anda.hcl new file mode 100644 index 0000000000..094b7ee897 --- /dev/null +++ b/anda/fonts/arphic-ukai/anda.hcl @@ -0,0 +1,6 @@ +project "pkg" { + rpm { + spec = "arphic-ukai-fonts.spec" + sources = "." + } +} diff --git a/anda/fonts/arphic-ukai/arphic-ukai-fonts.spec b/anda/fonts/arphic-ukai/arphic-ukai-fonts.spec new file mode 100644 index 0000000000..3ba9b6bc81 --- /dev/null +++ b/anda/fonts/arphic-ukai/arphic-ukai-fonts.spec @@ -0,0 +1,30 @@ +Name: arphic-ukai-fonts +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 +Summary: CJK Unicode font Kaiti style +BuildArch: noarch + +%description +%{summary}. + + +%prep +%setup -n fonts-arphic-ukai-%{version} + + +%install +install -D -m644 ukai.ttc %{buildroot}/%{_datadir}/fonts/arphic-ukai/ukai.ttc + + +%files +%doc README +%license license/english/ARPHICPL.TXT +%defattr(-,root,root,0755) +/%{_datadir}/fonts/arphic-ukai/ukai.ttc + +%changelog +* Mon Nov 21 2022 windowsboy111 - 4.004 +- Initial package diff --git a/anda/fonts/arphic-uming/anda.hcl b/anda/fonts/arphic-uming/anda.hcl new file mode 100644 index 0000000000..648597dbaf --- /dev/null +++ b/anda/fonts/arphic-uming/anda.hcl @@ -0,0 +1,6 @@ +project "pkg" { + rpm { + spec = "arphic-uming-fonts.spec" + sources = "." + } +} diff --git a/anda/fonts/arphic-uming/arphic-uming-fonts.spec b/anda/fonts/arphic-uming/arphic-uming-fonts.spec new file mode 100644 index 0000000000..17a0743e20 --- /dev/null +++ b/anda/fonts/arphic-uming/arphic-uming-fonts.spec @@ -0,0 +1,30 @@ +Name: arphic-uming-fonts +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 +Summary: CJK Unicode font Ming style +BuildArch: noarch + +%description +%{summary}. + + +%prep +%setup -n ttf-arphic-uming-%{version} + + +%install +install -D -m644 uming.ttc %{buildroot}/%{_datadir}/fonts/arphic-uming/uming.ttc + + +%files +%doc README +%license license/english/ARPHICPL.TXT +%defattr(-,root,root,0755) +/%{_datadir}/fonts/arphic-uming/uming.ttc + +%changelog +* Mon Nov 21 2022 windowsboy111 - 4.004 +- Initial package diff --git a/anda/fonts/hannom/COPYING b/anda/fonts/hannom/COPYING new file mode 100644 index 0000000000..7708774b73 --- /dev/null +++ b/anda/fonts/hannom/COPYING @@ -0,0 +1,7 @@ +Complete licensing information is embedded in the TTF files; most importantly: + + Chỉ được dùng riêng, tuyệt đối không được dùng để kinh doanh & vụ lợi + +Loose translation: + + For non-commercial, non-profit, personal use only. diff --git a/anda/desktops/elementary/elementary-tasks/anda.hcl b/anda/fonts/hannom/anda.hcl similarity index 58% rename from anda/desktops/elementary/elementary-tasks/anda.hcl rename to anda/fonts/hannom/anda.hcl index 7808718adb..2e977f01d3 100644 --- a/anda/desktops/elementary/elementary-tasks/anda.hcl +++ b/anda/fonts/hannom/anda.hcl @@ -1,6 +1,6 @@ project "pkg" { rpm { - spec = "elementary-tasks.spec" + spec = "hannom-fonts.spec" sources = "." } } diff --git a/anda/fonts/hannom/hannom-fonts.spec b/anda/fonts/hannom/hannom-fonts.spec new file mode 100644 index 0000000000..3408e19aa5 --- /dev/null +++ b/anda/fonts/hannom/hannom-fonts.spec @@ -0,0 +1,31 @@ +Name: hannom-fonts +Version: 2005 +Release: %autorelease +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 +Summary: Chinese and Vietnamese TrueType fonts +BuildRequires: unzip +BuildArch: noarch + +%description +%{summary}. + +%prep +unzip %{SOURCE0} + + +%install +install -D -m644 'HAN NOM A.ttf' "%{buildroot}/%{_datadir}/fonts/hannom/HAN NOM A.ttf" +install -D -m644 'HAN NOM B.ttf' "%{buildroot}/%{_datadir}/fonts/hannom/HAN NOM B.ttf" + + +%files +# %license %{SOURCE1} +%defattr(-,root,root,0755) +/%{_datadir}/fonts/hannom/ + +%changelog +* Mon Nov 21 2022 windowsboy111 - 4.004 +- Initial package diff --git a/anda/desktops/elementary/impallari-raleway-fonts/58-impallari-raleway-fonts.xml b/anda/fonts/impallari-raleway-fonts/58-impallari-raleway-fonts.xml similarity index 100% rename from anda/desktops/elementary/impallari-raleway-fonts/58-impallari-raleway-fonts.xml rename to anda/fonts/impallari-raleway-fonts/58-impallari-raleway-fonts.xml diff --git a/anda/desktops/elementary/impallari-raleway-fonts/anda.hcl b/anda/fonts/impallari-raleway-fonts/anda.hcl similarity index 100% rename from anda/desktops/elementary/impallari-raleway-fonts/anda.hcl rename to anda/fonts/impallari-raleway-fonts/anda.hcl diff --git a/anda/desktops/elementary/impallari-raleway-fonts/chkupdate.py b/anda/fonts/impallari-raleway-fonts/chkupdate.py similarity index 81% rename from anda/desktops/elementary/impallari-raleway-fonts/chkupdate.py rename to anda/fonts/impallari-raleway-fonts/chkupdate.py index d1f19f980e..3c02e70f37 100644 --- a/anda/desktops/elementary/impallari-raleway-fonts/chkupdate.py +++ b/anda/fonts/impallari-raleway-fonts/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/desktops/elementary/impallari-raleway-fonts/impallari-raleway-fonts.spec b/anda/fonts/impallari-raleway-fonts/impallari-raleway-fonts.spec similarity index 100% rename from anda/desktops/elementary/impallari-raleway-fonts/impallari-raleway-fonts.spec rename to anda/fonts/impallari-raleway-fonts/impallari-raleway-fonts.spec diff --git a/anda/fonts/kanjistrokeorders/anda.hcl b/anda/fonts/kanjistrokeorders/anda.hcl new file mode 100644 index 0000000000..267cb364d1 --- /dev/null +++ b/anda/fonts/kanjistrokeorders/anda.hcl @@ -0,0 +1,6 @@ +project "pkg" { + rpm { + spec = "kanjistrokeorders-fonts.spec" + sources = "." + } +} diff --git a/anda/fonts/kanjistrokeorders/kanjistrokeorders-fonts.spec b/anda/fonts/kanjistrokeorders/kanjistrokeorders-fonts.spec new file mode 100644 index 0000000000..e4889865d7 --- /dev/null +++ b/anda/fonts/kanjistrokeorders/kanjistrokeorders-fonts.spec @@ -0,0 +1,30 @@ +Name: kanjistrokeorders-fonts +Version: 4.004 +Release: %autorelease +URL: https://sites.google.com/site/nihilistorguk +License: custom +Summary: Kanji stroke order font +BuildRequires: unzip +BuildArch: noarch + + +%description +%{summary}. + + +%prep +curl -L --http1.1 http://www.dropbox.com/s/9jv2pnw4ohxzaml/KanjiStrokeOrders_v%{version}.zip > a.zip +unzip a.zip + + +%install +install -D -m644 KanjiStrokeOrders_v%{version}.ttf %{buildroot}/%{_datadir}/fonts/TTF/KanjiStrokeOrders_v%{version}.ttf + + +%files +%defattr(-,root,root,0755) +/%{_datadir}/fonts/TTF/KanjiStrokeOrders_v%{version}.ttf + +%changelog +* Mon Nov 21 2022 windowsboy111 - 4.004 +- Initial package diff --git a/anda/fonts/mini-wakuwaku/anda.hcl b/anda/fonts/mini-wakuwaku/anda.hcl new file mode 100644 index 0000000000..550d6edd1f --- /dev/null +++ b/anda/fonts/mini-wakuwaku/anda.hcl @@ -0,0 +1,6 @@ +project "pkg" { + rpm { + spec = "mini-wakuwaku-fonts.spec" + sources = "." + } +} diff --git a/anda/fonts/mini-wakuwaku/mini-wakuwaku-fonts.spec b/anda/fonts/mini-wakuwaku/mini-wakuwaku-fonts.spec new file mode 100644 index 0000000000..2db3634a0b --- /dev/null +++ b/anda/fonts/mini-wakuwaku/mini-wakuwaku-fonts.spec @@ -0,0 +1,32 @@ +Name: mini-wakuwaku-fonts +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 +Summary: A fat looking, rounded and cute Japanese font +BuildRequires: unzip +BuildArch: noarch + + +%description +%{summary}. + + +%prep +%setup -n mini-wakuwaku + + +%install +install -D -m644 mini-wakuwaku-maru.otf %{buildroot}/%{_datadir}/fonts/mini-wakuwaku/mini-wakuwaku-maru.otf +install -D -m644 mini-wakuwaku.otf %{buildroot}/%{_datadir}/fonts/mini-wakuwaku/mini-wakuwaku.otf + + +%files +%doc readme.html +%defattr(-,root,root,0755) +/%{_datadir}/fonts/mini-wakuwaku/ + +%changelog +* Mon Nov 21 2022 windowsboy111 - 4.004 +- Initial package diff --git a/anda/fonts/naikai/anda.hcl b/anda/fonts/naikai/anda.hcl new file mode 100644 index 0000000000..d3d84c5849 --- /dev/null +++ b/anda/fonts/naikai/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "naikai-fonts.spec" + } +} diff --git a/anda/desktops/elementary/elementary-tasks/chkupdate.py b/anda/fonts/naikai/chkupdate.py similarity index 72% rename from anda/desktops/elementary/elementary-tasks/chkupdate.py rename to anda/fonts/naikai/chkupdate.py index 7062745cfe..1fef62ee57 100644 --- a/anda/desktops/elementary/elementary-tasks/chkupdate.py +++ b/anda/fonts/naikai/chkupdate.py @@ -2,14 +2,14 @@ import os import requests import re -NAME = 'elementary-tasks' -REPO = "elementary/tasks" +NAME = 'naikai-fonts' +REPO = "max32002/naikaifont" REGEX_VER = r'Version:\s*([\.\d]+)\n' SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/fonts/naikai/naikai-fonts.spec b/anda/fonts/naikai/naikai-fonts.spec new file mode 100644 index 0000000000..66e8e216ed --- /dev/null +++ b/anda/fonts/naikai/naikai-fonts.spec @@ -0,0 +1,49 @@ +Name: naikai-fonts +Version: 1.87 +Release: %autorelease +URL: https://github.com/max32002/naikaifont +Source0: %{url}/archive/refs/tags/%{version}.tar.gz +License: OFLv1.1 +Summary: A free font family derived from setofont +BuildRequires: unzip +BuildArch: noarch + +%description +%{summary}. + +%package jp +Summary: A free font family derived from setofont (JP version) +%description jp +%{summary}. 瀬戸フォントに由来、たくさん中国語文字を加えた無料なフォント + +%package tw +Summary: A free font family derived from setofont (TW version) +%description tw +%{summary}. 瀨戶字體的繁體中文補字計畫 + + +%prep +%setup -n naikaifont-1.87 + + +%install +mkdir -p %{buildroot}/%{_datadir}/fonts/%{name}-{jp,tw}/ +install -D -m644 jp/*.ttf %{buildroot}/%{_datadir}/fonts/%{name}-jp/ +install -D -m644 tw/*.ttf %{buildroot}/%{_datadir}/fonts/%{name}-tw/ + + +%files jp +%doc README.md +%license SIL_Open_Font_License_1.1.txt +%defattr(-,root,root,0755) +/%{_datadir}/fonts/%{name}-jp + +%files tw +%doc README.md +%license SIL_Open_Font_License_1.1.txt +%defattr(-,root,root,0755) +/%{_datadir}/fonts/%{name}-tw + +%changelog +* Tue Nov 22 2022 windowsboy111 - 1.87 +- Initial package diff --git a/anda/fonts/seto/anda.hcl b/anda/fonts/seto/anda.hcl new file mode 100644 index 0000000000..b4afe97aa1 --- /dev/null +++ b/anda/fonts/seto/anda.hcl @@ -0,0 +1,6 @@ +project "pkg" { + rpm { + spec = "seto-fonts.spec" + sources = "." + } +} diff --git a/anda/fonts/seto/seto-fonts.spec b/anda/fonts/seto/seto-fonts.spec new file mode 100644 index 0000000000..bb55cc2a3f --- /dev/null +++ b/anda/fonts/seto/seto-fonts.spec @@ -0,0 +1,36 @@ +Name: seto-fonts +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 +Summary: A handwritten font that contains kanji up to JIS 4th level and difficult kanji +BuildRequires: unzip +BuildArch: noarch + + +%description +%{summary}. + + +%prep +%setup -n setofont + + +%install +mkdir -p $RPM_BUILD_ROOT/%{prefix}/%{name}/ +cp -r *.ttf $RPM_BUILD_ROOT/%{prefix}/%{name}/ + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%doc readme.txt +%defattr(-,root,root,0755) +/%{prefix}/%{name} + +%changelog +* Tue Nov 22 2022 windowsboy111 - 6.20 +- Initial package diff --git a/anda/games/prismlauncher-nightly/chkupdate.py b/anda/games/prismlauncher-nightly/chkupdate.py index de3467dc77..bde29103ca 100644 --- a/anda/games/prismlauncher-nightly/chkupdate.py +++ b/anda/games/prismlauncher-nightly/chkupdate.py @@ -11,7 +11,7 @@ LINK = f'https://api.github.com/repos/{REPO}/commits/HEAD' if datetime.utcnow().hour not in [0, 12]: exit(f'{NAME}: skipping update check') -sha = requests.get(LINK).json()['sha'] +sha = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['sha'] f = open(SPEC, 'r') matches = re.findall(REGEX_SHA, txt:=f.read()) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index f78798f4bb..dae55284d3 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -2,7 +2,7 @@ %global real_name prismlauncher %global repo https://github.com/%{fancy_name}/%{fancy_name} -%global commit 30607c34a153fd32085712e18827983772d77f7b +%global commit b60fe08d44fbf70bff1555ab0e0cee0a00172ac8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global filesystem_commit cd6805e94dd5d6346be1b75a54cdc27787319dd2 %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f diff --git a/anda/games/prismlauncher-qt5-nightly/chkupdate.py b/anda/games/prismlauncher-qt5-nightly/chkupdate.py index 5d08d27f81..66a2ecedd6 100644 --- a/anda/games/prismlauncher-qt5-nightly/chkupdate.py +++ b/anda/games/prismlauncher-qt5-nightly/chkupdate.py @@ -11,7 +11,7 @@ LINK = f'https://api.github.com/repos/{REPO}/commits/HEAD' if datetime.utcnow().hour not in [0, 12]: exit(f'{NAME}: skipping update check') -sha = requests.get(LINK).json()['sha'] +sha = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['sha'] f = open(SPEC, 'r') matches = re.findall(REGEX_SHA, txt:=f.read()) diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index e1a697dfd9..012b0e6ccd 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -2,7 +2,7 @@ %global real_name prismlauncher %global repo https://github.com/%{fancy_name}/%{fancy_name} -%global commit 30607c34a153fd32085712e18827983772d77f7b +%global commit b60fe08d44fbf70bff1555ab0e0cee0a00172ac8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global filesystem_commit cd6805e94dd5d6346be1b75a54cdc27787319dd2 %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f diff --git a/anda/games/prismlauncher-qt5/chkupdate.py b/anda/games/prismlauncher-qt5/chkupdate.py index 4999d75848..5817835695 100644 --- a/anda/games/prismlauncher-qt5/chkupdate.py +++ b/anda/games/prismlauncher-qt5/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/games/prismlauncher/chkupdate.py b/anda/games/prismlauncher/chkupdate.py index a25168a479..a041b97d66 100644 --- a/anda/games/prismlauncher/chkupdate.py +++ b/anda/games/prismlauncher/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/lib/libbismuth/chkupdate.py b/anda/lib/libbismuth/chkupdate.py index 5e7937dae9..0475c96d2e 100644 --- a/anda/lib/libbismuth/chkupdate.py +++ b/anda/lib/libbismuth/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/lib/libhelium/chkupdate.py b/anda/lib/libhelium/chkupdate.py index aa3834bb5f..f371c58cf4 100644 --- a/anda/lib/libhelium/chkupdate.py +++ b/anda/lib/libhelium/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/rnote/chkupdate.py b/anda/rnote/chkupdate.py index 7d398ba1fa..c6523fdeef 100644 --- a/anda/rnote/chkupdate.py +++ b/anda/rnote/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] ver = ver[1:] # starts with v with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) diff --git a/anda/rnote/rnote.spec b/anda/rnote/rnote.spec index 1acec4c66b..3d9c6fb71f 100644 --- a/anda/rnote/rnote.spec +++ b/anda/rnote/rnote.spec @@ -1,5 +1,5 @@ Name: rnote -Version: 0.5.7 +Version: 0.5.8 Release: %autorelease Summary: Sketch and take handwritten notes. License: GPLv3 diff --git a/anda/rust/sccache/rust-sccache.spec b/anda/rust/sccache/rust-sccache.spec index e39f7f09a9..f0134bbc73 100644 --- a/anda/rust/sccache/rust-sccache.spec +++ b/anda/rust/sccache/rust-sccache.spec @@ -6,8 +6,8 @@ %global crate sccache Name: rust-sccache -Version: 0.3.0 -Release: 3%{?dist} +Version: 0.3.1 +Release: %autorelease Summary: Ccache-like tool License: Apache-2.0 diff --git a/anda/rust/sccache/sccache-fix-metadata-auto.diff b/anda/rust/sccache/sccache-fix-metadata-auto.diff index 211ab85ba9..77ca79a9e6 100644 --- a/anda/rust/sccache/sccache-fix-metadata-auto.diff +++ b/anda/rust/sccache/sccache-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- sccache-0.3.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ sccache-0.3.0/Cargo.toml 1970-01-01T00:00:01+00:00 -@@ -392,13 +392,3 @@ +--- 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 @@ [target."cfg(unix)".dependencies.daemonize] version = "0.4" @@ -12,5 +12,6 @@ -features = [ - "fileapi", - "handleapi", +- "stringapiset", - "winnls", -] diff --git a/anda/rust/starship/chkupdate.py b/anda/rust/starship/chkupdate.py index e781703eee..cd6e8d722b 100644 --- a/anda/rust/starship/chkupdate.py +++ b/anda/rust/starship/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] ver = ver[1:] # starts with v with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) diff --git a/anda/rust/starship/rust-starship.spec b/anda/rust/starship/rust-starship.spec index fa3df1e247..887ecd7d26 100644 --- a/anda/rust/starship/rust-starship.spec +++ b/anda/rust/starship/rust-starship.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 22 +# Generated by rust2rpm 23 %bcond_without check %define debug_package %{nil} @@ -12,7 +12,9 @@ Summary: Minimal, blazing-fast, and infinitely customizable prompt for an License: ISC URL: https://crates.io/crates/starship Source: %{crates_source} -ExclusiveArch: %{rust_arches} +# Automatically generated patch to strip foreign dependencies +Patch0: starship-fix-metadata-auto.diff +Patch1: starship-fix-git-repository-dep.diff BuildRequires: rust-packaging >= 21 BuildRequires: anda-srpm-macros @@ -85,6 +87,42 @@ use the "config-schema" feature of the "%{crate}" crate. %files -n %{name}+config-schema-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+git-features-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+git-features-devel %{_description} + +This package contains library source intended for building other packages which +use the "git-features" feature of the "%{crate}" crate. + +%files -n %{name}+git-features-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+git-repository-faster-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+git-repository-faster-devel %{_description} + +This package contains library source intended for building other packages which +use the "git-repository-faster" feature of the "%{crate}" crate. + +%files -n %{name}+git-repository-faster-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+git-repository-max-perf-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+git-repository-max-perf-devel %{_description} + +This package contains library source intended for building other packages which +use the "git-repository-max-perf" feature of the "%{crate}" crate. + +%files -n %{name}+git-repository-max-perf-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+notify-devel Summary: %{summary} BuildArch: noarch @@ -135,6 +173,7 @@ use the "starship-battery" feature of the "%{crate}" crate. %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 +cargo add git-repository@0.27.0 %cargo_prep_online %build diff --git a/anda/rust/starship/starship-fix-git-repository-dep.diff b/anda/rust/starship/starship-fix-git-repository-dep.diff new file mode 100644 index 0000000000..2c1c738347 --- /dev/null +++ b/anda/rust/starship/starship-fix-git-repository-dep.diff @@ -0,0 +1,11 @@ +--- starship-1.11.0/src/context.rs 1970-01-01T00:00:01+00:00 ++++ starship-1.11.0/src/context.rs 1970-01-01T00:00:01+00:00 +@@ -635,7 +635,7 @@ fn get_remote_repository_info( + .map(|r| r.shorten().to_string()); + let name = repository + .branch_remote_name(branch_name) +- .map(|n| n.to_string()); ++ .map(|n| n.as_bstr().to_string()); + + Some(Remote { branch, name }) + } diff --git a/anda/rust/starship/starship-fix-metadata-auto.diff b/anda/rust/starship/starship-fix-metadata-auto.diff index 5ac03d43f5..27b729aece 100644 --- a/anda/rust/starship/starship-fix-metadata-auto.diff +++ b/anda/rust/starship/starship-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- starship-1.10.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ starship-1.10.3/Cargo.toml 1970-01-01T00:00:01+00:00 -@@ -246,18 +246,3 @@ +--- starship-1.11.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ starship-1.11.0/Cargo.toml 1970-01-01T00:00:01+00:00 +@@ -255,18 +255,3 @@ ] default-features = false @@ -8,7 +8,7 @@ -version = "0.2.0" - -[target."cfg(windows)".dependencies.windows] --version = "0.39.0" +-version = "0.42.0" -features = [ - "Win32_Foundation", - "Win32_UI_Shell", diff --git a/anda/rust/zellij/rust-zellij.spec b/anda/rust/zellij/rust-zellij.spec index 9a5da37462..1491e0e29d 100644 --- a/anda/rust/zellij/rust-zellij.spec +++ b/anda/rust/zellij/rust-zellij.spec @@ -46,7 +46,7 @@ EOF\ %global crate zellij Name: rust-zellij -Version: 0.31.4 +Version: 0.33.0 Release: %autorelease Summary: Terminal workspace with batteries included diff --git a/anda/sass/chkupdate.py b/anda/sass/chkupdate.py index 5d0c362aca..1e3730bf9d 100644 --- a/anda/sass/chkupdate.py +++ b/anda/sass/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/tau-helium/chkupdate.py b/anda/tau-helium/chkupdate.py index 18b7d9939e..5cb3b2f2e8 100644 --- a/anda/tau-helium/chkupdate.py +++ b/anda/tau-helium/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/tau-helium/tau-helium.spec b/anda/tau-helium/tau-helium.spec index 9874edb356..c44c72ad23 100644 --- a/anda/tau-helium/tau-helium.spec +++ b/anda/tau-helium/tau-helium.spec @@ -1,6 +1,6 @@ Summary: tauOS GTK/GNOME Shell Themes Name: tau-helium -Version: 1.1.21 +Version: 1.1.22 Release: 1%{?dist} License: GPLv3 URL: https://github.com/tau-OS/tau-helium @@ -32,6 +32,9 @@ mkdir -p licenses %{_datadir}/themes/Helium-dark/* %changelog +* Fri Nov 25 2022 root - 1.1.22-1 +- new version + * Fri Nov 18 2022 Lleyton Gray - 1.1.21-1 - new version diff --git a/anda/tau-hydrogen/anda.hcl b/anda/tau-hydrogen/anda.hcl new file mode 100644 index 0000000000..86d42cce6c --- /dev/null +++ b/anda/tau-hydrogen/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "tau-hydrogen.spec" + } +} \ No newline at end of file diff --git a/anda/tau-hydrogen/chkupdate.py b/anda/tau-hydrogen/chkupdate.py new file mode 100644 index 0000000000..91f4f3b268 --- /dev/null +++ b/anda/tau-hydrogen/chkupdate.py @@ -0,0 +1,19 @@ +import os +import requests +import re + +NAME = 'tau-hydrogen' +REPO = "tau-OS/tau-hydrogen" +REGEX_VER = r'Version:\s*([\.\d]+)\n' +SPEC = f"{NAME}.spec" +LINK = f'https://api.github.com/repos/{REPO}/releases/latest' + + +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] +with open(SPEC, 'r') as f: + matches = re.findall(REGEX_VER, f.read()) +if not len(matches): exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: exit(f'{NAME}: Up to date!') +print(f'{NAME}: {cur} -> {ver}') +os.system(f'rpmdev-bumpspec -n {ver} {SPEC}') diff --git a/anda/tau-hydrogen/tau-hydrogen.spec b/anda/tau-hydrogen/tau-hydrogen.spec new file mode 100644 index 0000000000..dce742df80 --- /dev/null +++ b/anda/tau-hydrogen/tau-hydrogen.spec @@ -0,0 +1,38 @@ +Summary: tauOS Icon Theme +Name: tau-hydrogen +Version: 1.0.1 +Release: 1%{?dist} +License: GPLv3 +URL: https://github.com/tau-OS/tau-hydrogen +Source0: https://github.com/tau-OS/tau-hydrogen/archive/refs/tags/%{version}.tar.gz +BuildArch: noarch +BuildRequires: meson +BuildRequires: ninja-build +BuildRequires: librsvg2-tools +BuildRequires: xcursorgen + +%description +Hydrogen is the default icon theme in tauOS + +%prep +%autosetup -n tau-hydrogen-%{version} + +%build +%meson +%meson_build + +%install +# Install licenses +mkdir -p licenses +%meson_install + +%files +%license LICENSE +%doc README.md +%{_datadir}/icons/Hydrogen/* +%{_datadir}/gimp/2.0/palettes/Helium.gpl +%{_datadir}/inkscape/palettes/Helium.gpl + +%changelog +* Sun Nov 20 2022 Lleyton Gray - 1.0.1 +- Terra Release diff --git a/anda/tectonic/chkupdate.py b/anda/tectonic/chkupdate.py index f66fb084c5..91597b9b4b 100644 --- a/anda/tectonic/chkupdate.py +++ b/anda/tectonic/chkupdate.py @@ -9,7 +9,7 @@ SPEC = f"{NAME}.spec" LINK = f'https://api.github.com/repos/{REPO}/releases/latest' -ver = requests.get(LINK).json()['tag_name'][9:] +ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'][9:] with open(SPEC, 'r') as f: matches = re.findall(REGEX_VER, f.read()) if not len(matches): exit(f"{NAME}: Failed to match regex!") diff --git a/anda/tools/lorax/anda.hcl b/anda/tools/lorax/anda.hcl index eafb84806f..fc53224d3c 100644 --- a/anda/tools/lorax/anda.hcl +++ b/anda/tools/lorax/anda.hcl @@ -6,10 +6,10 @@ project "pkg" { scm_opts = { method = "git" package = "lorax" - branch = "lorax-38.0-1" + branch = "lorax-38.2-1" write_tar = "true" spec = "lorax.spec" git_get = "git clone https://github.com/weldr/lorax.git" } } -} \ No newline at end of file +} diff --git a/comps.xml b/comps.xml new file mode 100644 index 0000000000..6f7494a240 --- /dev/null +++ b/comps.xml @@ -0,0 +1,65 @@ + + + + + pantheon-desktop + Pantheon Desktop + The Pantheon desktop environment is the DE that powers elementaryOS. + false + true + + contractor + elementary-capnet-assist + elementary-icon-theme + elementary-notifications + elementary-sound-theme + elementary-theme + elementary-wallpapers + gala + gnome-session + pantheon-agent-geoclue2 + pantheon-agent-polkit + pantheon-session-settings + plank + wingpanel + wingpanel-applications-menu + wingpanel-indicator-bluetooth + wingpanel-indicator-datetime + wingpanel-indicator-keyboard + wingpanel-indicator-network + wingpanel-indicator-nightlight + wingpanel-indicator-notifications + wingpanel-indicator-power + wingpanel-indicator-session + wingpanel-indicator-sound + elementary-calculator + elementary-calendar + elementary-camera + elementary-code + elementary-files + elementary-greeter + elementary-music + elementary-photos + elementary-print + elementary-screenshot-tool + elementary-shortcut-overlay + elementary-sideload + elementary-terminal + elementary-videos + switchboard + switchboard-plug-a11y + switchboard-plug-about + switchboard-plug-applications + switchboard-plug-bluetooth + switchboard-plug-display + switchboard-plug-keyboard + switchboard-plug-mouse-touchpad + switchboard-plug-networking + switchboard-plug-notifications + switchboard-plug-pantheon-shell + switchboard-plug-printers + switchboard-plug-sharing + switchboard-plug-sound + + +