Skip to content

Commit

Permalink
chore(sync): 39 -> rawhide
Browse files Browse the repository at this point in the history
  • Loading branch information
madonuko committed Mar 12, 2024
1 parent 51a0987 commit 60deebc
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 30 deletions.
8 changes: 4 additions & 4 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 6935c0dc3ba6463b95c66c12ff2e2e0de1fa5ec0
%global commit 3b0564f098c49be2fd3082928c91440c73df4d80
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8

%global commit_date %(date '+%Y%m%d')
%global commit_date 20240311
%global snapshot_info %{commit_date}.%{shortcommit}

%bcond_without qt6
Expand All @@ -32,8 +32,8 @@ Name: prismlauncher-nightly
%else
Name: prismlauncher-qt5-nightly
%endif
Version: 8.0^%{snapshot_info}
Release: 1%{?dist}
Version: 9.0^%{snapshot_info}
Release: 1%?dist
Summary: Minecraft launcher with ability to manage multiple instances
License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
Group: Amusements/Games
Expand Down
3 changes: 2 additions & 1 deletion anda/games/prismlauncher-nightly/update.rhai
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ if filters.contains("nightly") {
let cmake = get("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/develop/CMakeLists.txt");
let maj = find("set\\(Launcher_VERSION_MAJOR\\s+(\\d+)\\)", cmake, 1);
let min = find("set\\(Launcher_VERSION_MINOR\\s+(\\d+)\\)", cmake, 1);
rpm.version(`${maj}.${min}^${date()}.%{snapshot_info}`);
rpm.global("commit_date", date());
rpm.version(`${maj}.${min}^%{snapshot_info}`);
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
%global real_name prismlauncher
%global nice_name PrismLauncher

%global commit 6935c0dc3ba6463b95c66c12ff2e2e0de1fa5ec0
%global commit 3b0564f098c49be2fd3082928c91440c73df4d80
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8

%global commit_date %(date '+%Y%m%d')
%global commit_date 20240311
%global snapshot_info %{commit_date}.%{shortcommit}

%bcond_with qt6
Expand All @@ -32,8 +32,8 @@ Name: prismlauncher-nightly
%else
Name: prismlauncher-qt5-nightly
%endif
Version: 8.0^%{snapshot_info}
Release: 1%{?dist}
Version: 9.0^%{snapshot_info}
Release: 1%?dist
Summary: Minecraft launcher with ability to manage multiple instances
License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
Group: Amusements/Games
Expand Down
3 changes: 2 additions & 1 deletion anda/games/prismlauncher-qt5-nightly/update.rhai
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ if filters.contains("nightly") {
let cmake = get("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/develop/CMakeLists.txt");
let maj = find("set\\(Launcher_VERSION_MAJOR\\s+(\\d+)\\)", cmake, 1);
let min = find("set\\(Launcher_VERSION_MINOR\\s+(\\d+)\\)", cmake, 1);
rpm.version(`${maj}.${min}^${date()}.%{snapshot_info}`);
rpm.global("commit_date", date());
rpm.version(`${maj}.${min}^%{snapshot_info}`);
}
}
2 changes: 1 addition & 1 deletion anda/games/prismlauncher-qt5/prismlauncher-qt5.spec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Name: prismlauncher
%else
Name: prismlauncher-qt5
%endif
Version: 8.1
Version: 8.2
Release: 1%?dist
Summary: Minecraft launcher with ability to manage multiple instances
# see COPYING.md for more information
Expand Down
2 changes: 1 addition & 1 deletion anda/games/prismlauncher/prismlauncher.spec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Name: prismlauncher
%else
Name: prismlauncher-qt5
%endif
Version: 8.1
Version: 8.2
Release: 1%?dist
Summary: Minecraft launcher with ability to manage multiple instances
# see COPYING.md for more information
Expand Down
1 change: 1 addition & 0 deletions anda/langs/nim/choosenim/anda.hcl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
project pkg {
arches = ["x86_64"]
rpm {
spec = "choosenim.spec"
}
Expand Down
16 changes: 7 additions & 9 deletions anda/langs/nim/choosenim/choosenim.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,27 @@ Summary: Easily install and manage multiple versions of the Nim programming lan
License: BSD-3-Clause
URL: https://github.com/dom96/choosenim
Source0: %url/archive/refs/tags/v%version.tar.gz
BuildRequires: nim mold
BuildRequires: nim git

%description
choosenim installs the Nim programming language from official downloads and
sources, enabling you to easily switch between stable and development compilers.

%prep
%autosetup -n choosenim-%version
%autosetup

%build
nimble setup -y
nim c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim

%install
mold -run nimble build -t:-fPIE -l:-pie
install -Dm755 src/choosenim %buildroot%_bindir/choosenim


%files
%doc readme.md
%license LICENSE
%{_bindir}/choosenim
%_bindir/choosenim

%changelog
* Sat Jun 17 2023 windowsboy111 <[email protected]> - 0.8.4-3
- Use nim to compile instead of prebuilt binaries.

* Mon Jan 9 2023 windowsboy111 <[email protected]> - 0.8.4-1
- Initial Package.
%autochangelog
6 changes: 3 additions & 3 deletions anda/langs/nim/nim-nightly/nim-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
%global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
%global commit 92c8c6d5f4e5a96b71bf4eca5f6a136410f97d6e
%global commit 78c834dd76f273d8813247647531005a1f7db1a6
%global ver 2.1.1
%global commit_date 240219
%global commit_date 20240312
%global debug_package %nil

Name: nim-nighlty
Version: %ver^%commit_date.%commit
Release: 1%{?dist}
Release: 1%?dist
Summary: Imperative, multi-paradigm, compiled programming language
License: MIT and BSD
URL: https://nim-lang.org
Expand Down
8 changes: 3 additions & 5 deletions anda/lib/apparmor/apparmor.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
%bcond_with tests

Name: apparmor
Version: 4.0.0
Version: 4.0.0~alpha3
Release: 1%{?dist}
Summary: AppArmor userspace components

%define baseversion %(echo %{version} | cut -d. -f-2)

License: GPL-2.0
URL: https://launchpad.net/apparmor
Source0: %{url}/%{baseversion}/%{version}-alpha2/+download/%{name}-%{version}~alpha2.tar.gz
Source0: %{url}/%{baseversion}/%(echo %version | sed 's/~/-/')/+download/%{name}-%{version}.tar.gz
Source1: apparmor.preset
Patch01: 0001-fix-avahi-daemon-authselect-denial-in-fedora.patch
Patch02: 0001-All-current-versions-of-RHEL-and-Fedora-that-are-not.patch

BuildRequires: gcc
BuildRequires: automake
Expand Down Expand Up @@ -138,7 +137,7 @@ confinement policies when running virtual hosts in the webserver by using the
changehat abilities exposed through libapparmor.

%prep
%autosetup -p1 -n %{name}-%{version}~alpha2
%autosetup -p1 -n %{name}-%{version}

%build
export PYTHON=%{__python3}
Expand Down Expand Up @@ -270,7 +269,6 @@ make -C utils check
%{_bindir}/aa-features-abi
%{_sbindir}/aa-load
%{_sbindir}/aa-teardown
%{_sbindir}/rcapparmor
%{_unitdir}/apparmor.service
%{_presetdir}/70-apparmor.preset
%{_prefix}/lib/apparmor
Expand Down
3 changes: 2 additions & 1 deletion anda/lib/apparmor/update.rhai
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
let html = get("https://launchpad.net/apparmor");
let v = find("Latest version is ([\\d.]+)", html, 1);
let v = find("Latest version is ([\\d.\\w\\-]+)", html, 1);
v.replace('-', '~');
rpm.version(v);

0 comments on commit 60deebc

Please sign in to comment.