Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
2dfbbc9e9f | ||
|
2cd3b772a3 | ||
|
af4fdfa9ea | ||
|
7b1304871c | ||
|
98d290b726 | ||
|
e0b4e9dfbe | ||
|
3a0ab8ed4b |
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
/*.src.rpm
|
||||||
|
/results_*/
|
||||||
|
/just-1.9.0.crate
|
18
changelog
Normal file
18
changelog
Normal 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
|
@ -1,3 +0,0 @@
|
|||||||
Retired: Fails to install
|
|
||||||
|
|
||||||
See https://pagure.io/releng/issue/11052
|
|
69
just-1.5.0-no-cradle.patch
Normal file
69
just-1.5.0-no-cradle.patch
Normal 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
|
||||||
|
@@ -2,7 +2,6 @@ pub(crate) use {
|
||||||
|
crate::{
|
||||||
|
assert_stdout::assert_stdout, assert_success::assert_success, tempdir::tempdir, test::Test,
|
||||||
|
},
|
||||||
|
- cradle::input::Input,
|
||||||
|
executable_path::executable_path,
|
||||||
|
just::unindent,
|
||||||
|
libc::{EXIT_FAILURE, EXIT_SUCCESS},
|
29
just-fix-metadata.diff
Normal file
29
just-fix-metadata.diff
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
--- just-1.9.0/Cargo.toml 1970-01-01T00:00:01+00:00
|
||||||
|
+++ just-1.9.0/Cargo.toml 2022-09-30T00:37:34.996094+00:00
|
||||||
|
@@ -15,9 +15,16 @@
|
||||||
|
version = "1.9.0"
|
||||||
|
authors = ["Casey Rodarmor <casey@rodarmor.com>"]
|
||||||
|
exclude = [
|
||||||
|
+ "/Vagrantfile",
|
||||||
|
+ "/bin",
|
||||||
|
"/book",
|
||||||
|
+ "/completions",
|
||||||
|
+ "/examples",
|
||||||
|
+ "/extras",
|
||||||
|
"/icon.png",
|
||||||
|
+ "/justfile",
|
||||||
|
"/screenshot.png",
|
||||||
|
+ "/snapcraft.yaml",
|
||||||
|
"/www",
|
||||||
|
]
|
||||||
|
autotests = false
|
||||||
|
@@ -133,9 +139,6 @@
|
||||||
|
version = "1.0.0"
|
||||||
|
features = ["v4"]
|
||||||
|
|
||||||
|
-[dev-dependencies.cradle]
|
||||||
|
-version = "0.2.0"
|
||||||
|
-
|
||||||
|
[dev-dependencies.executable-path]
|
||||||
|
version = "1.0.0"
|
||||||
|
|
120
rust-just.spec
Normal file
120
rust-just.spec
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
# Generated by rust2rpm 22
|
||||||
|
%bcond_without check
|
||||||
|
|
||||||
|
%global crate just
|
||||||
|
|
||||||
|
Name: rust-just
|
||||||
|
Version: 1.9.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
|
||||||
|
Patch0: just-fix-metadata.diff
|
||||||
|
# Remove all uses of cradle
|
||||||
|
Patch1: just-1.5.0-no-cradle.patch
|
||||||
|
|
||||||
|
ExclusiveArch: %{rust_arches}
|
||||||
|
|
||||||
|
BuildRequires: rust-packaging >= 21
|
||||||
|
|
||||||
|
%global _description %{expand:
|
||||||
|
just is a handy way to save and run project-specific commands.}
|
||||||
|
|
||||||
|
%description %{_description}
|
||||||
|
|
||||||
|
%package -n %{crate}
|
||||||
|
Summary: %{summary}
|
||||||
|
|
||||||
|
%description -n %{crate} %{_description}
|
||||||
|
|
||||||
|
%files -n %{crate}
|
||||||
|
%license LICENSE
|
||||||
|
%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
|
||||||
|
|
||||||
|
%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
|
Loading…
Reference in New Issue
Block a user