From 31835ab1fd299a2b47ca59486ae2590dbdef9f01 Mon Sep 17 00:00:00 2001
From: Antoine Martin <totaam@xpra.org>
Date: Mon, 6 Jul 2020 16:24:49 +0000
Subject: [PATCH] #2827 fix rpm conflicts with other repositories providing
 x264 or ffmpeg

git-svn-id: https://xpra.org/svn/Xpra/trunk@26905 3bb7dfac-3a0b-4e04-842a-767bc560f471
---
 rpmbuild/ffmpeg-xpra.spec | 12 +++++++++++-
 rpmbuild/x264-xpra.spec   | 17 ++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/rpmbuild/ffmpeg-xpra.spec b/rpmbuild/ffmpeg-xpra.spec
index fadfe531de..fc9b12530e 100644
--- a/rpmbuild/ffmpeg-xpra.spec
+++ b/rpmbuild/ffmpeg-xpra.spec
@@ -3,7 +3,7 @@
 %global   real_name ffmpeg
 Name:	     ffmpeg-xpra
 Version:     4.3
-Release:     1%{?dist}
+Release:     2%{?dist}
 Summary:     ffmpeg libraries for xpra
 
 Group:       Applications/Multimedia
@@ -11,11 +11,15 @@ License:     GPL
 URL:	     http://www.ffmpeg.org
 Source0:     http://www.ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
 BuildRoot:   %(mktemp -ud %{_tmppath}/%{real_name}-%{version}-%{release}-XXXXXX)
+AutoProv:    0
+AutoReq:     0
 
 BuildRequires:	x264-xpra-devel
 BuildRequires:	libva-devel
 BuildRequires:	yasm
 
+#%global __requires_exclude ^libx264.so.*$
+
 
 %description
 ffmpeg libraries for xpra
@@ -26,6 +30,8 @@ Summary:   Development package for %{real_name}
 Group:     Development/libraries
 Requires:  %{name} = %{version}-%{release}
 Requires:  pkgconfig
+Requires:  ffmpeg-xpra = %{version}
+AutoReq:   0
 
 %description devel
 This package contains the development files for %{name}.
@@ -164,6 +170,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 06 2020 Antoine Martin <antoine@xpra.org> 4.3-2
+- rebuild against 10-bit x264
+- remove autoreq / autoprov
+
 * Wed Jun 17 2020 Antoine Martin <antoine@xpra.org> 4.3-1
 - new upstream release
 
diff --git a/rpmbuild/x264-xpra.spec b/rpmbuild/x264-xpra.spec
index 802d4fe8e8..a363476bc6 100644
--- a/rpmbuild/x264-xpra.spec
+++ b/rpmbuild/x264-xpra.spec
@@ -1,8 +1,7 @@
 %define _build_id_links none
 
 Name:	     x264-xpra
-Version:     20200510
-%define SNAPSHOTTYPE -stable
+Version:     20200706
 %if 0%{?beta} < 1
 Release:     1%{?dist}
 %else
@@ -13,8 +12,9 @@ Summary:     x264 library for xpra
 Group:       Applications/Multimedia
 License:     GPL
 URL:	     http://www.videolan.org/developers/x264.html
-Source0:     http://download.videolan.org/pub/x264/snapshots/x264-snapshot-%{version}-2245%{?SNAPSHOTTYPE}.tar.bz2
+Source0:     http://download.videolan.org/pub/x264/snapshots/x264-%{version}.tar.bz2
 BuildRoot:   %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+AutoProv:    0
 
 BuildRequires:	yasm
 
@@ -35,13 +35,15 @@ Summary: Development files for the x264 library
 Group: Development/libraries
 Requires: %{name} = %{version}
 Requires: pkgconfig
+Requires: x264-xpra = %{version}
+AutoReq:  0
 
 %description devel
 This package contains the development files for %{name}.
 
 
 %prep
-%setup -q -n x264-snapshot-%{version}-2245%{?SNAPSHOTTYPE}
+%setup -q -n x264-master
 
 
 %build
@@ -59,8 +61,9 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-# remove executable
+# remove executable and bash completion:
 rm %{buildroot}/usr/bin/x264
+rm %{buildroot}/usr/share/bash-completion/completions/x264
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -82,6 +85,10 @@ rm -rf %{buildroot}
 %{_libdir}/xpra/pkgconfig/x264.pc
 
 %changelog
+* Mon Jul 06 2020 Antoine Martin <antoine@xpra.org> 20200706-1
+- use a newer snapshot
+- remove autoreq / autoprov
+
 * Mon May 11 2017 Antoine Martin <antoine@xpra.org> 20200510-1
 - use a newer snapshot