The package rpms/rust-libssh2-sys.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-libssh2-sys.git/commit/?id=508….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 508462f71dadb177078b7c6375021b51496b16f8
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon May 22 22:50:23 2023 +0200
Regenerate with rust2rpm v24 and add missing license files
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
new file mode 100644
index 0000000..16fe87b
--- /dev/null
+++ b/LICENSE-APACHE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/LICENSE-MIT b/LICENSE-MIT
new file mode 100644
index 0000000..39e0ed6
--- /dev/null
+++ b/LICENSE-MIT
@@ -0,0 +1,25 @@
+Copyright (c) 2014 Alex Crichton
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100644
index bf68d43..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-libssh2-sys
-
-The rust-libssh2-sys package
\ No newline at end of file
diff --git a/libssh2-sys-fix-metadata-auto.diff b/libssh2-sys-fix-metadata-auto.diff
new file mode 100644
index 0000000..c863000
--- /dev/null
+++ b/libssh2-sys-fix-metadata-auto.diff
@@ -0,0 +1,18 @@
+--- libssh2-sys-0.2.23/Cargo.toml 1970-01-01T00:00:01+00:00
++++ libssh2-sys-0.2.23/Cargo.toml 2023-05-22T20:34:08.770958+00:00
+@@ -38,13 +38,8 @@
+ version = "0.3.11"
+
+ [features]
+-openssl-on-win32 = ["openssl-sys"]
+-vendored-openssl = ["openssl-sys/vendored"]
++openssl-on-win32 = []
++vendored-openssl = []
+ zlib-ng-compat = ["libz-sys/zlib-ng"]
+-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
+-version = "0.2"
+ [target."cfg(unix)".dependencies.openssl-sys]
+ version = "0.9.35"
+-[target."cfg(windows)".dependencies.openssl-sys]
+-version = "0.9.35"
+-optional = true
diff --git a/libssh2-sys-fix-metadata.diff b/libssh2-sys-fix-metadata.diff
index 7945a23..b9f628c 100644
--- a/libssh2-sys-fix-metadata.diff
+++ b/libssh2-sys-fix-metadata.diff
@@ -1,17 +1,12 @@
--- libssh2-sys-0.2.23/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ libssh2-sys-0.2.23/Cargo.toml 2021-11-07T14:24:05.879323+00:00
-@@ -37,14 +37,5 @@
++++ libssh2-sys-0.2.23/Cargo.toml 2023-05-22T20:34:14.292984+00:00
+@@ -37,9 +37,5 @@
[build-dependencies.pkg-config]
version = "0.3.11"
-[features]
--openssl-on-win32 = ["openssl-sys"]
--vendored-openssl = ["openssl-sys/vendored"]
+-openssl-on-win32 = []
+-vendored-openssl = []
-zlib-ng-compat = ["libz-sys/zlib-ng"]
--[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
--version = "0.2"
[target."cfg(unix)".dependencies.openssl-sys]
version = "0.9.35"
--[target."cfg(windows)".dependencies.openssl-sys]
--version = "0.9.35"
--optional = true
diff --git a/rust-libssh2-sys.spec b/rust-libssh2-sys.spec
index 7914115..9c9758a 100644
--- a/rust-libssh2-sys.spec
+++ b/rust-libssh2-sys.spec
@@ -1,33 +1,32 @@
-# Generated by rust2rpm 18
+# Generated by rust2rpm 24
%bcond_without check
%global debug_package %{nil}
%global crate libssh2-sys
-Name: rust-%{crate}
+Name: rust-libssh2-sys
Version: 0.2.23
Release: %autorelease
Summary: Native bindings to the libssh2 library
# Upstream license specification: MIT/Apache-2.0
-# https://github.com/alexcrichton/ssh2-rs/issues/75
-License: MIT or ASL 2.0
+License: MIT OR Apache-2.0
URL: https://crates.io/crates/libssh2-sys
-Source: %{crates_source}
-# Initial patched metadata
+Source0: %{crates_source}
+# https://github.com/alexcrichton/ssh2-rs/issues/289
+Source1: https://github.com/alexcrichton/ssh2-rs/raw/libssh2-sys-0.2.23/LICENSE-APAC…
+Source2: https://github.com/alexcrichton/ssh2-rs/raw/libssh2-sys-0.2.23/LICENSE-MIT
+# Automatically generated patch to strip foreign dependencies
+Patch: libssh2-sys-fix-metadata-auto.diff
+# Manually created patch for downstream crate metadata changes
# * drop windows-specific dependencies and features
# * drop dependency and feature for unused zlib-ng support
# * drop feature for vendored OpenSSL sources
-Patch0: libssh2-sys-fix-metadata.diff
-# Doesn't seem to be upstreamable
-Patch1: 0001-build.rs-always-use-pkg-config.patch
+Patch: libssh2-sys-fix-metadata.diff
+# * unconditionally link against system libssh2 with pkg-config
+Patch: 0001-build.rs-always-use-pkg-config.patch
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Native bindings to the libssh2 library.}
@@ -41,11 +40,13 @@ Requires: pkgconfig(libssh2)
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -53,18 +54,18 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
-# No bundled deps
-rm -vrf libssh2/
-find -type f -perm /111 -exec chmod -c -x '{}' '+'
+# remove bundled copy of libssh2 sources
+rm -rv libssh2/
%cargo_prep
+cp -pav %{SOURCE1} %{SOURCE2} .
%generate_buildrequires
%cargo_generate_buildrequires
diff --git a/.rust2rpm.conf b/rust2rpm.conf
similarity index 100%
rename from .rust2rpm.conf
rename to rust2rpm.conf
commit fa083b055d59cfd9e237605bce956999f188ce7b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 23:46:31 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
The package rpms/rust-libssh2-sys.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-libssh2-sys.git/commit/?id=508….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 508462f71dadb177078b7c6375021b51496b16f8
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon May 22 22:50:23 2023 +0200
Regenerate with rust2rpm v24 and add missing license files
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
new file mode 100644
index 0000000..16fe87b
--- /dev/null
+++ b/LICENSE-APACHE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/LICENSE-MIT b/LICENSE-MIT
new file mode 100644
index 0000000..39e0ed6
--- /dev/null
+++ b/LICENSE-MIT
@@ -0,0 +1,25 @@
+Copyright (c) 2014 Alex Crichton
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100644
index bf68d43..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-libssh2-sys
-
-The rust-libssh2-sys package
\ No newline at end of file
diff --git a/libssh2-sys-fix-metadata-auto.diff b/libssh2-sys-fix-metadata-auto.diff
new file mode 100644
index 0000000..c863000
--- /dev/null
+++ b/libssh2-sys-fix-metadata-auto.diff
@@ -0,0 +1,18 @@
+--- libssh2-sys-0.2.23/Cargo.toml 1970-01-01T00:00:01+00:00
++++ libssh2-sys-0.2.23/Cargo.toml 2023-05-22T20:34:08.770958+00:00
+@@ -38,13 +38,8 @@
+ version = "0.3.11"
+
+ [features]
+-openssl-on-win32 = ["openssl-sys"]
+-vendored-openssl = ["openssl-sys/vendored"]
++openssl-on-win32 = []
++vendored-openssl = []
+ zlib-ng-compat = ["libz-sys/zlib-ng"]
+-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
+-version = "0.2"
+ [target."cfg(unix)".dependencies.openssl-sys]
+ version = "0.9.35"
+-[target."cfg(windows)".dependencies.openssl-sys]
+-version = "0.9.35"
+-optional = true
diff --git a/libssh2-sys-fix-metadata.diff b/libssh2-sys-fix-metadata.diff
index 7945a23..b9f628c 100644
--- a/libssh2-sys-fix-metadata.diff
+++ b/libssh2-sys-fix-metadata.diff
@@ -1,17 +1,12 @@
--- libssh2-sys-0.2.23/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ libssh2-sys-0.2.23/Cargo.toml 2021-11-07T14:24:05.879323+00:00
-@@ -37,14 +37,5 @@
++++ libssh2-sys-0.2.23/Cargo.toml 2023-05-22T20:34:14.292984+00:00
+@@ -37,9 +37,5 @@
[build-dependencies.pkg-config]
version = "0.3.11"
-[features]
--openssl-on-win32 = ["openssl-sys"]
--vendored-openssl = ["openssl-sys/vendored"]
+-openssl-on-win32 = []
+-vendored-openssl = []
-zlib-ng-compat = ["libz-sys/zlib-ng"]
--[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
--version = "0.2"
[target."cfg(unix)".dependencies.openssl-sys]
version = "0.9.35"
--[target."cfg(windows)".dependencies.openssl-sys]
--version = "0.9.35"
--optional = true
diff --git a/rust-libssh2-sys.spec b/rust-libssh2-sys.spec
index 7914115..9c9758a 100644
--- a/rust-libssh2-sys.spec
+++ b/rust-libssh2-sys.spec
@@ -1,33 +1,32 @@
-# Generated by rust2rpm 18
+# Generated by rust2rpm 24
%bcond_without check
%global debug_package %{nil}
%global crate libssh2-sys
-Name: rust-%{crate}
+Name: rust-libssh2-sys
Version: 0.2.23
Release: %autorelease
Summary: Native bindings to the libssh2 library
# Upstream license specification: MIT/Apache-2.0
-# https://github.com/alexcrichton/ssh2-rs/issues/75
-License: MIT or ASL 2.0
+License: MIT OR Apache-2.0
URL: https://crates.io/crates/libssh2-sys
-Source: %{crates_source}
-# Initial patched metadata
+Source0: %{crates_source}
+# https://github.com/alexcrichton/ssh2-rs/issues/289
+Source1: https://github.com/alexcrichton/ssh2-rs/raw/libssh2-sys-0.2.23/LICENSE-APAC…
+Source2: https://github.com/alexcrichton/ssh2-rs/raw/libssh2-sys-0.2.23/LICENSE-MIT
+# Automatically generated patch to strip foreign dependencies
+Patch: libssh2-sys-fix-metadata-auto.diff
+# Manually created patch for downstream crate metadata changes
# * drop windows-specific dependencies and features
# * drop dependency and feature for unused zlib-ng support
# * drop feature for vendored OpenSSL sources
-Patch0: libssh2-sys-fix-metadata.diff
-# Doesn't seem to be upstreamable
-Patch1: 0001-build.rs-always-use-pkg-config.patch
+Patch: libssh2-sys-fix-metadata.diff
+# * unconditionally link against system libssh2 with pkg-config
+Patch: 0001-build.rs-always-use-pkg-config.patch
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Native bindings to the libssh2 library.}
@@ -41,11 +40,13 @@ Requires: pkgconfig(libssh2)
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -53,18 +54,18 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
-# No bundled deps
-rm -vrf libssh2/
-find -type f -perm /111 -exec chmod -c -x '{}' '+'
+# remove bundled copy of libssh2 sources
+rm -rv libssh2/
%cargo_prep
+cp -pav %{SOURCE1} %{SOURCE2} .
%generate_buildrequires
%cargo_generate_buildrequires
diff --git a/.rust2rpm.conf b/rust2rpm.conf
similarity index 100%
rename from .rust2rpm.conf
rename to rust2rpm.conf
The package rpms/rust-Inflector.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-Inflector.git/commit/?id=69c9c….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 69c9cc4d901628c6fced9cab516f7e218e5c22f4
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon May 22 20:53:11 2023 +0200
Regenerate with rust2rpm v24 and add missing license file
diff --git a/Inflector-fix-metadata.diff b/Inflector-fix-metadata.diff
new file mode 100644
index 0000000..99c464f
--- /dev/null
+++ b/Inflector-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- Inflector-0.11.4/Cargo.toml 1970-01-01T00:00:00+00:00
++++ Inflector-0.11.4/Cargo.toml 2023-05-22T18:43:29.948523+00:00
+@@ -14,7 +14,7 @@
+ name = "Inflector"
+ version = "0.11.4"
+ authors = ["Josh Teeter<joshteeter(a)gmail.com>"]
+-include = ["**/*.rs", "Cargo.toml", "README.md"]
++include = ["**/*.rs", "Cargo.toml", "README.md", "LICENSE.md"]
+ description = "Adds String based inflections for Rust. Snake, kebab, camel, sentence, class, title and table cases as well as ordinalize, deordinalize, demodulize, foreign key, and pluralize/singularize are supported as both traits and pure functions acting on String types.\n"
+ homepage = "https://github.com/whatisinternet/inflector"
+ documentation = "https://docs.rs/Inflector"
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..937b1bd
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,22 @@
+Copyright 2017 Josh Teeter
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
deleted file mode 100644
index 7b6c059..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-Inflector
-
-String based inflections for Rust
\ No newline at end of file
diff --git a/rust-Inflector.spec b/rust-Inflector.spec
index aeafc2e..ad208d6 100644
--- a/rust-Inflector.spec
+++ b/rust-Inflector.spec
@@ -1,31 +1,29 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 24
%bcond_without check
%global debug_package %{nil}
%global crate Inflector
-Name: rust-%{crate}
+Name: rust-Inflector
Version: 0.11.4
Release: %autorelease
Summary: Adds String based inflections for Rust
-# Upstream license specification: BSD-2-Clause
-License: BSD
+License: BSD-2-Clause
URL: https://crates.io/crates/Inflector
-Source: %{crates_source}
+Source0: %{crates_source}
+Source1: https://github.com/whatisinternet/Inflector/raw/0.11.3/LICENSE.md
+# Manually created patch for downstream crate metadata changes
+# * include license text in the list of installed files
+Patch: Inflector-fix-metadata.diff
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
-Adds String based inflections for Rust. Snake, kebab, camel, sentence, class,
-title and table cases as well as ordinalize, deordinalize, demodulize, foreign
-key, and pluralize/singularize are supported as both traits and pure functions
-acting on String types.}
+Adds String based inflections for Rust. Snake, kebab, camel, sentence,
+class, title and table cases as well as ordinalize, deordinalize,
+demodulize, foreign key, and pluralize/singularize are supported as both
+traits and pure functions acting on String types.}
%description %{_description}
@@ -35,12 +33,13 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -48,11 +47,11 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+heavyweight-devel
Summary: %{summary}
@@ -60,11 +59,11 @@ BuildArch: noarch
%description -n %{name}+heavyweight-devel %{_description}
-This package contains library source intended for building other packages
-which use "heavyweight" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "heavyweight" feature of the "%{crate}" crate.
%files -n %{name}+heavyweight-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+lazy_static-devel
Summary: %{summary}
@@ -72,11 +71,11 @@ BuildArch: noarch
%description -n %{name}+lazy_static-devel %{_description}
-This package contains library source intended for building other packages
-which use "lazy_static" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "lazy_static" feature of the "%{crate}" crate.
%files -n %{name}+lazy_static-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+regex-devel
Summary: %{summary}
@@ -84,11 +83,11 @@ BuildArch: noarch
%description -n %{name}+regex-devel %{_description}
-This package contains library source intended for building other packages
-which use "regex" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "regex" feature of the "%{crate}" crate.
%files -n %{name}+regex-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+unstable-devel
Summary: %{summary}
@@ -96,15 +95,16 @@ BuildArch: noarch
%description -n %{name}+unstable-devel %{_description}
-This package contains library source intended for building other packages
-which use "unstable" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "unstable" feature of the "%{crate}" crate.
%files -n %{name}+unstable-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
+cp -pav %{SOURCE1} .
%generate_buildrequires
%cargo_generate_buildrequires
commit 3693b6a90dbc5de29fa126a34037814f2fb06084
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon May 22 20:40:37 2023 +0200
Convert to %autorelease and %autochangelog
[skip changelog]
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..362eff7
--- /dev/null
+++ b/changelog
@@ -0,0 +1,14 @@
+* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jun 02 12:12:19 CEST 2021 Christian Heimes <cheimes(a)redhat.com> - 0.11.4-1
+- Initial package
diff --git a/rust-Inflector.spec b/rust-Inflector.spec
index ce6fa4f..aeafc2e 100644
--- a/rust-Inflector.spec
+++ b/rust-Inflector.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.11.4
-Release: 5%{?dist}
+Release: %autorelease
Summary: Adds String based inflections for Rust
# Upstream license specification: BSD-2-Clause
@@ -121,17 +121,4 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
-* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jun 02 12:12:19 CEST 2021 Christian Heimes <cheimes(a)redhat.com> - 0.11.4-1
-- Initial package
+%autochangelog
commit 668e2544983d1ba8f08f27a20b332506908e62de
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 21:24:43 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-Inflector.spec b/rust-Inflector.spec
index 5038fca..ce6fa4f 100644
--- a/rust-Inflector.spec
+++ b/rust-Inflector.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.11.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Adds String based inflections for Rust
# Upstream license specification: BSD-2-Clause
@@ -121,6 +121,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
The package rpms/rust-matrixcompare-mock.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-matrixcompare-mock.git/commit/….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 4dc4b487ffa00697b752cc4b55cf98201a0a5c5f
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon May 22 19:55:14 2023 +0200
Regenerate with rust2rpm v24 and add missing license file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e8a206f
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019-2020 Andreas Borgen Longva
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100644
index 4796ae0..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-matrixcompare-mock
-
-The rust-matrixcompare-mock package
diff --git a/rust-matrixcompare-mock.spec b/rust-matrixcompare-mock.spec
index 57e44b8..d1211b9 100644
--- a/rust-matrixcompare-mock.spec
+++ b/rust-matrixcompare-mock.spec
@@ -1,26 +1,21 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 24
%bcond_without check
%global debug_package %{nil}
%global crate matrixcompare-mock
-Name: rust-%{crate}
+Name: rust-matrixcompare-mock
Version: 0.1.0
Release: %autorelease
Summary: Internal mock data structures for testing of matrixcompare
-# Upstream license specification: MIT
-# https://github.com/Andlon/matrixcompare/issues/8
License: MIT
URL: https://crates.io/crates/matrixcompare-mock
-Source: %{crates_source}
-
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
+Source0: %{crates_source}
+# https://github.com/Andlon/matrixcompare/issues/8
+Source1: https://github.com/Andlon/matrixcompare/raw/57a66bd/LICENSE
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Internal mock data structures for testing of matrixcompare.}
@@ -33,11 +28,12 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -45,15 +41,16 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
+cp -pav %{SOURCE1} .
%generate_buildrequires
%cargo_generate_buildrequires
commit 65ffc8a4d4ae862555a5fd7d2ca9dc5124d8fa29
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 23:54:33 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
The package rpms/rust-enum-iterator-derive.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-enum-iterator-derive.git/commi….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit e74dd96163a3229459fa52249ad1dd46d48e2e3d
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon May 22 20:30:22 2023 +0200
Regenerate with rust2rpm v24 and add missing license file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..fcf3d7a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,19 @@
+Copyright 2018 Stephane Raux
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100644
index bc611a7..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-enum-iterator-derive
-
-The rust-enum-iterator-derive package
diff --git a/rust-enum-iterator-derive.spec b/rust-enum-iterator-derive.spec
index ed23f1f..bcb93e0 100644
--- a/rust-enum-iterator-derive.spec
+++ b/rust-enum-iterator-derive.spec
@@ -1,25 +1,20 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 24
%bcond_without check
%global debug_package %{nil}
%global crate enum-iterator-derive
-Name: rust-%{crate}
+Name: rust-enum-iterator-derive
Version: 0.6.0
Release: %autorelease
Summary: Procedural macro to iterate over the variants of a field-less enum
-# Upstream license specification: MIT
License: MIT
URL: https://crates.io/crates/enum-iterator-derive
-Source: %{crates_source}
+Source0: %{crates_source}
+Source1: https://github.com/stephaneyfx/enum-iterator/raw/0.6.0/LICENSE
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Procedural macro to iterate over the variants of a field-less enum.}
@@ -32,11 +27,12 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -44,15 +40,16 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
+cp -pav %{SOURCE1} .
%generate_buildrequires
%cargo_generate_buildrequires
commit c482f95e4748afad315a2bac715a628abb31a0e6
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon May 22 20:28:44 2023 +0200
Convert to %autorelease and %autochangelog
[skip changelog]
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..7bc00e0
--- /dev/null
+++ b/changelog
@@ -0,0 +1,15 @@
+* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.0-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jun 24 2021 Davide Cavalca <dcavalca(a)fedoraproject.org> - 0.6.0-1
+- Initial package
diff --git a/rust-enum-iterator-derive.spec b/rust-enum-iterator-derive.spec
index 8c3f2bb..ed23f1f 100644
--- a/rust-enum-iterator-derive.spec
+++ b/rust-enum-iterator-derive.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.6.0
-Release: 5%{?dist}
+Release: %autorelease
Summary: Procedural macro to iterate over the variants of a field-less enum
# Upstream license specification: MIT
@@ -69,18 +69,4 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
-* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.0-2
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jun 24 2021 Davide Cavalca <dcavalca(a)fedoraproject.org> - 0.6.0-1
-- Initial package
+%autochangelog
commit 424937abbac7daaab7ffca9a0defbaa0b2078bd1
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 22:41:15 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-enum-iterator-derive.spec b/rust-enum-iterator-derive.spec
index 0c1a998..8c3f2bb 100644
--- a/rust-enum-iterator-derive.spec
+++ b/rust-enum-iterator-derive.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Procedural macro to iterate over the variants of a field-less enum
# Upstream license specification: MIT
@@ -69,6 +69,9 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild