Compare commits

...

10 Commits
rawhide ... f36

Author SHA1 Message Date
Aleksei Bavshin de4ffd1d90
Update to 1.13.0 (#2164312) 2023-01-25 19:57:44 -08:00
Aleksei Bavshin 891ea8fb3f
Update to 1.12 (#2160641) 2023-01-23 07:42:14 -08:00
Aleksei Bavshin 57a86ec7d3
Update to 1.11.0 (#2157519) 2023-01-06 19:29:57 -08:00
Aleksei Bavshin 2dfbbc9e9f
Update to 1.9.0 (#2148570) 2022-11-25 22:03:19 -08:00
Aleksei Bavshin 2cd3b772a3
Update to 1.8.0 (#2139564) 2022-11-02 22:49:43 -07:00
Aleksei Bavshin af4fdfa9ea
Update to 1.7.0 (#2138073) 2022-10-30 20:13:46 -07:00
Aleksei Bavshin 7b1304871c
Update to 1.6.0 (#2136345) 2022-10-19 20:50:21 -07:00
Aleksei Bavshin 98d290b726
Update to 1.5.0
- Drop rust-cradle dependency
- Exclude unwanted files

Incorrect shebang in %{crate_instdir}/justfile was causing a broken
dependency on the devel subpackage. Excluding the file fixed that.
2022-10-04 08:06:55 -07:00
Aleksei Bavshin e0b4e9dfbe
Convert to rpmautospec 2022-10-04 08:06:43 -07:00
Tomas Hrcka 3a0ab8ed4b Unretirement request: https://pagure.io/releng/issue/11060 2022-10-04 11:45:53 +02:00
8 changed files with 259 additions and 3 deletions

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/*.src.rpm
/results_*/
/just-1.13.0.crate

3
README.md Normal file
View File

@ -0,0 +1,3 @@
# rust-just
The rust-just package

18
changelog Normal file
View File

@ -0,0 +1,18 @@
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Feb 15 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.9.8-4
- Rebuild with package notes
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Sun Jul 04 09:45:37 CEST 2021 Olivier Lemasle <o.lemasle@gmail.com> - 0.9.8-1
- Update to upstream 0.9.8; enable tests
- Add shell completions
* Sat Jul 03 12:57:26 CEST 2021 Olivier Lemasle <o.lemasle@gmail.com> - 0.9.6-1
- Initial package

View File

@ -1,3 +0,0 @@
Retired: Fails to install
See https://pagure.io/releng/issue/11052

View File

@ -0,0 +1,69 @@
diff --git a/tests/choose.rs b/tests/choose.rs
index 6444f2a..a81e124 100644
--- a/tests/choose.rs
+++ b/tests/choose.rs
@@ -140,7 +140,13 @@ fn status_error() {
"exit-2": "#!/usr/bin/env bash\nexit 2\n",
};
- ("chmod", "+x", tmp.path().join("exit-2")).run();
+ let output = Command::new("chmod")
+ .arg("+x")
+ .arg(tmp.path().join("exit-2"))
+ .output()
+ .unwrap();
+
+ assert!(output.status.success());
let path = env::join_paths(
iter::once(tmp.path().to_owned()).chain(env::split_paths(&env::var_os("PATH").unwrap())),
diff --git a/tests/edit.rs b/tests/edit.rs
index c7d72c7..40c82c2 100644
--- a/tests/edit.rs
+++ b/tests/edit.rs
@@ -64,7 +64,13 @@ fn status_error() {
"exit-2": "#!/usr/bin/env bash\nexit 2\n",
};
- ("chmod", "+x", tmp.path().join("exit-2")).run();
+ let output = Command::new("chmod")
+ .arg("+x")
+ .arg(tmp.path().join("exit-2"))
+ .output()
+ .unwrap();
+
+ assert!(output.status.success());
let path = env::join_paths(
iter::once(tmp.path().to_owned()).chain(env::split_paths(&env::var_os("PATH").unwrap())),
diff --git a/tests/fmt.rs b/tests/fmt.rs
index e4c4687..ccf7f5d 100644
--- a/tests/fmt.rs
+++ b/tests/fmt.rs
@@ -107,7 +107,13 @@ fn write_error() {
let justfile_path = test.justfile_path();
- ("chmod", "400", &justfile_path).run();
+ let output = Command::new("chmod")
+ .arg("400")
+ .arg(&justfile_path)
+ .output()
+ .unwrap();
+
+ assert!(output.status.success());
let _tempdir = test.run();
diff --git a/tests/lib.rs b/tests/lib.rs
index 9867e3d..2f47d90 100644
--- a/tests/lib.rs
+++ b/tests/lib.rs
@@ -5,7 +5,6 @@ pub(crate) use {
tempdir::tempdir,
test::{Output, Test},
},
- cradle::input::Input,
executable_path::executable_path,
just::unindent,
libc::{EXIT_FAILURE, EXIT_SUCCESS},

35
just-fix-metadata.diff Normal file
View File

@ -0,0 +1,35 @@
--- just-1.12.0/Cargo.toml 1970-01-01T00:00:01+00:00
+++ just-1.12.0/Cargo.toml 2023-01-02T17:35:08+00:00
@@ -20,6 +20,13 @@ name = "just"
"/icon.png",
"/screenshot.png",
"/www",
+ "/Vagrantfile",
+ "/bin",
+ "/completions",
+ "/examples",
+ "/extras",
+ "/justfile",
+ "/snapcraft.yaml",
]
autotests = false
description = "🤖 Just a command runner"
@@ -75,7 +82,7 @@ version = "0.15"
version = "2.0.0"
[dependencies.env_logger]
-version = "0.10.0"
+version = "0.9.3"
[dependencies.heck]
version = "0.4.0"
@@ -132,9 +139,6 @@ version = "0.1.0"
version = "1.0.0"
features = ["v4"]
-[dev-dependencies.cradle]
-version = "0.2.0"
-
[dev-dependencies.executable-path]
version = "1.0.0"

130
rust-just.spec Normal file
View File

@ -0,0 +1,130 @@
# Generated by rust2rpm 22
%bcond_without check
%global crate just
Name: rust-just
Version: 1.13.0
Release: %autorelease
Summary: Just a command runner
License: CC0-1.0
URL: https://crates.io/crates/just
Source: %{crates_source}
# Initial patched metadata
# - Exclude unwanted files
# - Drop cradle dependency, the crate cannot be packaged due to CC0 license
# - Downgrade env_logger dependency to 0.9 (0.10 is blocked by fedora-rust/rust2rpm#186)
Patch0: just-fix-metadata.diff
# Remove all uses of cradle
Patch1: just-1.5.0-no-cradle.patch
BuildRequires: rust-packaging >= 23
%global _description %{expand:
just is a handy way to save and run project-specific commands.}
%description %{_description}
%package -n %{crate}
Summary: %{summary}
# (MIT OR Apache-2.0) AND Unicode-DFS-2016
# Apache-2.0
# Apache-2.0 OR BSL-1.0
# Apache-2.0 OR MIT
# CC0-1.0
# MIT
# MIT OR Apache-2.0
# Unlicense OR MIT
License: CC0-1.0 AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND MIT AND Unicode-DFS-2016 AND (Unlicense OR MIT)
%description -n %{crate} %{_description}
%files -n %{crate}
%license LICENSE
%license LICENSE.dependencies
%doc CHANGELOG.md
%doc CONTRIBUTING.md
%doc GRAMMAR.md
%doc README.md
%doc README.中文.md
%doc crates-io-readme.md
%doc examples
%{_bindir}/just
%{_mandir}/man1/just.1*
%{_datadir}/bash-completion
%{_datadir}/fish/
%{_datadir}/zsh/site-functions
%package devel
Summary: %{summary}
BuildArch: noarch
%description devel %{_description}
This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
%license %{crate_instdir}/LICENSE
%doc %{crate_instdir}/CHANGELOG.md
%doc %{crate_instdir}/CONTRIBUTING.md
%doc %{crate_instdir}/GRAMMAR.md
%doc %{crate_instdir}/README.md
%doc %{crate_instdir}/README.中文.md
%doc %{crate_instdir}/crates-io-readme.md
%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+default-devel %{_description}
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 %{crate_instdir}/Cargo.toml
%package -n %{name}+help4help2man-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+help4help2man-devel %{_description}
This package contains library source intended for building other packages which
use the "help4help2man" feature of the "%{crate}" crate.
%files -n %{name}+help4help2man-devel
%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
%generate_buildrequires
%cargo_generate_buildrequires
%build
%cargo_build
%{cargo_license} >LICENSE.dependencies
%install
%cargo_install
install -dp %{buildroot}%{_mandir}/man1
install -p -m 644 man/just.1 %{buildroot}%{_mandir}/man1
install -dp %{buildroot}%{_datadir}/bash-completion/completions/
install -p -m 644 completions/just.bash %{buildroot}%{_datadir}/bash-completion/completions/just
install -dp %{buildroot}%{_datadir}/fish/vendor_completions.d
install -p -m 644 completions/just.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/just.fish
install -dp %{buildroot}%{_datadir}/zsh/site-functions
install -p -m 644 completions/just.zsh %{buildroot}%{_datadir}/zsh/site-functions/_just
%if %{with check}
%check
%cargo_test
%endif
%changelog
%autochangelog

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (just-1.13.0.crate) = 9f7d1385b5bfc3fce7d934f06cd53512cdf8cffd88198d7613559884332876db03bdb11c5cd8edb9f2fff284aeb63faeafd07dd28997d708880cc51a596040fc