Adapt to new packaging

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2018-11-14 14:43:23 +01:00
parent 5bc5c81833
commit ff5dc4c114
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C
2 changed files with 94 additions and 48 deletions

View File

@ -1,5 +1,5 @@
--- exa-0.8.0/Cargo.toml 1970-01-01T01:00:00+01:00
+++ exa-0.8.0/Cargo.toml 2018-06-25T13:23:04.561353+02:00
+++ exa-0.8.0/Cargo.toml 2018-11-14T14:42:07.254488+01:00
@@ -40,7 +40,7 @@
version = "0.4.5"
@ -35,7 +35,7 @@
[dependencies.libc]
version = "0.2.9"
@@ -79,12 +76,12 @@
@@ -79,18 +76,18 @@
version = "1.0.7"
[dependencies.git2]
@ -50,3 +50,10 @@
[dependencies.locale]
version = "0.2.1"
[dependencies.scoped_threadpool]
-version = "0.1.*"
+version = "0.1"
[dependencies.number_prefix]
version = "0.2.3"

View File

@ -5,7 +5,7 @@
Name: rust-%{crate}
Version: 0.8.0
Release: 10%{?dist}
Release: 11%{?dist}
Summary: Modern replacement for ls
License: MIT
@ -17,35 +17,36 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{
# * Bump users to 0.6, https://github.com/ogham/exa/pull/395
# * Bump lazy_static, https://github.com/ogham/exa/pull/322
# * Bump git2 to 0.7, https://github.com/ogham/exa/commit/f757300718b1861852d4a33459385eaf921d69e7
Patch0: exa-0.8.0-fix-metadata.diff
Patch0: exa-fix-metadata.diff
# Make it work with new git2
Patch1: 0001-Upgrade-libgit2.patch
ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging
# [dependencies]
BuildRequires: (crate(ansi_term) >= 0.11.0 with crate(ansi_term) < 0.12.0)
BuildRequires: (crate(datetime) >= 0.4.5 with crate(datetime) < 0.5.0)
BuildRequires: (crate(env_logger) >= 0.4.0 with crate(env_logger) < 0.5.0)
BuildRequires: (crate(ansi_term/default) >= 0.11.0 with crate(ansi_term/default) < 0.12.0)
BuildRequires: (crate(datetime/default) >= 0.4.5 with crate(datetime/default) < 0.5.0)
BuildRequires: (crate(env_logger/default) >= 0.4.0 with crate(env_logger/default) < 0.5.0)
BuildRequires: (crate(git2) >= 0.7.0 with crate(git2) < 0.8.0)
BuildRequires: (crate(glob) >= 0.2.0 with crate(glob) < 0.3.0)
BuildRequires: (crate(lazy_static) >= 1.0.0 with crate(lazy_static) < 2.0.0)
BuildRequires: (crate(libc) >= 0.2.9 with crate(libc) < 0.3.0)
BuildRequires: (crate(locale) >= 0.2.1 with crate(locale) < 0.3.0)
BuildRequires: (crate(log) >= 0.3.0 with crate(log) < 0.4.0)
BuildRequires: (crate(natord) >= 1.0.7 with crate(natord) < 2.0.0)
BuildRequires: (crate(num_cpus) >= 1.3.0 with crate(num_cpus) < 2.0.0)
BuildRequires: (crate(number_prefix) >= 0.2.3 with crate(number_prefix) < 0.3.0)
BuildRequires: (crate(scoped_threadpool) >= 0.1.0 with crate(scoped_threadpool) < 0.2.0)
BuildRequires: (crate(term_grid) >= 0.1.6 with crate(term_grid) < 0.2.0)
BuildRequires: (crate(term_size) >= 0.3.0 with crate(term_size) < 0.4.0)
BuildRequires: (crate(unicode-width) >= 0.1.4 with crate(unicode-width) < 0.2.0)
BuildRequires: (crate(users) >= 0.7.0 with crate(users) < 0.8.0)
BuildRequires: (crate(zoneinfo_compiled) >= 0.4.5 with crate(zoneinfo_compiled) < 0.5.0)
BuildRequires: (crate(glob/default) >= 0.2.0 with crate(glob/default) < 0.3.0)
BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0)
BuildRequires: (crate(libc/default) >= 0.2.9 with crate(libc/default) < 0.3.0)
BuildRequires: (crate(locale/default) >= 0.2.1 with crate(locale/default) < 0.3.0)
BuildRequires: (crate(log/default) >= 0.3.0 with crate(log/default) < 0.4.0)
BuildRequires: (crate(natord/default) >= 1.0.7 with crate(natord/default) < 2.0.0)
BuildRequires: (crate(num_cpus/default) >= 1.3.0 with crate(num_cpus/default) < 2.0.0)
BuildRequires: (crate(number_prefix/default) >= 0.2.3 with crate(number_prefix/default) < 0.3.0)
BuildRequires: (crate(scoped_threadpool/default) >= 0.1.0 with crate(scoped_threadpool/default) < 0.2.0)
BuildRequires: (crate(term_grid/default) >= 0.1.6 with crate(term_grid/default) < 0.2.0)
BuildRequires: (crate(term_size/default) >= 0.3.0 with crate(term_size/default) < 0.4.0)
BuildRequires: (crate(unicode-width/default) >= 0.1.4 with crate(unicode-width/default) < 0.2.0)
BuildRequires: (crate(users/default) >= 0.7.0 with crate(users/default) < 0.8.0)
BuildRequires: (crate(zoneinfo_compiled/default) >= 0.4.5 with crate(zoneinfo_compiled/default) < 0.5.0)
%description
%{summary}.
%global _description \
A modern replacement for ls.
%description %{_description}
%package -n %{crate}
Summary: %{summary}
@ -53,15 +54,71 @@ Summary: %{summary}
%description -n %{crate}
%{summary}.
%files -n %{crate}
%license LICENCE
%doc README.md
%{_bindir}/exa
%{_mandir}/man1/exa.1*
%dir %{_datadir}/bash-completion
%dir %{_datadir}/bash-completion/completions
%{_datadir}/bash-completion/completions/exa.bash
%dir %{_datadir}/fish
%dir %{_datadir}/fish/vendor_functions.d
%{_datadir}/fish/vendor_functions.d/exa.fish
%dir %{_datadir}/zsh
%dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/_exa
%package devel
Summary: %{summary}
BuildArch: noarch
%description devel
A modern replacement for ls.
%description devel %{_description}
This package contains library source intended for building other packages
which use %{crate} from crates.io.
which use "%{crate}" crate.
%files devel
%license LICENCE
%doc README.md
%{cargo_registry}/%{crate}-%{version}/
%exclude %{cargo_registry}/%{crate}-%{version}/{Makefile,Vagrantfile,contrib,devtools,screenshots.png,xtests}
%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 "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
%package -n %{name}+git-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+git-devel %{_description}
This package contains library source intended for building other packages
which use "git" feature of "%{crate}" crate.
%files -n %{name}+git-devel
%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
%package -n %{name}+git2-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+git2-devel %{_description}
This package contains library source intended for building other packages
which use "git2" feature of "%{crate}" crate.
%files -n %{name}+git2-devel
%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version} -p1
@ -86,28 +143,10 @@ which use %{crate} from crates.io.
%cargo_test || :
%endif
%files -n %{crate}
%license LICENCE
%doc README.md
%{_bindir}/exa
%{_mandir}/man1/exa.1*
%dir %{_datadir}/bash-completion
%dir %{_datadir}/bash-completion/completions
%{_datadir}/bash-completion/completions/exa.bash
%dir %{_datadir}/fish
%dir %{_datadir}/fish/vendor_functions.d
%{_datadir}/fish/vendor_functions.d/exa.fish
%dir %{_datadir}/zsh
%dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/_exa
%files devel
%license LICENCE
%doc README.md
%{cargo_registry}/%{crate}-%{version}/
%exclude %{cargo_registry}/%{crate}-%{version}/{Makefile,Vagrantfile,contrib,devtools,screenshots.png,xtests}
%changelog
* Wed Nov 14 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.8.0-11
- Adapt to new packaging
* Fri Aug 10 2018 Josh Stone <jistone@redhat.com> - 0.8.0-10
- Rebuild with fixed rust-libgit2-sys-0.7.7