SHA256
1
0
forked from pool/rust

Accepting request 437035 from home:KGronlund:branches:devel:languages:rust

- Update to 1.11
  + Add support for cdylib crate types
- Remove merged patches:
  * 0001-Fix-misleading-intentation-errors-on-gcc-6.0.patch
  * 0002-Fix-GCC-6-misleading-indentation-error-in-hoedown.patch

OBS-URL: https://build.opensuse.org/request/show/437035
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=5
This commit is contained in:
Kristoffer Gronlund
2016-10-24 07:34:54 +00:00
committed by Git OBS Bridge
parent 1f520ca6a0
commit 743ec85b28
7 changed files with 61 additions and 84 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package rust
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -14,11 +14,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%global rustc_version 1_10
%global rustc_build_version 1_9
%global rustc_version 1_11
%global rustc_build_version 1_10
Name: rust
Version: 1.10.0
Version: 1.11.0
Release: 0
Summary: A systems programming language
License: MIT or Apache-2.0
@@ -26,8 +28,7 @@ Group: Development/Languages/Other
Url: http://www.rust-lang.org
ExclusiveArch: %ix86 x86_64
# renamed to match upstream and other distros
Provides: rustc-%{rustc_version} = %{version}
Obsoletes: rustc-%{rustc_version} <= 1.5
Obsoletes: rustc-1_9
Provides: rustc = %{version}
Provides: rustc-stable = %{version}
#FIXME: currently there's no way to have rustc and rustc-beta installed
@@ -42,12 +43,10 @@ Source0: https://static.rust-lang.org/dist/rustc-%{version}-src.tar.gz
#use snap.sh to update following lines from "magic" constanst from src/snapshots.txt
Source100: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM: Fix misleading intentation errors on gcc 6.0
Patch1: 0001-Fix-misleading-intentation-errors-on-gcc-6.0.patch
# PATCH-FIX-UPSTREAM: Fix GCC 6 misleading indentation error in hoedown
Patch2: 0002-Fix-GCC-6-misleading-indentation-error-in-hoedown.patch
# PATCH-FIX-OPENSUSE: Disable embedding timestamp information
Patch3: 0003-Disable-embedding-timestamp-information.patch
Patch1: 0003-Disable-embedding-timestamp-information.patch
# PATCH-FIX-OPENSUSE: Set DT_SONAME when building dylibs
Patch2: add-soname.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -55,9 +54,9 @@ BuildRequires: curl
%if 0%{?suse_version}
BuildRequires: fdupes
%endif
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: python
BuildRequires: cmake
%description
Rust is a systems programming language focused on three goals:
@@ -84,9 +83,9 @@ Documentation for the Rust language.
%package gdb
Summary: Gdb integration for rust binaries
Group: Development/Languages/Other
Provides: rustc:/usr/bin/rust-gdb
Provides: rust-%{rustc_version}-gdb = %{version}
Obsoletes: rust-%{rustc_build_version}-gdb
Provides: rustc:/usr/bin/rust-gdb
Obsoletes: rust-1_9-gdb
Supplements: packageand(%{name}:gdb)
%description gdb
@@ -97,7 +96,6 @@ invoking gdb on rust binaries.
%setup -q -n rustc-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
export CPPFLAGS="$RPM_OPT_FLAGS" # eliminate complain from RPMlint