X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cargo.spec;h=be09fde59d55de8b577d1bdb4c31b3d28a8d9319;hb=f2aa0f9720e0a754fe9fd9f440dab438a4bf6aab;hp=7deebc41657f03fdbfb8082f0b58693a8eeec8e1;hpb=146558fb57623b9e53aa99646fea878a3a314d2e;p=packages%2Fcargo.git

diff --git a/cargo.spec b/cargo.spec
index 7deebc4..be09fde 100644
--- a/cargo.spec
+++ b/cargo.spec
@@ -1,3 +1,4 @@
+# NOTE: for versions >= 0.29 see rust.spec
 #
 # Conditional build:
 %bcond_with	bootstrap	# bootstrap using precompiled binaries
@@ -9,12 +10,12 @@
 Summary:	Rust's package manager and build tool
 Summary(pl.UTF-8):	Zarządca pakietów i narzędzie do budowania
 Name:		cargo
-Version:	0.22.0
-Release:	2
+Version:	0.26.0
+Release:	3.1
 License:	Apache v2.0 or MIT
 Group:		Development/Tools
 Source0:	https://github.com/rust-lang/cargo/archive/%{cargo_version}/%{name}-%{cargo_version}.tar.gz
-# Source0-md5:	3a781687f7ac248d83efc4cfa642a260
+# Source0-md5:	9929f01186583c5c9f01b587356a7c92
 Source2:	https://static.rust-lang.org/dist/%{name}-%{cargo_bootstrap}-x86_64-unknown-linux-gnu.tar.gz
 # Source2-md5:	d2cbab6378c1f60b483efa0f076a8f81
 Source3:	https://static.rust-lang.org/dist/%{name}-%{cargo_bootstrap}-i686-unknown-linux-gnu.tar.gz
@@ -24,8 +25,12 @@ Source3:	https://static.rust-lang.org/dist/%{name}-%{cargo_bootstrap}-i686-unkno
 # It's so big because some of the -sys crates include the C library source they
 # want to link to.  With our -devel buildreqs in place, they'll be used instead.
 # FIXME: These should all eventually be packaged on their own!
-Source4:	%{name}-%{version}-vendor.tar.xz
-# Source4-md5:	0e0595ee6ced6164052633df6a8a9eab
+# PLD: using sources vendored by Fedora
+Source4:	https://src.fedoraproject.org/repo/pkgs/cargo/%{name}-%{version}-vendor.tar.xz/sha512/6ed2a1644c9b18fc24ddad5350d41b6c36cd5b62de4cf0b748a57b589f4f0ac12f91461989158d58d0892bf6fc2c1626cf574e7e2b9da4b0e35f72dfd88f9048/%{name}-%{version}-vendor.tar.xz
+# Source4-md5:	bf5dd065f46ece6a0d30dbd3216508a0
+Patch0:		x32.patch
+Patch1:		build_fix.patch
+Patch2:		%{name}-url-buildfix.patch
 URL:		https://crates.io/
 %{!?with_bootstrap:BuildRequires:	%{name} >= 0.13.0}
 BuildRequires:	cmake
@@ -39,10 +44,14 @@ BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	zlib-devel
 Requires:	rust
-ExclusiveArch:	%{x8664} %{ix86}
+ExclusiveArch:	%{x8664} %{ix86} x32
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%ifarch x32
+%define		rust_triple	x86_64-unknown-linux-gnux32
+%else
 %define		rust_triple	%{_target_cpu}-unknown-linux-gnu
+%endif
 
 %if %{with bootstrap}
 %define		bootstrap_root	cargo-%{cargo_bootstrap}-%{rust_triple}
@@ -91,6 +100,13 @@ Dopełnianie parametrów polecenia cargo w powłoce Zsh.
 
 %prep
 %setup -q -n %{name}-%{cargo_version} -a4
+%ifarch x32
+%patch0 -p1
+%endif
+
+%patch1 -p1
+%patch2 -p1
+
 %if %{with bootstrap}
 %ifarch %{x8664}
 tar xf %{SOURCE2}