PR#162: Fix handling of rpmautospec detection - fedora-rust/rust2rpm

Zbigniew Jędrzejewski-Szmek • 2 years ago

6d4fba2

Zbigniew Jędrzejewski-Szmek • 2 years ago

e27e68b

rust2rpm/__main__.py

file modified

+3 -5

		`@@ -426,10 +426,8 @@`

		`kwargs["auto_changelog_entry"] = not args.no_auto_changelog_entry`

		`- if args.rpmautospec:`
		`- kwargs["rpmautospec"] = True`
		`- else:`
		`- kwargs["rpmautospec"] = detect_rpmautospec(default_target, spec_file)`
		`+ rpmautospec = args.rpmautospec or detect_rpmautospec(default_target, spec_file)`
		`+ kwargs["rpmautospec"] = rpmautospec`

		`if args.target in {"fedora", "mageia", "opensuse"}:`
		`kwargs["include_build_requires"] = True`
		`@@ -449,7 +447,7 @@`
		`kwargs["spec_copyright_year"] = time.strftime("%Y")`
		`kwargs["pkg_release"] = "0"`
		`kwargs["rust_group"] = "Development/Libraries/Rust"`
		`- elif args.rpmautospec:`
		`+ elif rpmautospec:`
		`kwargs["pkg_release"] = "%autorelease"`
		`else:`
		`kwargs["pkg_release"] = "1%{?dist}"`

rust2rpm/templates/main.spec

file modified

+1 -1

		`@@ -153,7 +153,7 @@`
		`%description {{ pkg }} %{_description}`

		`This package contains library source intended for building other packages which`
		`- use {% if feature is not none %}the "{{ feature }}" feature of the {% endif %}"%{crate}" crate.`
		`+ use {% if feature is not none %}the "{{ feature }}" feature of {% endif %}the "%{crate}" crate.`

		`%files {{ pkg }}`
		`{% if feature is none %}`