#4 Obsolete maven-wagon-ssh properly
Merged 4 years ago by churchyard. Opened 4 years ago by churchyard.
rpms/ churchyard/maven-wagon obsolete-ssh  into  master

file modified
+9 -1
@@ -4,7 +4,7 @@ 

  Name:           maven-wagon

  Epoch:          0

  Version:        3.3.3

- Release:        3%{?dist}

+ Release:        4%{?dist}

  Summary:        Tools to manage artifacts and deployment

  License:        ASL 2.0

  URL:            http://maven.apache.org/wagon
@@ -36,7 +36,12 @@ 

  

  Obsoletes:      %{name}-manual < %{epoch}:%{version}-%{release}

  Obsoletes:      %{name}-provider-test < %{epoch}:%{version}-%{release}

+ %if %{without scm}

  Obsoletes:      %{name}-scm < %{epoch}:%{version}-%{release}

+ %endif

+ %if %{without ssh}

+ Obsoletes:      %{name}-ssh < %{epoch}:%{version}-%{release}

+ %endif

  

  %description

  Maven Wagon is a transport abstraction that is used in Maven's
@@ -191,6 +196,9 @@ 

  %doc LICENSE NOTICE DEPENDENCIES

  

  %changelog

+ * Sat Sep 14 2019 Miro Hrončok <mhroncok@redhat.com> - 0:3.3.3-4

+ - Obsolete maven-wagon-ssh properly (#1752165)

+ 

  * Thu Aug 29 2019 Fabio Valentini <decathorpe@gmail.com> - 0:3.3.3-3

  - Disable SSH functionality.

  

Right. I forgot to check if Obsoletes are there when I flipped the bconds. I guess the original commits didn't care about them since they came from the modular branch.

Changes look good, feel free to merge and build for master (and f31, since this change happened pre-branching or pre-beta freeze, I can't remember).

Pull-Request has been merged by churchyard

4 years ago