fix: rnote oxiping youki

terrapkg · Oct 30, 2023 · 0512091 · 0512091
1 parent a616822
commit 0512091
Show file tree

Hide file tree

Showing 4 changed files with 143 additions and 24 deletions.
diff --git a/anda/rust/oxipng/oxipng-fix-metadata-auto.diff b/anda/rust/oxipng/oxipng-fix-metadata-auto.diff
@@ -0,0 +1,25 @@
+--- oxipng-9.0.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ oxipng-9.0.0/Cargo.toml	2023-10-30T06:36:01.294365+00:00
+@@ -116,7 +116,6 @@
+ [features]
+ binary = [
+     "clap",
+-    "glob",
+     "env_logger",
+ ]
+ default = [
+@@ -133,13 +132,10 @@
+ ]
+ sanity-checks = ["image"]
+
+-[target."cfg(windows)".dependencies.glob]
+-version = "0.3.1"
+-optional = true
+-
+ [badges.maintenance]
+ status = "actively-developed"
+
+ [badges.travis-ci]
+ branch = "master"
+ repository = "shssoichiro/oxipng"
++
diff --git a/anda/rust/oxipng/rust-oxipng.spec b/anda/rust/oxipng/rust-oxipng.spec
@@ -1,34 +1,40 @@
-# Generated by rust2rpm 23
+# Generated by rust2rpm 25
 %bcond_without check
 
 %global crate oxipng
 
 Name:           rust-oxipng
 Version:        9.0.0
-Release:        1%{?dist}
+Release:        %autorelease
 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 rust-packaging >= 21
+BuildRequires:  anda-srpm-macros cargo-rpm-macros >= 24
 
 %global _description %{expand:
-Lossless PNG compression optimizer.}
+A 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
@@ -43,8 +49,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
@@ -83,6 +89,30 @@ 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
@@ -107,52 +137,52 @@ use the "freestanding" feature of the "%{crate}" crate.
 %files       -n %{name}+freestanding-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+parallel-devel
+%package     -n %{name}+image-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+parallel-devel %{_description}
+%description -n %{name}+image-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "parallel" feature of the "%{crate}" crate.
+use the "image" feature of the "%{crate}" crate.
 
-%files       -n %{name}+parallel-devel
+%files       -n %{name}+image-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+rayon-devel
+%package     -n %{name}+parallel-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+rayon-devel %{_description}
+%description -n %{name}+parallel-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "rayon" feature of the "%{crate}" crate.
+use the "parallel" feature of the "%{crate}" crate.
 
-%files       -n %{name}+rayon-devel
+%files       -n %{name}+parallel-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+stderrlog-devel
+%package     -n %{name}+rayon-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+stderrlog-devel %{_description}
+%description -n %{name}+rayon-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "stderrlog" feature of the "%{crate}" crate.
+use the "rayon" feature of the "%{crate}" crate.
 
-%files       -n %{name}+stderrlog-devel
+%files       -n %{name}+rayon-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+wild-devel
+%package     -n %{name}+sanity-checks-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+wild-devel %{_description}
+%description -n %{name}+sanity-checks-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "wild" feature of the "%{crate}" crate.
+use the "sanity-checks" feature of the "%{crate}" crate.
 
-%files       -n %{name}+wild-devel
+%files       -n %{name}+sanity-checks-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+zopfli-devel
@@ -168,11 +198,13 @@ use the "zopfli" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -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
@@ -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
+BuildRequires:  cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python desktop-file-utils
 BuildRequires:  pkgconfig(glib-2.0) >= 2.66
 BuildRequires:  pkgconfig(gtk4) >= 4.7
 BuildRequires:  pkgconfig(libadwaita-1) >= 1.2

diff --git a/anda/rust/youki/youki.spec b/anda/rust/youki/youki.spec
@@ -0,0 +1,62 @@
+Name:           youki
+Version:        0.3.0
+Release:        1%{?dist}
+Summary:        A container runtime written in Rust
+
+License:        Apache-2.0
+URL:            https://github.com/containers/youki
+Source0:        https://github.com/containers/youki/archive/refs/tags/v%{version}.tar.gz
+
+BuildRequires:  pkg-config
+BuildRequires:  rust-packaging
+BuildRequires:  anda-srpm-macros
+BuildRequires:  systemd-devel
+BuildRequires:  git-core
+BuildRequires:  dbus-devel
+BuildRequires:  libseccomp-devel
+BuildRequires:  elfutils-libelf-devel
+BuildRequires:  binutils
+BuildRequires:  fdupes
+
+%description
+youki is an implementation of the OCI runtime-spec in Rust, similar to runc.
+
+%prep
+%autosetup -n youki-%{version} -S git -v -p0
+
+git remote add origin https://github.com/containers/youki
+git fetch origin
+git checkout v%{version}
+
+# add host key for github
+# mkdir -p ~/.ssh
+# ssh-keyscan github.com >> ~/.ssh/known_hosts
+
+git submodule set-url integration_tests/oci-runtime-tests https://github.com/opencontainers/runtime-tools
+git submodule sync
+
+# download git submodules
+git submodule update --init --recursive
+
+%cargo_prep_online
+
+
+%build
+
+pushd crates/
+%cargo_build
+
+
+%install
+install -D -m 0755 target/release/youki %{buildroot}%{_bindir}/youki
+%fdupes docs/
+
+%files
+%license LICENSE
+%doc docs
+%{_bindir}/youki
+
+
+%changelog
+* Wed Oct 05 2022 Cappy Ishihara <[email protected]> - 0.0.5-1
+- Initial Release