/[packages]/cauldron/rust/current/SPECS/rust.spec

Diff of /cauldron/rust/current/SPECS/rust.spec

Parent Directory | Revision Log | View Patch Patch

-revision 1357860 by akien,
Thu Dec  6 18:58:53 2018 UTC
+revision 1357861 by akien,
Fri Jan 18 08:40:20 2019 UTC
 Line 14
  # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
  # or nightly wants some beta-YYYY-MM-DD
  # Note that cargo matches the program version here, not its crate version.
- %global bootstrap_rust 1.30.0
+ %global bootstrap_rust 1.31.1
- %global bootstrap_cargo 1.30.0
+ %global bootstrap_cargo 1.31.0
  %global bootstrap_channel %{bootstrap_rust}
- %global bootstrap_date 2018-10-25
+ %global bootstrap_date 2018-12-20
  # Only the specified arches will use bootstrap binaries.
  #global bootstrap_arches %%{rust_arches}
 Line 57
  %bcond_with lldb
  %endif
- # Some sub-packages are versioned independently of the rust compiler and runtime itself.
- # Also beware that if any of these are not changed in a version bump, then the release
- # number should still increase, not be reset to 1!
- %global rustc_version 1.31.0
- %global cargo_version 1.31.0
- %global rustfmt_version 1.0.0
- %global rls_version 1.31.6
- %global clippy_version 0.0.212
  Name:           rust
- Version:        %{rustc_version}
+ Version:        1.32.0
- Release:        %mkrel 5
+ Release:        %mkrel 1
  Summary:        The Rust Programming Language
  %if 0%{?mageia}
  Group:          Development/Other
-Line 79 
 URL:            https://www.rust-lang.or
+Line 70 
 URL:            https://www.rust-lang.or
  ExclusiveArch:  %{rust_arches}
  %if "%{channel}" == "stable"
- %global rustc_package rustc-%{rustc_version}-src
+ %global rustc_package rustc-%{version}-src
  %else
  %global rustc_package rustc-%{channel}-src
  %endif
  Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
- # https://github.com/rust-lang/rust/pull/56394
+ # https://github.com/rust-dev-tools/rls-analysis/pull/160
- Patch1:         0001-Deal-with-EINTR-in-net-timeout-tests.patch
+ Patch1:         0001-Try-to-get-the-target-triple-from-rustc-itself.patch
+ # https://github.com/rust-lang/rust/pull/57453
+ Patch2:         0001-lldb_batchmode.py-try-import-_thread-for-Python-3.patch
  # Get the Rust triple for any arch.
  %{lua: function rust_triple(arch)
-Line 134 
 Provides:       bundled(%{name}-bootstra
+Line 128 
 Provides:       bundled(%{name}-bootstra
  %else
  BuildRequires:  cargo >= %{bootstrap_cargo}
  %if 0%{?fedora} >= 27
- BuildRequires:  (%{name} >= %{bootstrap_rust} with %{name} <= %{rustc_version})
+ BuildRequires:  (%{name} >= %{bootstrap_rust} with %{name} <= %{version})
  %else
  BuildRequires:  %{name} >= %{bootstrap_rust}
- BuildConflicts: %{name} > %{rustc_version}
+ BuildConflicts: %{name} > %{version}
  %endif
  %global local_rust_root %{_prefix}
  %endif
-Line 200 
 Provides:       bundled(libbacktrace) =
+Line 194 
 Provides:       bundled(libbacktrace) =
  Provides:       bundled(miniz) = 1.16~beta+r1
  # Virtual provides for folks who attempt "dnf install rustc"
- Provides:       rustc = %{rustc_version}-%{release}
+ Provides:       rustc = %{version}-%{release}
- Provides:       rustc%{?_isa} = %{rustc_version}-%{release}
+ Provides:       rustc%{?_isa} = %{version}-%{release}
  # Always require our exact standard library
- Requires:       %{name}-std-static%{?_isa} = %{rustc_version}-%{release}
+ Requires:       %{name}-std-static%{?_isa} = %{version}-%{release}
  # The C compiler is needed at runtime just for linking.  Someday rustc might
  # invoke the linker directly, and then we'll only need binutils.
-Line 274 
 This package includes the common functio
+Line 268 
 This package includes the common functio
  Summary:        GDB pretty printers for Rust
  BuildArch:      noarch
  Requires:       gdb
- Requires:       %{name}-debugger-common = %{rustc_version}-%{release}
+ Requires:       %{name}-debugger-common = %{version}-%{release}
  %if 0%{?mageia} == 6
  # (akien) Handle moved files between our old Mageia package and this Fedora-based one
-Line 300 
 Requires:       python-lldb
+Line 294 
 Requires:       python-lldb
  %else
  Requires:       python2-lldb
  %endif
- Requires:       %{name}-debugger-common = %{rustc_version}-%{release}
+ Requires:       %{name}-debugger-common = %{version}-%{release}
  %description lldb
  This package includes the rust-lldb script, which allows easier debugging of Rust
-Line 323 
 its standard library.
+Line 317 
 its standard library.
  %package -n cargo
  Summary:        Rust's package manager and build tool
- Version:        %{cargo_version}
  %if %with bundled_libgit2
  Provides:       bundled(libgit2) = 0.27
  %endif
-Line 346 
 and ensure that you'll always get a repe
+Line 339 
 and ensure that you'll always get a repe
  %package -n cargo-doc
  Summary:        Documentation for Cargo
- Version:        %{cargo_version}
  BuildArch:      noarch
  # Cargo no longer builds its own documentation
  # https://github.com/rust-lang/cargo/pull/4904
- Requires:       rust-doc = %{rustc_version}-%{release}
+ Requires:       rust-doc = %{version}-%{release}
  %if 0%{?mageia}
  Obsoletes:      cargo-doc < 1.26.0-1
-Line 362 
 This package includes HTML documentation
+Line 354 
 This package includes HTML documentation
  %package -n rustfmt
  Summary:        Tool to find and fix Rust formatting issues
- Version:        %{rustfmt_version}
  Requires:       cargo
  # The component/package was rustfmt-preview until Rust 1.31.
  Obsoletes:      rustfmt-preview < 1.0.0
- Provides:       rustfmt-preview = %{rustfmt_version}-%{release}
+ Provides:       rustfmt-preview = %{version}-%{release}
  %description -n rustfmt
  A tool for formatting Rust code according to style guidelines.
-Line 375 
 A tool for formatting Rust code accordin
+Line 366 
 A tool for formatting Rust code accordin
  %package -n rls
  Summary:        Rust Language Server for IDE integration
- Version:        %{rls_version}
- Provides:       rls = %{rls_version}
  %if %with bundled_libgit2
  Provides:       bundled(libgit2) = 0.27
  %endif
-Line 385 
 Provides:       bundled(libssh2) = 1.8.1
+Line 374 
 Provides:       bundled(libssh2) = 1.8.1
  %endif
  Requires:       rust-analysis
  # /usr/bin/rls is dynamically linked against internal rustc libs
- Requires:       %{name}%{?_isa} = %{rustc_version}-%{release}
+ Requires:       %{name}%{?_isa} = %{version}-%{release}
  # The component/package was rls-preview until Rust 1.31.
  Obsoletes:      rls-preview < 1.31.6
- Provides:       rls-preview = %{rls_version}-%{release}
+ Provides:       rls-preview = %{version}-%{release}
  %description -n rls
  The Rust Language Server provides a server that runs in the background,
-Line 400 
 reformatting, and code completion, and e
+Line 389 
 reformatting, and code completion, and e
  %package -n clippy
  Summary:        Lints to catch common mistakes and improve your Rust code
- Version:        %{clippy_version}
- Provides:       clippy = %{clippy_version}
  Requires:       cargo
  # /usr/bin/clippy-driver is dynamically linked against internal rustc libs
- Requires:       %{name}%{?_isa} = %{rustc_version}-%{release}
+ Requires:       %{name}%{?_isa} = %{version}-%{release}
  # The component/package was clippy-preview until Rust 1.31.
  Obsoletes:      clippy-preview <= 0.0.212
- Provides:       clippy-preview = %{clippy_version}-%{release}
+ Provides:       clippy-preview = %{version}-%{release}
  %description -n clippy
  A collection of lints to catch common mistakes and improve your Rust code.
-Line 425 
 useful as a reference for code completio
+Line 412 
 useful as a reference for code completio
  %package analysis
  Summary:        Compiler analysis data for the Rust standard library
- Requires:       rust-std-static%{?_isa} = %{rustc_version}-%{release}
+ Requires:       rust-std-static%{?_isa} = %{version}-%{release}
  %description analysis
  This package contains analysis data files produced with rustc's -Zsave-analysis
-Line 445 
 test -f '%{local_rust_root}/bin/rustc'
+Line 432 
 test -f '%{local_rust_root}/bin/rustc'
  %setup -q -n %{rustc_package}
+ pushd vendor/rls-analysis
  %patch1 -p1
+ popd
+ %patch2 -p1
  %if "%{python}" == "python3"
  sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
  %endif
- # We're disabling jemalloc, but rust-src still wants it.
- # rm -rf src/jemalloc/
  %if %without bundled_llvm
  rm -rf src/llvm/
  %endif
-Line 486 
 sed -i.ffi -e '$a #[link(name = "ffi")]
+Line 473 
 sed -i.ffi -e '$a #[link(name = "ffi")]
  # The configure macro will modify some autoconf-related files, which upsets
  # cargo when it tries to verify checksums in those files.  If we just truncate
  # that file list, cargo won't have anything to complain about.
- find src/vendor -name .cargo-checksum.json \
+ find vendor -name .cargo-checksum.json \
    -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+'
-Line 532 
 export LIBSSH2_SYS_USE_PKG_CONFIG=1
+Line 519 
 export LIBSSH2_SYS_USE_PKG_CONFIG=1
    %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
      %{!?llvm_has_filecheck: --disable-codegen-tests} \
      %{!?with_llvm_static: --enable-llvm-link-shared } } \
-   --disable-jemalloc \
    --disable-rpath \
    %{enable_debuginfo} \
    --enable-extended \

 Legend:



Removed from v.1357860
 


changed lines


 
Added in v.1357861
 Legend:



Removed from v.1357860
 


changed lines


 
Added in v.1357861
-Removed from v.1357860
+Added in v.1357861

	ViewVC Help
Powered by ViewVC 1.1.30