Skip to content

Commit

Permalink
Merge branch 'frawhide' into mado/w/bruno
Browse files Browse the repository at this point in the history
  • Loading branch information
madonuko authored May 21, 2024
2 parents 159e9ac + 1b4b95d commit 8ea9d4f
Show file tree
Hide file tree
Showing 31 changed files with 136 additions and 43 deletions.
4 changes: 2 additions & 2 deletions anda/apps/armcord-bin/armcord-bin.spec
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
%global __provides_exclude_from %{_datadir}/armcord/.*\\.so

Name: armcord-bin
Version: 3.2.6
Release: 1%{?dist}
Version: 3.2.7
Release: 1%?dist
License: OSL-3.0
Summary: Custom lightweight Discord client designed to enhance your experience
URL: https://github.com/ArmCord/ArmCord
Expand Down
4 changes: 2 additions & 2 deletions anda/apps/armcord/armcord.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
%define debug_package %nil

Name: armcord
Version: 3.2.6
Release: 1%{?dist}
Version: 3.2.7
Release: 1%?dist
License: OSL-3.0
Summary: Custom lightweight Discord client designed to enhance your experience
URL: https://github.com/ArmCord/ArmCord
Expand Down
4 changes: 2 additions & 2 deletions anda/apps/mpv/mpv-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global commit 03ca3408354e99a7c50838c57531bba1c167ef87
%global commit 76ad8efe39260db9880bca5dc0055f317ffbbfed
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240516
%global commit_date 20240521
%global ver v0.38.0

Name: mpv-nightly
Expand Down
5 changes: 5 additions & 0 deletions anda/apps/tuxclocker/anda.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "tuxclocker.spec"
}
}
42 changes: 42 additions & 0 deletions anda/apps/tuxclocker/tuxclocker.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
Name: tuxclocker
Version: 1.5.1
Release: 1%?dist
Summary: Qt overclocking tool for GNU/Linux
License: GPL-3.0
URL: https://github.com/Lurkki14/tuxclocker
# boost qt5-qtbase qt5-qtcharts
Requires: hicolor-icon-theme
BuildRequires: git-core meson hwdata qt5-qttools gettext anda-srpm-macros
BuildRequires: boost-devel qt5-qtbase-devel qt5-qtcharts-devel libdrm-devel libXNVCtrl-devel openssl-devel
Recommends: xorg-x11-drv-nvidia libdrm libXNVCtrl hwdata

%description
TuxClocker is a hardware controlling and monitoring program.
TuxClocker consists of a DBus daemon and a Qt GUI that uses the daemon.

%prep
git clone --recursive %url .
git checkout %version

%build
%meson
%meson_build

%install
%meson_install

%files
%doc README.md
%license LICENSE
%_bindir/tuxclocker-qt
%_bindir/tuxclockerd
%_libdir/libtuxclocker.so
%_libdir/tuxclocker/
%_datadir/applications/tuxclocker.desktop
%_datadir/dbus-1/system-services/org.tuxclocker.service
%_datadir/dbus-1/system.d/org.tuxclocker.conf
%_datadir/locale/*/LC_MESSAGES/tuxclocker.mo
%_iconsdir/hicolor/scalable/apps/tuxclocker-logo.svg

%changelog
%autochangelog
1 change: 1 addition & 0 deletions anda/apps/tuxclocker/update.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rpm.version(gh("Lurkki14/tuxclocker"));
4 changes: 2 additions & 2 deletions anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: pantheon-tweaks
Version: 1.1.2
Release: 1%{?dist}
Version: 2.0.0
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

Name: switchboard-plug-tweaks
Summary: Switchboard Tweaks Plug
Version: 1.1.2
Release: 1%{?dist}
Version: 2.0.0
Release: 1%?dist
License: GPL-3.0-or-later

URL: https://github.com/pantheon-tweaks/pantheon-tweaks
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global forgeurl https://github.com/KDE/latte-dock/

%global commit 10be08a7940b86d1cdca963a01542c92b064c7bd
%global commit d1d57b7d01d33d1afd3c6ba867d420c72c468b2d
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date %(date '+%Y%m%d')
%global snapshot_info %{commit_date}.%{shortcommit}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
%global commit a17feddaac58fd275ee470dbce6d54df24da4a0d
%global commit 557b09902c59eae015767367ef5a97c5c47b67fb
%forgemeta

Name: lomiri-system-settings
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: ayatana-indicator-sound
Summary: Ayatana Indicator Sound Applet
Version: 24.4.0
Version: 24.4.1
Release: 1%?dist
License: GPLv3
URL: https://github.com/AyatanaIndicators/ayatana-indicator-sound
Expand Down
4 changes: 2 additions & 2 deletions anda/devs/neovide/neovide.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
%define debug_package %nil

Name: neovide
Version: 0.12.2
Release: 1%{?dist}
Version: 0.13.0
Release: 1%?dist
Summary: No Nonsense Neovim Client in Rust
License: MIT
URL: https://neovide.dev/
Expand Down
2 changes: 1 addition & 1 deletion anda/docker/containerd/containerd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# https://github.com/containerd/containerd
%global goipath github.com/containerd/containerd
Version: 1.7.16
Version: 1.7.17

%gometa

Expand Down
4 changes: 2 additions & 2 deletions anda/games/osu-lazer/osu-lazer.spec
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
%define osuresver 2024.510.0
%define osuresver 2024.517.0
%global debug_package %{nil}
%define __strip /bin/true

Name: osu-lazer
Version: 2024.412.1
Version: 2024.521.2
Release: 1%?dist
Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
ExclusiveArch: x86_64
Expand Down
4 changes: 2 additions & 2 deletions anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
%global real_name prismlauncher
%global nice_name PrismLauncher

%global commit 93da066aa24220097d6f424fe13a74bbcfe54c21
%global commit 0ecdceccd2ea7432ae6810a7e41afe848ccc452f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8

%global commit_date 20240513
%global commit_date 20240521
%global snapshot_info %{commit_date}.%{shortcommit}

%bcond_without qt6
Expand Down
38 changes: 38 additions & 0 deletions anda/langs/go/albius/albius.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
%define debug_package %nil
%global commit 688ca6ae29de89174794a48be61ecd0fb1111c96
%global commit_date 20240430
%global shortcommit %(c=%{commit}; echo ${c:0:7})

Name: albius
Version: %date.%shortcommit
Release: 1%?dist
Summary: A Linux installer backend with support for SquashFS and OCI installations
License: GPL-3.0
URL: https://github.com/Vanilla-OS/Albius
Source0: %url/archive/%commit/albius-%commit.tar.gz
BuildRequires: go anda-srpm-macros btrfs-progs-devel pkgconfig(devmapper) pkgconfig(gpgme) lvm2 gcc

%description
Albius is a Linux installer backend originally designed for Vanilla OS,
but capable of handling any Linux distribution that uses either Squashfs
or OCI images for distributing the base system. Albius is written entirely
in Go and uses a recipe system (see "recipes" subsection) for describing
operations, mountpoints and options.

%prep
%autosetup -n Albius-%commit
go mod download

%build
mkdir -p build/bin
go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -w" -buildmode=pie -o build/bin/albius .

%install
mkdir -p %{buildroot}%{_bindir}/
install -pm755 build/bin/albius %{buildroot}%{_bindir}/

%files
%_bindir/albius

%changelog
%autochangelog
5 changes: 5 additions & 0 deletions anda/langs/go/albius/anda.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "albius.spec"
}
}
1 change: 1 addition & 0 deletions anda/langs/go/albius/update.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rpm.version(gh("Vanilla-OS/Albius"));
4 changes: 2 additions & 2 deletions anda/langs/go/gendesk/golang-github-xyproto-gendesk.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# https://github.com/xyproto/gendesk
%global goipath github.com/xyproto/gendesk
Version: 1.0.9
Version: 1.0.10
%global tag 1.0.9
%global commit f074161864697100fdc21a99e09b567e82aeb1b9

Expand All @@ -20,7 +20,7 @@ of information.}
%global godocs README.md

Name: %{goname}
Release: 1%{?dist}
Release: 1%?dist
Summary: Generate .desktop files and download .png icons

License: BSD-3-Clause
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# https://github.com/xyproto/textoutput
%global goipath github.com/xyproto/textoutput
Version: 1.16.3
Version: 1.16.4

%gometa -f

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# https://github.com/xyproto/vt100
%global goipath github.com/xyproto/vt100
Version: 1.14.3
Version: 1.14.4

%gometa -f

Expand Down
2 changes: 1 addition & 1 deletion anda/langs/kotlin/kotlin-native/kotlin-native.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Name: kotlin-native
Version: 1.9.24
Version: 2.0.0
Release: 1%?dist
Summary: LLVM backend for the Kotlin compiler
ExclusiveArch: x86_64
Expand Down
2 changes: 1 addition & 1 deletion anda/langs/kotlin/kotlin/kotlin.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Name: kotlin
Version: 1.9.24
Version: 2.0.0
Release: 1%?dist
Summary: Statically typed programming language

Expand Down
4 changes: 2 additions & 2 deletions anda/langs/nim/nim-nightly/nim-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
%global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
%global commit 2c8551556e5b51b7a7e487b1043b92d4ad34dbf0
%global commit b838d3ece1e8530f355b5078b2daa96ac01acab5
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global ver 2.1.1
%global commit_date 20240516
%global commit_date 20240521
%global debug_package %nil

Name: nim-nightly
Expand Down
8 changes: 4 additions & 4 deletions anda/langs/rust/starship/rust-starship.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

Name: rust-starship
Version: 1.19.0
Release: 1%?dist
Release: %autorelease
Summary: Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️

License: ISC
URL: https://crates.io/crates/starship
Source: %{crates_source}
# Automatically generated patch to strip dependencies and normalize metadata
Patch0: starship-fix-metadata-auto.diff
Patch: starship-fix-metadata-auto.diff

BuildRequires: cargo-rpm-macros >= 24
BuildRequires: anda-srpm-macros
Expand Down Expand Up @@ -175,10 +175,10 @@ use the "starship-battery" feature of the "%{crate}" crate.
%cargo_prep_online

%build
%{cargo_build}
%cargo_build

%install
%{cargo_install}
%cargo_install

%if %{with check}
%check
Expand Down
6 changes: 3 additions & 3 deletions anda/langs/rust/starship/starship-fix-metadata-auto.diff
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- starship-1.18.1/Cargo.toml 1970-01-01T00:00:01+00:00
+++ starship-1.18.1/Cargo.toml 2024-03-24T13:14:24.022475+00:00
--- starship-1.19.0/Cargo.toml 1970-01-01T00:00:01+00:00
+++ starship-1.19.0/Cargo.toml 2024-05-16T10:47:19.540098+00:00
@@ -263,18 +263,3 @@
]
default-features = false
Expand All @@ -8,7 +8,7 @@
-version = "0.2.0"
-
-[target."cfg(windows)".dependencies.windows]
-version = "0.54.0"
-version = "0.56.0"
-features = [
- "Win32_Foundation",
- "Win32_UI_Shell",
Expand Down
4 changes: 2 additions & 2 deletions anda/langs/vala/vala-nightly/vala-nightly.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
%global priority 90

%global real_name vala
%global commit fa704b2c2385f35d12568ee31de33568d6d67749
%global commit ed0077a101ddc5abe39045c36f8aeb053e5c34dd
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global repo https://gitlab.gnome.org/GNOME/%{real_name}.git

%global commit_date 20240426
%global commit_date 20240520
%global snapshot_info %{commit_date}.%{shortcommit}

Name: vala-nightly
Expand Down
2 changes: 1 addition & 1 deletion anda/lib/tdlib/tdlib-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%global commit 12c1689b54cdc57d145b5ae74b63eaf713847104
%global commit fd3154b28727df9e66423d64168fab1202d8c849
%global ver 1.8.29
%global commit_date 20240219
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@ Name: kwin-system76-scheduler-integration
%forgemeta

Version: 0.1
Release: 1%?dist
Release: 2%?dist
Summary: Notify the System76 Scheduler which app has focus so it can be prioritized
License: MIT
URL: %forgeurl
Source0: %forgesource
Source1: com.system76.Scheduler.dbusproxy.service
Requires: bash dbus-tools system76-scheduler kde-cli-tools systemd kf6-kconfig
BuildRequires: systemd-rpm-macros

# We require the Qt 4 package to provide the `qdbus` command
Requires: qt
%description
System76 Scheduler is a service which optimizes Linux's CPU scheduler and
automatically assigns process priorities for improved desktop responsiveness.
Expand Down
2 changes: 1 addition & 1 deletion anda/misc/sass/sass.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
%define _build_id_links none

Name: sass
Version: 1.77.1
Version: 1.77.2
Release: 1%?dist
Summary: The reference implementation of Sass, written in Dart
License: MIT
Expand Down
4 changes: 2 additions & 2 deletions anda/tools/yt-dlp/yt-dlp-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#bcond_without tests
%global commit 351dc0bc334c4e1b5f00c152818c3ec0ed71f788
%global commit 4ccd73fea0f6f4be343e1ec7f22dd03799addcf8
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240514
%global commit_date 20240521
%global ver 2024.04.09

Name: yt-dlp-nightly
Expand Down

0 comments on commit 8ea9d4f

Please sign in to comment.