diff --git a/anda/apps/flutter/anda.hcl b/anda/apps/flutter/anda.hcl new file mode 100644 index 0000000000..22fa8d01cb --- /dev/null +++ b/anda/apps/flutter/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "flutter.spec" + } +} diff --git a/anda/apps/flutter/flutter.spec b/anda/apps/flutter/flutter.spec new file mode 100644 index 0000000000..396b657197 --- /dev/null +++ b/anda/apps/flutter/flutter.spec @@ -0,0 +1,30 @@ +Name: flutter +Version: 3.13.9 +Release: 1%{?dist} +Summary: SDK for crafting beautiful, fast user experiences from a single codebase +License: BSD-3-Clause +URL: https://flutter.dev +Source0: https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_%version-stable.tar.xz +Requires: bash curl git file which zip xz-utils +Recommends: mesa-libGLU + +%description +Flutter transforms the app development process. Build, test, and deploy +beautiful mobile, web, desktop, and embedded apps from a single codebase. + +%prep +tar xf %SOURCE0 + +%build + +%install +mkdir -p %buildroot%_datadir %buildroot%_bindir +mv %name/ %buildroot%_datadir/ +ln -s %_datadir/%name/bin/%name %buildroot%_bindir/%name + +%files +%_bindir/%name +%_datadir/%name + +%changelog +%autochangelog diff --git a/anda/apps/flutter/update.rhai b/anda/apps/flutter/update.rhai new file mode 100644 index 0000000000..103ad474f3 --- /dev/null +++ b/anda/apps/flutter/update.rhai @@ -0,0 +1,2 @@ +let obj = get("https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json").json(); +rpm.version(obj.releases[0].version); diff --git a/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec b/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec index de6c273b00..b2dca03d69 100644 --- a/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec +++ b/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec @@ -19,7 +19,6 @@ BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(systemd) BuildRequires: intltool -BuildRequires: librda-devel %description The Ayatana Indicators project is the continuation of Application Indicators diff --git a/anda/indicators/ayatana-indicator-sound/ayatana-indicator-sound.spec b/anda/indicators/ayatana-indicator-sound/ayatana-indicator-sound.spec index e6dc89cfb1..39b0c32930 100644 --- a/anda/indicators/ayatana-indicator-sound/ayatana-indicator-sound.spec +++ b/anda/indicators/ayatana-indicator-sound/ayatana-indicator-sound.spec @@ -66,6 +66,7 @@ This package contains the development header files for %{name}. %{_datadir}/dbus-1/interfaces/org.ayatana.indicator.sound.AccountsService.xml %{_datadir}/glib-2.0/schemas/org.ayatana.indicator.sound.gschema.xml %{_datadir}/polkit-1/actions/org.ayatana.indicator.sound.AccountsService.policy +%{_datadir}/polkit-1/rules.d/50-org.ayatana.indicator.sound.AccountsService.rules %{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-org.ayatana.indicator.sound.AccountsService.pkla %changelog diff --git a/anda/lib/deviceinfo/deviceinfo.spec b/anda/lib/deviceinfo/deviceinfo.spec index 189306b0e7..cc1b3d7850 100644 --- a/anda/lib/deviceinfo/deviceinfo.spec +++ b/anda/lib/deviceinfo/deviceinfo.spec @@ -7,7 +7,7 @@ Version: 0.2.1 Release: %autorelease Summary: Library to detect and configure devices License: GPLv3+ -URL: %forgeurl +URL: https://gitlab.com/ubports/development/core/deviceinfo Source0: %{url}/-/archive/%commit/deviceinfo-%commit.tar.gz Source1: https://salsa.debian.org/ubports-team/deviceinfo/-/raw/master/debian/device-info.1 diff --git a/anda/lib/libunity-misc/libunity-misc.spec b/anda/lib/libunity-misc/libunity-misc.spec index 47dc2053f0..6398562321 100644 --- a/anda/lib/libunity-misc/libunity-misc.spec +++ b/anda/lib/libunity-misc/libunity-misc.spec @@ -16,6 +16,7 @@ BuildRequires: gtk-doc BuildRequires: libX11-devel BuildRequires: gtk3-devel BuildRequires: glib2-devel +Requires: libunity %description A simple library that implements a subset of the XPath spec to allow selecting @@ -44,11 +45,15 @@ NOCONFIGURE=1 \ %install %make_install rm -fv %{buildroot}%{_libdir}/lib*.la +# Is done for unity-shell and other Unity packages to build +ln -sf %{_libdir}/libunity/libunity-protocol-private.so.0.0.0 %{buildroot}%{_libdir}/libunity-protocol-private.so + %ldconfig_post %files %license COPYING COPYING.GPL COPYING.LGPL-2 %{_libdir}/libunity-misc.so.* +%{_libdir}/libunity-protocol-private.so %files devel %{_libdir}/libunity-misc.so diff --git a/anda/mock-configs/terra-mock-configs.spec b/anda/mock-configs/terra-mock-configs.spec index 3e4d02d420..ad5cff1d2a 100644 --- a/anda/mock-configs/terra-mock-configs.spec +++ b/anda/mock-configs/terra-mock-configs.spec @@ -1,10 +1,10 @@ Name: terra-mock-configs Version: 6 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Mock configs for Terra repos License: MIT -URL: https://terra.fyralabs.com +URL: http://terra.fyralabs.com Source0: terra.tpl Source1: terra-38-x86_64.cfg Source2: terra-38-aarch64.cfg @@ -19,12 +19,13 @@ Provides: anda-mock-configs = %{version}-%{release} Obsoletes: anda-mock-configs < 3-2%{?dist} %description -%{summary}. +%{summary} %prep %build + %install mkdir -p %{buildroot}%{_sysusersdir} mkdir -p %{buildroot}%{_sysconfdir}/mock/templates diff --git a/anda/others/katsu-systemd-sysusers-presets/anda.hcl b/anda/others/katsu-systemd-sysusers-presets/anda.hcl new file mode 100644 index 0000000000..9d6e4d9a58 --- /dev/null +++ b/anda/others/katsu-systemd-sysusers-presets/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "katsu-systemd-sysusers-presets.spec" + } +} diff --git a/anda/others/katsu-systemd-sysusers-presets/katsu-systemd-sysusers-presets.spec b/anda/others/katsu-systemd-sysusers-presets/katsu-systemd-sysusers-presets.spec new file mode 100644 index 0000000000..66dc5d69cb --- /dev/null +++ b/anda/others/katsu-systemd-sysusers-presets/katsu-systemd-sysusers-presets.spec @@ -0,0 +1,72 @@ +%define debug_package %nil + +Name: katsu-systemd-sysusers-presets +Version: 1.0 +Release: %autorelease +Summary: A set of systemd system user presets to supplement Fedora's defaults, used by Katsu +License: GPLv3+ +Source0: polkit.conf +Source1: rpcbind.conf +BuildRequires: systemd-rpm-macros +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + + +%description +A set of systemd system user presets to supplement Fedora's defaults, +Since for some packages, the system users are created using the package's +post-install script, this package is a no-op on its own. It is intended to be +used as a dependency for other packages that need to create system users. +For example, Polkit needs to create the polkitd system user, so this package +generates the polkitd system user for Polkit to use properly. + +Katsu uses this package to fix Fedora's default system user presets, which +fails to add the system users for Polkit and rpcbind. + +%package polkit +Summary: Polkit system user +Requires: rpcbind + +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + +Supplements: polkit + +%description polkit +Polkit system user preset + +%package rpcbind +Summary: RPC bind system user +Requires: rpcbind + +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + +Supplements: rpcbind + +%description rpcbind +RPC bind system user preset + +%prep + +%install +install -D %{SOURCE0} %{buildroot}%{_sysusersdir}/katsu-polkit.conf +install -D %{SOURCE1} %{buildroot}%{_sysusersdir}/katsu-rpcbind.conf + +%post polkit +systemd-sysusers %{_sysusersdir}/katsu-polkit.conf + +%post rpcbind +systemd-sysusers %{_sysusersdir}/katsu-rpcbind.conf + + +%files polkit +%{_sysusersdir}/katsu-polkit.conf +%files rpcbind +%{_sysusersdir}/katsu-rpcbind.conf + +%changelog +%autochangelog \ No newline at end of file diff --git a/anda/others/katsu-systemd-sysusers-presets/polkit.conf b/anda/others/katsu-systemd-sysusers-presets/polkit.conf new file mode 100644 index 0000000000..ae85edf105 --- /dev/null +++ b/anda/others/katsu-systemd-sysusers-presets/polkit.conf @@ -0,0 +1,2 @@ +g polkitd 114 +u polkitd 114:114 "User for polkitd" - - \ No newline at end of file diff --git a/anda/others/katsu-systemd-sysusers-presets/rpcbind.conf b/anda/others/katsu-systemd-sysusers-presets/rpcbind.conf new file mode 100644 index 0000000000..755a961397 --- /dev/null +++ b/anda/others/katsu-systemd-sysusers-presets/rpcbind.conf @@ -0,0 +1,2 @@ +g rpc 32 +u rpc 32:32 "Rpcbind Daemon" - - \ No newline at end of file diff --git a/anda/others/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service b/anda/others/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service index 2bb6ec3048..b2943dbf89 100644 --- a/anda/others/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service +++ b/anda/others/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service @@ -1,5 +1,7 @@ [Unit] Description=Forward com.system76.Scheduler session DBus messages to the system bus +StartLimitIntervalSec=60 +StartLimitBurst=5 [Service] ExecStart=/usr/local/bin/system76-scheduler-dbus-proxy.sh diff --git a/anda/others/kwin-system76-scheduler-integration/system76-scheduler-dbus-proxy.sh b/anda/others/kwin-system76-scheduler-integration/system76-scheduler-dbus-proxy.sh index e03e92726c..850f5612e8 100644 --- a/anda/others/kwin-system76-scheduler-integration/system76-scheduler-dbus-proxy.sh +++ b/anda/others/kwin-system76-scheduler-integration/system76-scheduler-dbus-proxy.sh @@ -1,11 +1,14 @@ #!/bin/bash + +set -euo pipefail + DBUS_SERVICE="com.system76.Scheduler" DBUS_PATH="/com/system76/Scheduler" DBUS_INTERFACE="com.system76.Scheduler" DBUS_METHOD="SetForegroundProcess" -dbus-monitor "destination=$DBUS_SERVICE,path=$DBUS_PATH,interface=$DBUS_INTERFACE,member=$DBUS_METHOD" | - while true; do - read method call time sender _ dest serial path interface member - read type pid - [ "$member" = "member=$DBUS_METHOD" ] && qdbus --system $DBUS_SERVICE $DBUS_PATH $DBUS_INTERFACE.$DBUS_METHOD $pid - done + +while true; do + read method call time sender _ dest serial path interface member + read type pid + [ "$member" = "member=$DBUS_METHOD" ] && qdbus --system $DBUS_SERVICE $DBUS_PATH $DBUS_INTERFACE.$DBUS_METHOD $pid +done < <(dbus-monitor "destination=$DBUS_SERVICE,path=$DBUS_PATH,interface=$DBUS_INTERFACE,member=$DBUS_METHOD") diff --git a/anda/others/rustdesk-selinux/anda.hcl b/anda/others/rustdesk-selinux/anda.hcl new file mode 100644 index 0000000000..3c34365df0 --- /dev/null +++ b/anda/others/rustdesk-selinux/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "rustdesk-selinux.spec" + } +} diff --git a/anda/others/rustdesk-selinux/rustdesk-selinux.spec b/anda/others/rustdesk-selinux/rustdesk-selinux.spec new file mode 100644 index 0000000000..d0d078b500 --- /dev/null +++ b/anda/others/rustdesk-selinux/rustdesk-selinux.spec @@ -0,0 +1,69 @@ +# vim: sw=4:ts=4:et +# Rustdesk will be added later, but for now this supplements the +# external rustdesk package + +%define relabel_files() \ +restorecon -R /usr/lib/rustdesk/rustdesk; \ + +%define selinux_policyver 38.28-1 + +Name: rustdesk-selinux +Version: 1.0 +Release: 1%{?dist} +Summary: SELinux policy module for rustdesk + +Group: System Environment/Base +License: GPLv2+ +URL: http://rustdesk.com +Source0: rustdesk.te + +Requires: policycoreutils, libselinux-utils +BuildRequires: policycoreutils, libselinux-utils, checkpolicy +Supplements: rustdesk +Enhances: rustdesk +Requires(post): selinux-policy-base >= %{selinux_policyver}, policycoreutils +Requires(postun): policycoreutils +BuildArch: noarch + +%description +This package installs and sets up the SELinux policy security module for rustdesk. + +%build +checkmodule -M -m -o rustdesk.mod %{SOURCE0} +semodule_package -o rustdesk.pp -m rustdesk.mod + + +%install +install -d %{buildroot}%{_datadir}/selinux/packages +install -m 644 rustdesk.pp %{buildroot}%{_datadir}/selinux/packages + + + +%post +semodule -n -i %{_datadir}/selinux/packages/rustdesk.pp +if /usr/sbin/selinuxenabled ; then + /usr/sbin/load_policy + %relabel_files + +fi; +exit 0 + +%postun +if [ $1 -eq 0 ]; then + semodule -n -r rustdesk + if /usr/sbin/selinuxenabled ; then + /usr/sbin/load_policy + %relabel_files + + fi; +fi; +exit 0 + +%files +%attr(0600,root,root) %{_datadir}/selinux/packages/rustdesk.pp + + +%changelog +* Sun Oct 1 2023 Cappy Ishihara 1.0-1 +- Initial version + diff --git a/anda/others/rustdesk-selinux/rustdesk.te b/anda/others/rustdesk-selinux/rustdesk.te new file mode 100644 index 0000000000..dc38a1f6dd --- /dev/null +++ b/anda/others/rustdesk-selinux/rustdesk.te @@ -0,0 +1,44 @@ +module rustdesk 1.0; + +require { + type xdm_t; + type sudo_exec_t; + type cache_home_t; + type chronyc_t; + type xserver_misc_device_t; + type xserver_t; + type chronyd_restricted_t; + type device_t; + type unreserved_port_t; + type xserver_port_t; + type event_device_t; + type init_t; + type speech_dispatcher_t; + class capability dac_override; + class dir create; + class unix_dgram_socket sendto; + class unix_stream_socket connectto; + class tcp_socket name_connect; + class chr_file { getattr open read write }; + class file execute; +} + +#============= chronyc_t ============== +allow chronyc_t chronyd_restricted_t:unix_dgram_socket sendto; + +#============= init_t ============== +allow init_t event_device_t:chr_file open; +allow init_t sudo_exec_t:file execute; + +#!!!! This avc can be allowed using the boolean 'nis_enabled' +allow init_t unreserved_port_t:tcp_socket name_connect; +allow init_t xserver_misc_device_t:chr_file { read write }; +allow init_t xserver_port_t:tcp_socket name_connect; +allow init_t xserver_t:unix_stream_socket connectto; + +#============= speech_dispatcher_t ============== +allow speech_dispatcher_t cache_home_t:dir create; +allow speech_dispatcher_t self:capability dac_override; + +#============= xdm_t ============== +allow xdm_t device_t:chr_file getattr; \ No newline at end of file diff --git a/anda/others/systemd-sysusers-presets/anda.hcl b/anda/others/systemd-sysusers-presets/anda.hcl new file mode 100644 index 0000000000..692859d141 --- /dev/null +++ b/anda/others/systemd-sysusers-presets/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "systemd-sysusers-presets.spec" + } +} diff --git a/anda/others/systemd-sysusers-presets/polkit.conf b/anda/others/systemd-sysusers-presets/polkit.conf new file mode 100644 index 0000000000..ae85edf105 --- /dev/null +++ b/anda/others/systemd-sysusers-presets/polkit.conf @@ -0,0 +1,2 @@ +g polkitd 114 +u polkitd 114:114 "User for polkitd" - - \ No newline at end of file diff --git a/anda/others/systemd-sysusers-presets/rpcbind.conf b/anda/others/systemd-sysusers-presets/rpcbind.conf new file mode 100644 index 0000000000..755a961397 --- /dev/null +++ b/anda/others/systemd-sysusers-presets/rpcbind.conf @@ -0,0 +1,2 @@ +g rpc 32 +u rpc 32:32 "Rpcbind Daemon" - - \ No newline at end of file diff --git a/anda/others/systemd-sysusers-presets/systemd-sysusers-presets.spec b/anda/others/systemd-sysusers-presets/systemd-sysusers-presets.spec new file mode 100644 index 0000000000..c1be440b25 --- /dev/null +++ b/anda/others/systemd-sysusers-presets/systemd-sysusers-presets.spec @@ -0,0 +1,59 @@ +%define debug_package %nil + +Name: systemd-sysusers-presets +Version: 1.0 +Release: %autorelease +Summary: A set of systemd system user presets to supplement Fedora's defaults +License: GPLv3+ +Source0: polkit.conf +Source1: rpcbind.conf +BuildRequires: systemd-rpm-macros +%systemd_requires + + +%description +A set of systemd system user presets to supplement Fedora's defaults, +Since for some packages, the system users are created using the package's +post-install script, this package is a no-op on its own. It is intended to be +used as a dependency for other packages that need to create system users. +For example, Polkit needs to create the polkitd system user, so this package +generates the polkitd system user for Polkit to use properly. + +%package polkit +Summary: Polkit system user +Requires: rpcbind +%systemd_requires +Supplements: polkit + +%description polkit +Polkit system user preset + +%package rpcbind +Summary: RPC bind system user +Requires: rpcbind +%systemd_requires +Supplements: rpcbind + +%description rpcbind +RPC bind system user preset + +%prep + +%install +install -D %{SOURCE0} %{buildroot}%{_sysusersdir}/polkit.conf +install -D %{SOURCE1} %{buildroot}%{_sysusersdir}/rpcbind.conf + +%post polkit +systemd-sysusers %{_sysusersdir}/polkit.conf + +%post rpcbind +systemd-sysusers %{_sysusersdir}/rpcbind.conf + + +%files polkit +%{_sysusersdir}/polkit.conf +%files rpcbind +%{_sysusersdir}/rpcbind.conf + +%changelog +%autochangelog \ No newline at end of file diff --git a/anda/python/ruff/python3-ruff.spec b/anda/python/ruff/python3-ruff.spec index 3e2a2d6ff9..ebd632ebf2 100644 --- a/anda/python/ruff/python3-ruff.spec +++ b/anda/python/ruff/python3-ruff.spec @@ -21,7 +21,7 @@ integrating more functionality behind a single, common interface. maturin build --release --strip --locked --all-features %install -python3 -m installer --destdir="%{buildroot}" target/wheels/*.whl +python3.11 -m installer --destdir="%{buildroot}" target/wheels/*.whl rm -rf %{python3_sitelib}/ruff/__pycache__ %files diff --git a/anda/rust/bandwhich/bandwhich-fix-metadata-auto.diff b/anda/rust/bandwhich/bandwhich-fix-metadata-auto.diff index 60d3c3b77a..f9fdd38559 100644 --- a/anda/rust/bandwhich/bandwhich-fix-metadata-auto.diff +++ b/anda/rust/bandwhich/bandwhich-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- bandwhich-0.21.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ bandwhich-0.21.1/Cargo.toml 2023-10-30T06:12:20.956389+00:00 -@@ -119,17 +119,3 @@ +--- bandwhich-0.21.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ bandwhich-0.21.0/Cargo.toml 2023-09-21T07:50:16.506970+00:00 +@@ -104,17 +104,3 @@ [target."cfg(target_os=\"linux\")".dependencies.procfs] version = "0.15.1" @@ -14,7 +14,7 @@ -version = "1.0.75" - -[target."cfg(target_os=\"windows\")".build-dependencies.http_req] --version = "0.10.0" +-version = "0.9.3" - -[target."cfg(target_os=\"windows\")".build-dependencies.zip] -version = "0.6.6" diff --git a/anda/rust/bandwhich/rust-bandwhich.spec b/anda/rust/bandwhich/rust-bandwhich.spec index 62599af63c..d544953d23 100644 --- a/anda/rust/bandwhich/rust-bandwhich.spec +++ b/anda/rust/bandwhich/rust-bandwhich.spec @@ -1,20 +1,20 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 24 #bcond_without check %global crate bandwhich Name: rust-bandwhich Version: 0.21.1 -Release: %autorelease +Release: 1%{?dist} Summary: Display current network utilization by process, connection and remote IP/hostname License: MIT URL: https://crates.io/crates/bandwhich Source: %{crates_source} -# Automatically generated patch to strip dependencies and normalize metadata +# Automatically generated patch to strip foreign dependencies Patch: bandwhich-fix-metadata-auto.diff -BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24 +BuildRequires: anda-srpm-macros rust-packaging >= 23 %global _description %{expand: Display current network utilization by process, connection and remote @@ -38,7 +38,7 @@ License: MIT %{_bindir}/bandwhich %prep -%autosetup -n %{crate}-%{version} -p1 +%autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep_online %build @@ -48,6 +48,7 @@ License: MIT %install %cargo_install +rm %{buildroot}/.cargo -rf %if %{with check} %check diff --git a/anda/rust/oxipng/rust-oxipng.spec b/anda/rust/oxipng/rust-oxipng.spec index 69cad369cb..a89e886618 100644 --- a/anda/rust/oxipng/rust-oxipng.spec +++ b/anda/rust/oxipng/rust-oxipng.spec @@ -1,40 +1,34 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 23 %bcond_without check %global crate oxipng Name: rust-oxipng Version: 9.0.0 -Release: %autorelease +Release: 1%{?dist} Summary: Lossless PNG compression optimizer License: MIT URL: https://crates.io/crates/oxipng Source: %{crates_source} -# Automatically generated patch to strip dependencies and normalize metadata -Patch: oxipng-fix-metadata-auto.diff -BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24 +BuildRequires: anda-srpm-macros rust-packaging >= 21 %global _description %{expand: -A lossless PNG compression optimizer.} +Lossless PNG compression optimizer.} %description %{_description} %package -n %{crate} Summary: %{summary} -# FIXME: paste output of %%cargo_license_summary here -License: # FIXME -# LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} %files -n %{crate} %license LICENSE -%license LICENSE.dependencies %doc CHANGELOG.md -%doc MANUAL.txt %doc README.md +%doc README.template.md %{_bindir}/oxipng %package devel @@ -49,8 +43,8 @@ use the "%{crate}" crate. %files devel %license %{crate_instdir}/LICENSE %doc %{crate_instdir}/CHANGELOG.md -%doc %{crate_instdir}/MANUAL.txt %doc %{crate_instdir}/README.md +%doc %{crate_instdir}/README.template.md %{crate_instdir}/ %package -n %{name}+default-devel @@ -89,30 +83,6 @@ use the "clap" feature of the "%{crate}" crate. %files -n %{name}+clap-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+crossbeam-channel-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+crossbeam-channel-devel %{_description} - -This package contains library source intended for building other packages which -use the "crossbeam-channel" feature of the "%{crate}" crate. - -%files -n %{name}+crossbeam-channel-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+env_logger-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+env_logger-devel %{_description} - -This package contains library source intended for building other packages which -use the "env_logger" feature of the "%{crate}" crate. - -%files -n %{name}+env_logger-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+filetime-devel Summary: %{summary} BuildArch: noarch @@ -137,18 +107,6 @@ use the "freestanding" feature of the "%{crate}" crate. %files -n %{name}+freestanding-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+image-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+image-devel %{_description} - -This package contains library source intended for building other packages which -use the "image" feature of the "%{crate}" crate. - -%files -n %{name}+image-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+parallel-devel Summary: %{summary} BuildArch: noarch @@ -173,16 +131,28 @@ use the "rayon" feature of the "%{crate}" crate. %files -n %{name}+rayon-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+sanity-checks-devel +%package -n %{name}+stderrlog-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+sanity-checks-devel %{_description} +%description -n %{name}+stderrlog-devel %{_description} This package contains library source intended for building other packages which -use the "sanity-checks" feature of the "%{crate}" crate. +use the "stderrlog" feature of the "%{crate}" crate. -%files -n %{name}+sanity-checks-devel +%files -n %{name}+stderrlog-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+wild-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+wild-devel %{_description} + +This package contains library source intended for building other packages which +use the "wild" feature of the "%{crate}" crate. + +%files -n %{name}+wild-devel %ghost %{crate_instdir}/Cargo.toml %package -n %{name}+zopfli-devel @@ -198,13 +168,11 @@ use the "zopfli" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version} -p1 +%autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep_online %build %cargo_build -%{cargo_license_summary} -%{cargo_license} > LICENSE.dependencies %install %cargo_install diff --git a/anda/rust/rnote/rnote.spec b/anda/rust/rnote/rnote.spec index 931048f3a3..e5cf1ff61a 100644 --- a/anda/rust/rnote/rnote.spec +++ b/anda/rust/rnote/rnote.spec @@ -6,7 +6,7 @@ License: GPL-3.0 URL: https://github.com/flxzt/rnote Source0: %{url}/archive/refs/tags/v%version.tar.gz Requires: gtk4 -BuildRequires: cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python desktop-file-utils +BuildRequires: cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python BuildRequires: pkgconfig(glib-2.0) >= 2.66 BuildRequires: pkgconfig(gtk4) >= 4.7 BuildRequires: pkgconfig(libadwaita-1) >= 1.2 diff --git a/anda/rust/youki/anda.hcl b/anda/rust/youki/anda.hcl index 57d84ec6d5..400560e42f 100644 --- a/anda/rust/youki/anda.hcl +++ b/anda/rust/youki/anda.hcl @@ -1,6 +1,6 @@ project pkg { rpm { - spec = "rust-youki.spec" + spec = "youki.spec" // enable_scm = true diff --git a/anda/rust/youki/update.rhai b/anda/rust/youki/update.rhai index 628c1b1619..1a65ed0082 100644 --- a/anda/rust/youki/update.rhai +++ b/anda/rust/youki/update.rhai @@ -1 +1 @@ -rpm.version(crates("youki")); +rpm.version(gh("containers/youki")); diff --git a/anda/tools/katsu/anda.hcl b/anda/tools/katsu/anda.hcl new file mode 100644 index 0000000000..ff74f78759 --- /dev/null +++ b/anda/tools/katsu/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "katsu.spec" + } +} diff --git a/anda/tools/katsu/katsu.spec b/anda/tools/katsu/katsu.spec new file mode 100644 index 0000000000..528be7b0c1 --- /dev/null +++ b/anda/tools/katsu/katsu.spec @@ -0,0 +1,37 @@ +%define debug_package %nil + +Name: katsu +Version: 0.1.3 +Release: 1%{?dist} +Summary: The vicious image builder +License: MIT +URL: https://github.com/FyraLabs/katsu +Source0: %url/archive/refs/tags/%version.tar.gz +Requires: xorriso dracut limine grub2 systemd-devel squashfs-tools +Requires: dracut-live dracut-config-generic dracut-config-rescue grub2-tools-extra dracut-squash +BuildRequires: cargo rust-packaging pkgconfig(libudev) clang-devel + +%description +Katsu is a tool for building bootable images from RPM based systems. +It is an alternative to Lennart Poettering's mkosi tool, designed to be robust, +fast, and easy to use while still providing many output formats. + +%prep +%autosetup + +%build +%(echo "%{cargo_build}" | sed "s@--profile rpm@--profile release@g" | sed "s@-j @@") + +%install +export CARGO_INSTALL_ROOT=%buildroot%_prefix +cargo install --path . +rm %buildroot%_prefix/.crates.toml %buildroot%_prefix/.crates2.json + +%files +%doc README.md +%license LICENSE +%_bindir/katsu + + +%changelog +%autochangelog diff --git a/anda/tools/katsu/update.rhai b/anda/tools/katsu/update.rhai new file mode 100644 index 0000000000..e56bef8eeb --- /dev/null +++ b/anda/tools/katsu/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("FyraLabs/katsu"));