Hello community,
here is the log from the commit of package cargo for openSUSE:Factory checked
in at 2017-02-02 15:41:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cargo (Old)
and /work/SRC/openSUSE:Factory/.cargo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cargo"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cargo/cargo.changes 2016-11-10
13:18:46.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cargo.new/cargo.changes 2017-02-03
17:33:59.636183567 +0100
@@ -1,0 +2,10 @@
+Tue Jan 31 06:03:59 UTC 2017 - luke.nukem.jo...@gmail.com
+
+- Update to 0.15.0
+
+-------------------------------------------------------------------
+Tue Jan 17 14:46:51 UTC 2017 - bwiedem...@suse.com
+
+- Add reproducible.patch to allow for reproducible builds
+
+-------------------------------------------------------------------
Old:
----
cargo-0.13.0.tar.xz
New:
----
cargo-0.15.0.tar.gz
reproducible.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cargo.spec ++++++
--- /var/tmp/diff_new_pack.VMW50S/_old 2017-02-03 17:34:00.676036389 +0100
+++ /var/tmp/diff_new_pack.VMW50S/_new 2017-02-03 17:34:00.676036389 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cargo
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 Michal Vyskocil, michal.vysko...@opensuse.org
# Copyright (c) 2016 Kristoffer Gronlund, kgronl...@suse.com
#
@@ -18,12 +18,11 @@
#
-%bcond_without bootstrap_tarball
-
-%define rust_target %(rustc -vV | grep 'host: ' | sed 's/host: //')
+%global prev_version 0.13.0
+%global prev_rustc 1.13.0
Name: cargo
-Version: 0.13.0
+Version: 0.15.0
Release: 0
Summary: The Rust package manager
License: MIT or Apache-2.0
@@ -32,20 +31,21 @@
# See README.packager for instructions on generating
# the source archives
-Source0: %{name}-%{version}.tar.xz
+Source0: %{name}-%{version}.tar.gz
Source1: vendor.tar.xz
Source2: README.packager
+# PATCH-FIX-UPSTREAM -- https://github.com/rust-lang/cargo/pull/3554
+Patch0: reproducible.patch
-BuildRequires: cargo >= 0.10.0
+BuildRequires: cargo >= %{prev_version}
BuildRequires: cmake
BuildRequires: curl
BuildRequires: git
BuildRequires: libcurl-devel
BuildRequires: libopenssl-devel
BuildRequires: libssh-devel
-BuildRequires: rustc-stable >= 1.10.0
+BuildRequires: rustc-stable >= %{prev_rustc}
BuildRequires: zlib-devel
-Requires: rustc
Conflicts: cargo-bootstrap
@@ -54,57 +54,34 @@
%description
Cargo downloads your Rust project’s dependencies and compiles your project.
-%if %{with bootstrap_tarball}
-%package bootstrap-tarball
-Summary: Bootstrap tarball with cargo binaries
-Group: Development/Languages/Other
-
-%description bootstrap-tarball
-This subpackage provides tarball with rust binaries used for cargo-bootstrap
-package.
-%endif
-
%prep
%setup -q
%setup -q -D -T -a 1
-pkgdir="$(pwd)"
+%patch0 -p1
mkdir cargo-home
cat >cargo-home/config <<EOF
-[registry]
-index = "file://$pkgdir/vendor/index"
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+[source.vendored-sources]
+directory = './vendor'
EOF
-pushd vendor/index
-rm config.json
-cat >config.json <<EOF
-{"dl":"file://$pkgdir/vendor/cache","api":""}
-EOF
-git config user.name "Cargo Packaging"
-git config user.email cargo-packag...@example.com
-git add config.json
-git commit -m "rewrite cache path"
-popd
%build
-CARGO_HOME=cargo-home cargo build --target=%{rust_target} --release
%{?_smp_mflags}
-%if %{with bootstrap_tarball}
-./configure --target=%{rust_target}
-CARGO_HOME=cargo-home make %{?_smp_mflags} dist
-%endif
+export CARGO_HOME=`pwd`/cargo-home/
+./configure
+cargo build --release %{?_smp_mflags}
%install
mkdir build
-CARGO_HOME=cargo-home cargo install --root=build
+export CARGO_HOME=`pwd`/cargo-home/
+cargo install --root=build
mkdir -p %{buildroot}%{_bindir}
install -Dm0755 build/bin/cargo %{buildroot}%{_bindir}/cargo
mkdir -p %{buildroot}%{_mandir}/man1
install -Dm0644 src/etc/man/cargo*.1 %{buildroot}%{_mandir}/man1/
install -Dm0644 src/etc/cargo.bashcomp.sh
%{buildroot}%{_sysconfdir}/bash_completion.d/cargo.sh
-%if %{with bootstrap_tarball}
-mkdir -p %{buildroot}%{_prefix}/share/cargo-bootstrap-tarball
-mv target/%{rust_target}/release/dist/%{name}-%{version}-%{rust_target}.tar.gz
%{buildroot}%{_prefix}/share/cargo-bootstrap-tarball
-%endif
-
%files
%defattr(-,root,root)
%doc LICENSE-APACHE LICENSE-MIT README.md
@@ -112,11 +89,4 @@
%doc %{_mandir}/man1/*
%config %{_sysconfdir}/bash_completion.d/cargo.sh
-%if %{with bootstrap_tarball}
-%files bootstrap-tarball
-%defattr(-,root,root,-)
-%dir %{_prefix}/share/cargo-bootstrap-tarball
-%{_prefix}/share/cargo-bootstrap-tarball/cargo-*.tar.gz
-%endif
-
%changelog
++++++ reproducible.patch ++++++
Index: cargo-0.15.0/Makefile.in
===================================================================
--- cargo-0.15.0.orig/Makefile.in
+++ cargo-0.15.0/Makefile.in
@@ -22,7 +22,8 @@ CFG_RELEASE=$(CFG_RELEASE_NUM)-dev
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-dev
endif
-CFG_BUILD_DATE = $(shell date +%F)
+# allow build systems to use a constant date instead of the current one
+CFG_BUILD_DATE = $(shell SOURCE_DATE_EPOCH="$${SOURCE_DATE_EPOCH:-$$(date
+%s)}" ; date -u -d "@$$SOURCE_DATE_EPOCH" +%F 2>/dev/null || date -u -r
"$$SOURCE_DATE_EPOCH" +%F 2>/dev/null || date -u +%F)
ifeq ($(wildcard $(CFG_SRC_DIR)/.git),)
CFG_VERSION = $(CFG_RELEASE) (built $(CFG_BUILD_DATE))
++++++ vendor.tar.xz ++++++
/work/SRC/openSUSE:Factory/cargo/vendor.tar.xz
/work/SRC/openSUSE:Factory/.cargo.new/vendor.tar.xz differ: char 25, line 1
