The package rpms/rust-packaging.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-packaging.git/commit/?id=4e5....
Change:
+ExclusiveArch: %{rust_arches} noarch
Thanks.
Full change:
============
commit 6b81b17f09c4168a13a81f0c305ddd13117ef61d
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sat Oct 21 09:58:43 2017 +0200
Generate runtime dependencyon cargo for devel subpackages
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/0001-inspector-inject-cargo-dependency-in-runtime.patch
b/0001-inspector-inject-cargo-dependency-in-runtime.patch
new file mode 100644
index 0000000..35e2831
--- /dev/null
+++ b/0001-inspector-inject-cargo-dependency-in-runtime.patch
@@ -0,0 +1,41 @@
+From 9e0a872ece6f5aedf76ffd67044f22c7d0cba8aa Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
+Date: Fri, 20 Oct 2017 18:04:31 +0200
+Subject: [PATCH 1/2] inspector: inject cargo dependency in runtime
+
+Fixes:
https://pagure.io/fedora-rust/rust2rpm/issue/42
+Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
+---
+ rust2rpm/__main__.py | 1 +
+ rust2rpm/inspector.py | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/rust2rpm/__main__.py b/rust2rpm/__main__.py
+index 0121a33..bb92fa3 100644
+--- a/rust2rpm/__main__.py
++++ b/rust2rpm/__main__.py
+@@ -91,6 +91,7 @@ Provides: {{ prv }}
+ {% endfor %}
+ {% endif %}
+ {% if include_requires %}
++Requires: cargo
+ {% if md.requires|length > 0 %}
+ # [dependencies]
+ {% for req in md.requires|sort(attribute="name") %}
+diff --git a/rust2rpm/inspector.py b/rust2rpm/inspector.py
+index d08f1aa..6ccdbc2 100644
+--- a/rust2rpm/inspector.py
++++ b/rust2rpm/inspector.py
+@@ -38,6 +38,9 @@ def main():
+ print_deps(list(itertools.chain(md.requires, md.build_requires)))
+ if args.test_requires:
+ print_deps(md.test_requires)
++ if args.requires:
++ # Someone should own /usr/share/cargo/registry
++ print("cargo")
+
+ if __name__ == "__main__":
+ main()
+--
+2.14.2
+
diff --git a/0002-inspector-inject-rust-packaging-dependency-in-buildt.patch
b/0002-inspector-inject-rust-packaging-dependency-in-buildt.patch
new file mode 100644
index 0000000..44777cf
--- /dev/null
+++ b/0002-inspector-inject-rust-packaging-dependency-in-buildt.patch
@@ -0,0 +1,28 @@
+From 45a5caf30060c182fb0ae03a1a7e4e707599aaa3 Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
+Date: Sat, 21 Oct 2017 09:45:30 +0200
+Subject: [PATCH 2/2] inspector: inject rust-packaging dependency in buildtime
+
+For consistency with previous commit.
+
+Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
+---
+ rust2rpm/inspector.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/rust2rpm/inspector.py b/rust2rpm/inspector.py
+index 6ccdbc2..2d488b2 100644
+--- a/rust2rpm/inspector.py
++++ b/rust2rpm/inspector.py
+@@ -41,6 +41,8 @@ def main():
+ if args.requires:
+ # Someone should own /usr/share/cargo/registry
+ print("cargo")
++ if args.build_requires:
++ print("rust-packaging")
+
+ if __name__ == "__main__":
+ main()
+--
+2.14.2
+
diff --git a/rust-packaging.spec b/rust-packaging.spec
index 5de07c4..edae99b 100644
--- a/rust-packaging.spec
+++ b/rust-packaging.spec
@@ -2,12 +2,15 @@
Name: rust-packaging
Version: 4
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: RPM macros for building Rust packages on various architectures
License: MIT
URL:
https://pagure.io/fedora-rust/rust2rpm
Source0:
https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz
+#
https://pagure.io/fedora-rust/rust2rpm/pull-request/43
+Patch0001: 0001-inspector-inject-cargo-dependency-in-runtime.patch
+Patch0002: 0002-inspector-inject-rust-packaging-dependency-in-buildt.patch
BuildArch: noarch
ExclusiveArch: %{rust_arches} noarch
@@ -83,6 +86,9 @@ py.test-%{python3_version} -v test.py
%{python3_sitelib}/rust2rpm/
%changelog
+* Sat Oct 21 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 4-5
+- Generate runtime dependencyon cargo for devel subpackages
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit 46f705671d983393718d94f489070362fe07317a
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sat Oct 21 09:57:46 2017 +0200
adopt to new RPM 4.14 behavior for returning proper exit status
Since RPM 4.14, it started to return exit status of last executed
statement which on rawhide returns false so right condition doesn't
run.
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/rust-packaging.spec b/rust-packaging.spec
index fe71057..5de07c4 100644
--- a/rust-packaging.spec
+++ b/rust-packaging.spec
@@ -55,7 +55,7 @@ lang=C.UTF-8
lang=en_US.UTF-8
%endif
%endif
-[ -n "$lang" ] && sed -r -i -e
"s|(%\{_bindir\}/cargo-inspector)|env LANG=$lang \1|" data/cargo.attr
data/macros.cargo
+[ -z "$lang" ] || sed -r -i -e "s|(%\{_bindir\}/cargo-inspector)|env
LANG=$lang \1|" data/cargo.attr data/macros.cargo
%build
%py3_build
commit 85772b9e87a16911d2365af1dd20ce50100e2587
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 27 18:01:59 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/rust-packaging.spec b/rust-packaging.spec
index 91e4eb9..fe71057 100644
--- a/rust-packaging.spec
+++ b/rust-packaging.spec
@@ -2,7 +2,7 @@
Name: rust-packaging
Version: 4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: RPM macros for building Rust packages on various architectures
License: MIT
@@ -83,6 +83,9 @@ py.test-%{python3_version} -v test.py
%{python3_sitelib}/rust2rpm/
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Sat Jul 08 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 4-2
- Include license
commit 4e5904b9ac6f208d08f51fd46059878856a03db4
Author: Igor Gnatenko <ignatenko(a)redhat.com>
Date: Sun Jul 9 09:22:14 2017 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenko(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index e69de29..aaa8cf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/rust2rpm-4.tar.xz
diff --git a/rust-packaging.spec b/rust-packaging.spec
new file mode 100644
index 0000000..91e4eb9
--- /dev/null
+++ b/rust-packaging.spec
@@ -0,0 +1,105 @@
+%bcond_without check
+
+Name: rust-packaging
+Version: 4
+Release: 2%{?dist}
+Summary: RPM macros for building Rust packages on various architectures
+
+License: MIT
+URL:
https://pagure.io/fedora-rust/rust2rpm
+Source0:
https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz
+
+BuildArch: noarch
+ExclusiveArch: %{rust_arches} noarch
+
+# gawk is needed for stripping dev-deps in macro, 4.1.0 is needed for inplace feature
+Requires: gawk >= 4.1.0
+Requires: python3-rust2rpm = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: rust-srpm-macros = %{version}
+
+%description
+The package provides macros for building projects in Rust
+on various architectures.
+
+%package -n python3-rust2rpm
+Summary: Convert Rust packages to RPM
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+%if %{with check}
+BuildRequires: python3-pytest
+BuildRequires: cargo
+BuildRequires: python3-semantic_version
+%endif
+Requires: cargo
+Requires: python3-semantic_version
+Requires: python3-jinja2
+Requires: python3-requests
+Requires: python3-tqdm
+%if 0%{?mageia}
+Requires: locales-en
+%endif
+Obsoletes: rust2rpm < 1-8
+Provides: rust2rpm = %{version}-%{release}
+%{?python_provide:%python_provide python3-rust2rpm}
+
+%description -n python3-rust2rpm
+%{summary}.
+
+%prep
+%autosetup -n rust2rpm-%{version} -p1
+lang=
+%if (0%{?fedora} && 0%{?fedora} <= 25) || (0%{?rhel} && 0%{?rhel}
<= 7)
+lang=C.UTF-8
+%else
+%if 0%{?mageia}
+lang=en_US.UTF-8
+%endif
+%endif
+[ -n "$lang" ] && sed -r -i -e
"s|(%\{_bindir\}/cargo-inspector)|env LANG=$lang \1|" data/cargo.attr
data/macros.cargo
+
+%build
+%py3_build
+
+%install
+%py3_install
+install -D -p -m 0644 -t %{buildroot}%{_rpmconfigdir}/macros.d data/macros.rust
data/macros.cargo
+install -D -p -m 0644 -t %{buildroot}%{_rpmconfigdir}/fileattrs data/cargo.attr
+
+%if %{with check}
+%check
+py.test-%{python3_version} -v test.py
+%endif
+
+%files
+%{_rpmconfigdir}/macros.d/macros.rust
+%{_rpmconfigdir}/macros.d/macros.cargo
+%{_rpmconfigdir}/fileattrs/cargo.attr
+
+%files -n python3-rust2rpm
+%license LICENSE
+%{_bindir}/rust2rpm
+%{_bindir}/cargo-inspector
+%{python3_sitelib}/rust2rpm-*.egg-info/
+%{python3_sitelib}/rust2rpm/
+
+%changelog
+* Sat Jul 08 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 4-2
+- Include license
+
+* Sat Jul 08 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 4-1
+- Update to 4
+
+* Fri Jun 23 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 3-5
+- Explicitly set rustdoc path
+
+* Wed Jun 21 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 3-4
+- Mageia doesn't have C.UTF-8 lang
+
+* Wed Jun 21 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 3-3
+- Switch cargo_registry to /usr/share/cargo/registry
+
+* Wed Jun 14 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 3-2
+- Set C.UTF-8 for cargo inspector where python doesn't do locale coercing
+
+* Tue Jun 13 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 3-1
+- Initial package
diff --git a/sources b/sources
index e69de29..a81110b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (rust2rpm-4.tar.xz) =
d8527c72f34b31086d3c6dbfae7fd25709525e5aa941d9de47efaefb07a04782d8f7c561b258145df1413fbfee5cd76e24d7d3787107aa36e2d9d1a1e6577637