SPECS/rust-ssh-key-dir.spec

@@ -5,10 +5,11 @@
 
 Name:           rust-%{crate}
 Version:        0.1.4
-Release:        8%{?dist}
+Release:        1%{?dist}
 Summary:        sshd AuthorizedKeysCommand to read ~/.ssh/authorized_keys.d
 
-License:        Apache-2.0
+# Upstream license specification: Apache-2.0
+License:        ASL 2.0
 URL:            https://crates.io/crates/ssh-key-dir
 Source0:        %{crates_source}
 # not used on Fedora
@@ -16,7 +17,7 @@ Source1:        https://github.com/coreos/%{crate}/releases/download/v%{version}
 
 ExclusiveArch:  %{rust_arches}
 
-%if 0%{?rhel}
+%if 0%{?rhel} && !0%{?eln}
 BuildRequires:  rust-toolset
 %else
 BuildRequires:  rust-packaging >= 21
@@ -29,10 +30,10 @@ sshd AuthorizedKeysCommand to read key files from ~/.ssh/authorized_keys.d.}
 
 %package     -n %{crate}
 Summary:        %{summary}
-# Apache-2.0 
+# ASL 2.0
 # MIT
-# Apache-2.0 OR MIT
-License:          (Apache-2.0 OR MIT) AND Apache-2.0 AND MIT
+# MIT or ASL 2.0
+License:          ASL 2.0 and MIT
 Requires:         openssh-server
 Requires(post):   openssh-server
 Requires(post):   systemd
@@ -45,10 +46,6 @@ Requires(postun): systemd
 %{_libexecdir}/ssh-key-dir
 %config(noreplace) %{_sysconfdir}/ssh/sshd_config.d/40-ssh-key-dir.conf
 %license LICENSE
-%license LICENSE.dependencies
-%if 0%{?rhel}
-%license cargo-vendor.txt
-%endif
 %doc README.md
 
 %post        -n %{crate}
@@ -60,28 +57,32 @@ if [ $1 == 0 ] ; then
 fi
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1 %{?rhel:-a1}
-%if 0%{?rhel}
-%cargo_prep -v vendor
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%if 0%{?rhel} && !0%{?eln}
+tar xvf %{SOURCE1}
+mkdir -p .cargo
+cat >.cargo/config << EOF
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
+EOF
 %else
 %cargo_prep
 %endif
 
-%if !0%{?rhel}
+
+%if !0%{?rhel} || 0%{?eln}
 %generate_buildrequires
 %cargo_generate_buildrequires
 %endif
 
 %build
 %cargo_build
-%cargo_license_summary
-%{cargo_license} > LICENSE.dependencies
-%if 0%{?rhel}
-%cargo_vendor_manifest
-%endif
 
 %install
-%if 0%{?rhel}
+%if 0%{?rhel} && !0%{?eln}
 %make_install INSTALL="install -p -c"
 %else
 %cargo_install
@@ -95,44 +96,17 @@ install -Dpm0644 -t %{buildroot}%{_sysconfdir}/ssh/sshd_config.d conf/40-ssh-key
 %endif
 
 %changelog
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.1.4-8
-- Bump release for June 2024 mass rebuild
-
-* Fri Feb 02 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 0.1.4-7
-- Update Rust macro usage
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Oct 24 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.1.4-5
-- Use vendored dependencies in ELN builds
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sun Feb 05 2023 Fabio Valentini <decathorpe@gmail.com> - 0.1.4-3
-- Rebuild for fixed frame pointer compiler flags in Rust RPM macros.
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
 * Fri Oct 14 2022 Steven Presti <spresti@redhat.com> - 0.1.4-1
 - New release
 - Regenerate with rust2rpm 22
 
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Feb 15 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.1.3-3
-- Rebuild with package notes
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+* Wed Mar 09 2022 Timothée Ravier <tim@siosm.fr> - 0.1.3-2
+- Remove Windows binaries from vendor tarball
 
 * Tue Jan 18 2022 Benjamin Gilbert <bgilbert@redhat.com> - 0.1.3-1
 - New release
 
-* Fri Jan 14 2022 Sohan Kunkerkar <skunkerk@redhat.com> - 0.1.2-9
+* Mon Jan 17 2022 Sohan Kunkerkar <skunkerk@redhat.com> - 0.1.2-9
 - Vendor rust dependencies on el9
 
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-8