From c1650db63ab6555b99dbd4ec9782b48c387488fdc3eb341d76c1ab7496fd7a08 Mon Sep 17 00:00:00 2001 From: William Brown Date: Tue, 17 Aug 2021 01:22:54 +0000 Subject: [PATCH 1/2] Accepting request 912515 from home:firstyear:branches:devel:languages:rust - Change expression of dependency requirements to resolve zypper dup issues OBS-URL: https://build.opensuse.org/request/show/912515 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=297 --- rust.changes | 6 ++++++ rust.spec | 26 ++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/rust.changes b/rust.changes index fdc06a1..37be957 100644 --- a/rust.changes +++ b/rust.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 16 02:27:30 UTC 2021 - William Brown + +- Change expression of dependency requirements to resolve zypper dup + issues + ------------------------------------------------------------------- Fri Jul 30 03:40:08 UTC 2021 - William Brown diff --git a/rust.spec b/rust.spec index 47aa154..061dff7 100644 --- a/rust.spec +++ b/rust.spec @@ -20,6 +20,11 @@ %global version_suffix 1.54 %global version_current 1.54.0 +%define obsolete_rust_versioned() \ +Obsoletes: %{1}1.53%{?2:-%{2}} \ +Obsoletes: %{1}1.52%{?2:-%{2}} \ +Obsoletes: %{1}1.51%{?2:-%{2}} + # === rust arch support tiers === # https://doc.rust-lang.org/nightly/rustc/platform-support.html # tl;dr only aarch64, x86_64 and i686 are guaranteed to work. @@ -46,8 +51,7 @@ URL: https://www.rust-lang.org Source: README Source99: %{name}-rpmlintrc Requires: rust%{version_suffix} -Conflicts: rust < %{version} -Obsoletes: rust < %{version} +%obsolete_rust_versioned rust %description Rust is a systems programming language focused on three goals: safety, @@ -68,10 +72,8 @@ Summary: Gdb integration for rust binaries License: Apache-2.0 OR MIT Group: Development/Languages/Rust Requires: rust = %{version} -Requires: rust%{version_suffix} Requires: rust%{version_suffix}-gdb -Conflicts: rust-gdb < %{version} -Obsoletes: rust-gdb < %{version} +%obsolete_rust_versioned rust gdb %if 0%{?suse_version} && 0%{?suse_version} < 1500 # Legacy SUSE-only form @@ -85,21 +87,15 @@ Supplements: (rust and gdb) This subpackage provides pretty printers and a wrapper script for invoking gdb on rust binaries. - - - - - # As this is masked by tier1, this is arch specific even if it has no content. + %package -n rls Summary: Language server for Rust lang License: Apache-2.0 OR MIT Group: Development/Languages/Rust Requires: rls%{version_suffix} Requires: rust = %{version} -Requires: rust%{version_suffix} -Conflicts: rls < %{version} -Obsoletes: rls < %{version} +%obsolete_rust_versioned rls %description -n rls The RLS provides a server that runs in the background, providing IDEs, @@ -114,9 +110,7 @@ License: Apache-2.0 OR MIT Group: Development/Languages/Rust Requires: cargo%{version_suffix} Requires: rust = %{version} -Requires: rust%{version_suffix} -Conflicts: cargo < %{version} -Obsoletes: cargo < %{version} +%obsolete_rust_versioned cargo %description -n cargo Cargo downloads dependencies of Rust projects and compiles it. From 65dab19503b01ecb0a87ff1a4b72e41a1c6b651730a3246b2abd7337e5aa1828 Mon Sep 17 00:00:00 2001 From: William Brown Date: Fri, 10 Sep 2021 05:55:45 +0000 Subject: [PATCH 2/2] Accepting request 917861 from home:firstyear:branches:devel:languages:rust - Update to version 1.55 OBS-URL: https://build.opensuse.org/request/show/917861 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=298 --- rust.changes | 5 +++++ rust.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rust.changes b/rust.changes index 37be957..a317fc1 100644 --- a/rust.changes +++ b/rust.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 10 03:07:24 UTC 2021 - William Brown + +- Update to version 1.55 + ------------------------------------------------------------------- Mon Aug 16 02:27:30 UTC 2021 - William Brown diff --git a/rust.spec b/rust.spec index 061dff7..26ea4f8 100644 --- a/rust.spec +++ b/rust.spec @@ -17,10 +17,11 @@ # -%global version_suffix 1.54 -%global version_current 1.54.0 +%global version_suffix 1.55 +%global version_current 1.55.0 %define obsolete_rust_versioned() \ +Obsoletes: %{1}1.54%{?2:-%{2}} \ Obsoletes: %{1}1.53%{?2:-%{2}} \ Obsoletes: %{1}1.52%{?2:-%{2}} \ Obsoletes: %{1}1.51%{?2:-%{2}} @@ -87,6 +88,7 @@ Supplements: (rust and gdb) This subpackage provides pretty printers and a wrapper script for invoking gdb on rust binaries. + # As this is masked by tier1, this is arch specific even if it has no content. %package -n rls