Accepting request 750795 from home:aplanas:branches:devel:languages:rust

- Re-format the spec file
- Add a README to explain the update process
- Add _service file for download the assets and re-base the patches

OBS-URL: https://build.opensuse.org/request/show/750795
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=234

README

@@ -0,0 +1,62 @@
+# Automatic updating via _service
+
+Edit the spec file, and update the variables related with the version
+(in format X.YY.Z):
+
+- *version_current*: for the new version of Rust
+- *version_previous*: for the previous version of Rust
+- *version_bootstrap*: for the version used to compile Rust, it
+  recommended to use the same version that *version_previous*
+- *rustfmt_version*: for the version of rustfmt cli, check the tarball
+   to find the correct version
+- *clippy_version*: for the version of clippy, check the tarball to
+   find the correct version
+
+After that, we can execute the service file:
+
+  osc service disabledrun
+
+If `osc` complains about a missing service component, double check
+that the components are installed. For example, for Tumbleweed:
+
+  zypper in obs-service-download_files obs-service-refresh_patches
+
+Finally, update the changelog based on the releases notes:
+
+  https://github.com/rust-lang/rust/blob/master/RELEASES.md
+
+# Updating to a new version from upstream
+
+(Original link: https://en.opensuse.org/Rust)
+
+Branch the rust package in the devel:languages:rust project.
+
+You'll need to download precompiled binaries for the compiler used for
+bootstrapping, and the actual source code for the compiler. In the
+"Other Installation Methods" page listed below, note that it shows
+links to .tar.gz packages and their .tar.gz.asc GPG signatures, but
+.tar.xz versions are also available.
+
+*Binaries for bootstrapping* - Go to the "Other Installation Methods"
+page from rust-lang.org and scroll down to the "Standalone installers"
+section. Download the following:
+
+- rust-<version>-aarch64-unknown-linux-gnu.tar.xz
+- rust-<version>-armv7-unknown-linux-gnueabihf.tar.xz
+- rust-<version>-i686-unknown-linux-gnu.tar.xz
+- rust-<version>-powerpc64le-unknown-linux-gnu.tar.xz
+- rust-<version>-powerpc64-unknown-linux-gnu.tar.xz
+- rust-<version>-s390x-unknown-linux-gnu.tar.xz
+- rust-<version>-x86_64-unknown-linux-gnu.tar.xz
+
+*Compiler source code* - From the same page, but now in the "Source
+code" section, download this:
+
+  rustc-<version>-src.tar.xz
+
+Update those files in the source RPM. Check that all the patches still
+apply.
+
+Update the version number in rust.spec.
+
+Add the release notes to rust.changes.

_service

@@ -0,0 +1,9 @@
+<services>
+  <service mode="disabled" name="download_files">
+    <param name="changesgenerate">enable</param>
+  </service>
+  <service mode="disabled" name="refresh_patches">
+    <param name="changesgenerate">enable</param>
+    <param name="ignorefuzz">enable</param>
+  </service>
+</services>

rust.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 25 13:25:52 UTC 2019 - Alberto Planas Dominguez <aplanas@suse.com>
+
+- Re-format the spec file
+- Add a README to explain the update process
+- Add _service file for download the assets and re-base the patches
+
 -------------------------------------------------------------------
 Fri Nov  8 23:43:13 UTC 2019 - Alberto Planas Dominguez <aplanas@suse.com>
 

rust.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package rust
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 # Copyright (c) 2019 Luke Jones, luke@ljones.dev
 #
 # All modifications and additions to the file contributed by third parties
@@ -20,35 +20,46 @@
 %global version_current 1.39.0
 %global version_previous 1.38.0
 %global version_bootstrap 1.38.0
+
 # some sub-packages are versioned independently
 %global rustfmt_version 1.4.8
 %global clippy_version 0.0.212
+
 # Build the rust target triple.
 # Some rust arches don't match what SUSE labels them.
 %global rust_arch %{_arch}
 %global abi gnu
+
 %ifarch armv7hl
 %global rust_arch armv7
 %global abi gnueabihf
 %endif
+
 %ifarch armv6hl
 %global rust_arch arm
 %global abi gnueabihf
 %endif
+
 %ifarch ppc
 %global rust_arch powerpc
 %endif
+
 %ifarch ppc64
 %global rust_arch powerpc64
 %endif
+
 %ifarch ppc64le
 %global rust_arch powerpc64le
 %endif
-# Must restrict the x86 build to i686 since i586 is currently unsupported
+
+# Must restrict the x86 build to i686 since i586 is currently
+# unsupported
 %ifarch %{ix86}
 %global rust_arch i686
 %endif
+
 %global rust_triple %{rust_arch}-unknown-linux-%{abi}
+
 # All sources and bootstraps are fetched form here
 %global dl_url https://static.rust-lang.org/dist
 
@@ -56,10 +67,10 @@
 %global common_libdir %{_prefix}/lib
 %global rustlibdir %{common_libdir}/rustlib
 
-# Will build with distro LLVM by default, but the following
+# Will build with distro LLVM by default, but the following versions
-# versions do not have a version new enough, >= 6.0
+# do not have a version new enough, >= 6.0 add --without bundled_llvm
-# add --without bundled_llvm option, i.e. enable bundled_llvm by default
+# option, i.e. enable bundled_llvm by default Leap 42 to 42.3, SLE12
-# Leap 42 to 42.3, SLE12 SP1 to SLE12 SP3, Leap 15.0, SLE15 SP0
+# SP1 to SLE12 SP3, Leap 15.0, SLE15 SP0
 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 150000
 %bcond_without bundled_llvm
 %endif
@@ -71,9 +82,6 @@
 %bcond_without rls
 %endif
 
-# enable the --with-rust_bootstrap flag
-%bcond_with rust_bootstrap
-
 # Debuginfo can exhaust memory on these architecture workers
 %ifarch  %{arm} %{ix86}
 %define codegen_units --set rust.codegen-units=2
@@ -103,13 +111,16 @@
 # Exclude implicitly-scanned Provides, especially the libLLVM.so ones:
 %global __provides_exclude_from ^%{rustlibdir}/.*$
 
+# enable the --with-rust_bootstrap flag
+%bcond_with rust_bootstrap
+
 Name:           rust
 Version:        %{version_current}
 Release:        0
 Summary:        A systems programming language
 License:        MIT OR Apache-2.0
 Group:          Development/Languages/Rust
-Url:            https://www.rust-lang.org
+URL:            https://www.rust-lang.org
 Source0:        %{dl_url}/rustc-%{version}-src.tar.xz
 Source99:       %{name}-rpmlintrc
 Source100:      %{dl_url}/rust-%{version_bootstrap}-x86_64-unknown-linux-gnu.tar.xz
@@ -125,6 +136,15 @@ Patch0:         ignore-Wstring-conversion.patch
 # PATCH-FIX-UPSTREAM: fix rustdoc compilation: https://github.com/rust-lang/rust/issues/66224
 Patch1:         hopefully-fix-rustdoc-build.patch
 BuildRequires:  ccache
+BuildRequires:  curl
+BuildRequires:  fdupes
+BuildRequires:  git
+BuildRequires:  pkgconfig
+BuildRequires:  procps
+BuildRequires:  python3-base
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(zlib)
 # Leap 42 to 42.3, SLE12 SP1, SP2
 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120200
 # In these distros cmake is 2.x, so we need cmake3 for building llvm.
@@ -133,8 +153,6 @@ BuildRequires:  cmake3
 # cmake got upgraded to 3.5 in SLE-12 SP2
 BuildRequires:  cmake
 %endif
-BuildRequires:  curl
-BuildRequires:  fdupes
 # In all of SLE12, the default gcc is 4.8.  Rust's LLVM wants 5.1 at least.
 # So, we'll just use gcc7.
 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120500
@@ -142,74 +160,67 @@ BuildRequires:  gcc7-c++
 %else
 BuildRequires:  gcc-c++
 %endif
-BuildRequires:  git
+# The following requires must mirror: LIBSSH2_SYS_USE_PKG_CONFIG
-BuildRequires:  pkgconfig
-BuildRequires:  procps
-BuildRequires:  python3-base
-BuildRequires:  pkgconfig(libcurl)
-# The following requires must mirror:
-# LIBSSH2_SYS_USE_PKG_CONFIG
 %if !%with rust_bootstrap || 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120500
 BuildRequires:  pkgconfig(libssh2) >= 1.4.3
 %endif
-BuildRequires:  pkgconfig(openssl)
+# Real LLVM minimum version should be 7.x, but rust has a fallback
-BuildRequires:  pkgconfig(zlib)
+# mode
-# The compiler is not generally useful without the std library installed
+%if !%with bundled_llvm
-# And the std library is exactly specific to the version of the compiler
+BuildRequires:  llvm-devel >= 6.0
+%endif
+%if !%with rust_bootstrap
+# We will now package cargo using the version number of rustc since it
+# is being built from rust sources. Old cargo packages have a 0.x
+# number
+BuildRequires:  cargo <= %{version_current}
+BuildRequires:  cargo >= %{version_previous}
+BuildRequires:  rust <= %{version_current}
+BuildRequires:  rust >= %{version_previous}
+BuildRequires:  rust-std-static <= %{version_current}
+BuildRequires:  rust-std-static >= %{version_previous}
+%endif
+# The compiler is not generally useful without the std library
+# installed and the std library is exactly specific to the version of
+# the compiler
 Requires:       %{name}-std-static = %{version}
 Recommends:     %{name}-doc
 Recommends:     cargo
 Conflicts:      rust
 Conflicts:      rustc-bootstrap
-# Restrict the architectures as building rust relies on being initially
+# Restrict the architectures as building rust relies on being
-# bootstrapped before we can build the n+1 release
+# initially bootstrapped before we can build the n+1 release
 ExclusiveArch:  x86_64 %{arm} aarch64 ppc ppc64 ppc64le s390x %{ix86}
 %ifarch %{ix86}
 ExclusiveArch:  i686
 %endif
-# Real LLVM minimum version should be 7.x, but rust has a fallback mode
-%if !%with bundled_llvm
-BuildRequires:  llvm-devel >= 6.0
-%endif
-%if !%with rust_bootstrap
-# We will now package cargo using the version number of rustc since
-# it is being built from rust sources. Old cargo packages have a 0.x number
-BuildRequires:  cargo <= %{version_current}
-BuildRequires:  cargo >= %{version_previous}
-BuildRequires:  rust <= %{version_current}
-BuildRequires:  rust >= %{version_previous}
-# This must be bumped to rust-std-static after 1.27.2 is in mainstream
-BuildRequires:  rust-std-static <= %{version_current}
-BuildRequires:  rust-std-static >= %{version_previous}
-%endif
 
 %description
-Rust is a systems programming language focused on three goals:
+Rust is a systems programming language focused on three goals: safety,
-safety, speed, and concurrency. It maintains these goals without
+speed, and concurrency. It maintains these goals without having a
-having a garbage collector, making it a useful language for a
+garbage collector, making it a useful language for a number of use
-number of use cases other languages are not good at: embedding
+cases other languages are not good at: embedding in other languages,
-in other languages, programs with specific space and time
+programs with specific space and time requirements, and writing
-requirements, and writing low-level code, like device drivers
+low-level code, like device drivers and operating systems. It improves
-and operating systems. It improves on current languages targeting
+on current languages targeting this space by having a number of
-this space by having a number of compile-time safety checks
+compile-time safety checks that produce no runtime overhead, while
-that produce no runtime overhead, while eliminating all
+eliminating all data races. Rust also aims to achieve "zero-cost
-data races. Rust also aims to achieve "zero-cost abstractions",
+abstractions", even though some of these abstractions feel like those
-even though some of these abstractions feel like those of a
+of a high-level language. Even then, Rust still allows precise control
-high-level language. Even then, Rust still allows precise
+like a low-level language would.
-control like a low-level language would.
 
 %package -n rust-std-static
 Summary:        Standard library for Rust
 License:        MIT OR Apache-2.0
 Group:          Development/Languages/Rust
 Requires:       %{name} = %{version}
-Obsoletes:      rust-std < %{version}
 Conflicts:      rust-std < %{version}
+Obsoletes:      rust-std < %{version}
 Provides:       rust-std = %{version}
 
 %description -n rust-std-static
-This package includes the standard libraries for building
+This package includes the standard libraries for building applications
-applications written in Rust.
+written in Rust.
 
 %package -n rust-doc
 Summary:        Rust documentation
@@ -261,8 +272,8 @@ Requires:       %{name}-src = %{version}
 The RLS provides a server that runs in the background, providing IDEs,
 editors, and other tools with information about Rust programs. It
 supports functionality such as 'goto definition', symbol search,
-reformatting, and code completion, and enables renaming and refactorings.
+reformatting, and code completion, and enables renaming and
-It can be used with an IDE such as Gnome-Builder.
+refactorings.  It can be used with an IDE such as Gnome-Builder.
 
 %package -n rust-analysis
 Summary:        Compiler analysis data for the Rust standard library
@@ -271,9 +282,10 @@ Group:          Development/Languages/Rust
 Requires:       rust-std-static = %{version}
 
 %description -n rust-analysis
-This package contains analysis data files produced with rustc's -Zsave-analysis
+This package contains analysis data files produced with rustc's
-feature for the Rust standard library. The RLS (Rust Language Server) uses this
+-Zsave-analysis feature for the Rust standard library. The RLS (Rust
-data to provide information about the Rust standard library.
+Language Server) uses this data to provide information about the Rust
+standard library.
 
 %package -n rustfmt
 Summary:        Code formatting tool for Rust lang
@@ -281,6 +293,8 @@ License:        MIT OR Apache-2.0
 Group:          Development/Languages/Rust
 Requires:       %{name} = %{version}
 Requires:       cargo = %{version}
+Provides:       cargo-fmt = %{rustfmt_version}
+Provides:       rustfmt = %{rustfmt_version}
 %if 0%{?suse_version} && 0%{?suse_version} < 1500
 # Legacy SUSE-only form
 Supplements:    packageand(%{name}:cargo)
@@ -288,8 +302,6 @@ Supplements:    packageand(%{name}:cargo)
 # Standard form
 Supplements:    (%{name} and cargo)
 %endif
-Provides:       cargo-fmt = %{rustfmt_version}
-Provides:       rustfmt = %{rustfmt_version}
 
 %description -n rustfmt
 A tool for formatting Rust code according to style guidelines.
@@ -311,11 +323,11 @@ Summary:        The Rust package manager
 License:        MIT OR Apache-2.0
 Group:          Development/Languages/Rust
 Requires:       %{name} = %{version}
-Obsoletes:      cargo < %{version}
 Conflicts:      cargo < %{version}
-Provides:       rustc:%{_bindir}/cargo = %{version}
+Obsoletes:      cargo < %{version}
-Obsoletes:      cargo-vendor < %{version}
 Conflicts:      cargo-vendor < %{version}
+Obsoletes:      cargo-vendor < %{version}
+Provides:       rustc:%{_bindir}/cargo = %{version}
 
 %description -n cargo
 Cargo downloads dependencies of Rust projects and compiles it.
@@ -586,7 +598,7 @@ rm -rf %{buildroot}/home
 
 %if %{with rls}
 %files -n rls
-%if 0%{?suse_version} == 1315
+%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
 %doc src/tools/rls/LICENSE-{APACHE,MIT}
 %else
 %license src/tools/rls/LICENSE-{APACHE,MIT}
@@ -599,7 +611,7 @@ rm -rf %{buildroot}/home
 %{rustlibdir}/%{rust_triple}/analysis/
 
 %files -n rustfmt
-%if 0%{?suse_version} == 1315
+%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
 %doc src/tools/rustfmt/LICENSE-{APACHE,MIT}
 %else
 %license src/tools/rustfmt/LICENSE-{APACHE,MIT}
@@ -609,7 +621,7 @@ rm -rf %{buildroot}/home
 %{_bindir}/rustfmt
 
 %files -n clippy
-%if 0%{?suse_version} == 1315
+%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
 %doc src/tools/clippy/LICENSE-{APACHE,MIT}
 %else
 %license src/tools/clippy/LICENSE-{APACHE,MIT}
@@ -619,7 +631,7 @@ rm -rf %{buildroot}/home
 %{_bindir}/clippy-driver
 
 %files -n cargo
-%if 0%{?suse_version} == 1315
+%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
 %doc src/tools/cargo/LICENSE-{APACHE,MIT,THIRD-PARTY}
 %else
 %license src/tools/cargo/LICENSE-{APACHE,MIT,THIRD-PARTY}