#2 Obsoletes xmms2-mad
Merged 4 years ago by spot. Opened 5 years ago by xavierb.
rpms/ xavierb/xmms2 master  into  master

file modified
+8 -2
@@ -4,7 +4,7 @@ 

  Name:			xmms2

  Summary: 		A modular audio framework and plugin architecture

  Version:		0.8

- Release:		62%{?dist}

+ Release:		63%{?dist}

  License:		LGPLv2+ and GPLv2+ and BSD

  # We can't use the upstream source tarball as-is, because it includes an mp4 decoder.

  # Also, the ogg sample included is not under a FOSS license.
@@ -80,6 +80,10 @@ 

  BuildRequires:		gcc

  BuildRequires:		gcc-c++

  

+ Obsoletes:		xmms2-mad < 0.8-26

+ Provides:		xmms2-mad = %{version}-%{release}

+ 

+ 

  %description

  XMMS2 is an audio framework, but it is not a general multimedia player - it 

  will not play videos. It has a modular framework and plugin architecture for 
@@ -236,12 +240,14 @@ 

  %{_bindir}/nyxmms2

  

  %changelog

+ * Mon Jun 03 2019 Xavier Bachelot <xavier@bachelot.org> - 0.8-63

+ - Obsoletes xmms2-mad for proper upgrade path.

+ 

  * Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 0.8-62

  - Perl 5.30 rebuild

  

  * Tue May 28 2019 Petr Pisar <ppisar@redhat.com> - 0.8-61

  - Build-require python2 because waf uses it (bug #1711261)

- 

  * Mon Apr 15 2019 Xavier Bachelot <xavier@bachelot.org> - 0.8-60

  - Add BuildRequires: libmad-devel for mad plugin.

  

This is a follow up to my previous pull request.
When both xmms2 and xmms2-mad package from that famous third party repository are installed, there is a file conflict when upgrading to the new xmms2 package which ships the mad plugin. Adding Obsoletes/Provides in order to remove the conflicting xmms2-mad package fixes this issue.
Sorry for missing that in the previous PR.

Ping again. I've just rebased against master.

Ping again. I've just rebased the PR against current master.

rebased onto 1a486d7

4 years ago

Pull-Request has been merged by spot

4 years ago