From 71dd5cf6c8b162955a831a70ad1b615068041fcf Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 9 Jan 2024 15:52:02 +0100
Subject: [PATCH] Fix install conflict with older versions.

---
 .pipewire.metadata |  1 +
 pipewire.spec      | 16 +++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 .pipewire.metadata

diff --git a/.pipewire.metadata b/.pipewire.metadata
new file mode 100644
index 0000000..2d7b3f6
--- /dev/null
+++ b/.pipewire.metadata
@@ -0,0 +1 @@
+56d778a84d694db8c7b38e2753a6fe21f6b4d274 pipewire-1.0.0.tar.gz
diff --git a/pipewire.spec b/pipewire.spec
index 5f6d4ee..a8f77ce 100644
--- a/pipewire.spec
+++ b/pipewire.spec
@@ -9,7 +9,7 @@
 %global ms_version   0.4.2
 
 # For rpmdev-bumpspec and releng automation
-%global baserelease 1
+%global baserelease 2
 
 #global snapdate   20210107
 #global gitcommit  b17db2cebc1a5ab2c01851d29c05f79cd2f262bb
@@ -83,7 +83,7 @@ Patch0001:	0001-gst-keep-track-of-node-ports.patch
 
 ## upstreamable patches
 
-## fedora patches
+## rhel patches
 
 BuildRequires:  gettext
 BuildRequires:  meson >= 0.59.0
@@ -215,7 +215,7 @@ Recommends:     %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 # Fixed jack subpackages
 Conflicts:      %{name}-libjack < 0.3.13-6
-Conflicts:      %{name}-jack-audio-connection-kit < 0.3.13-6
+Conflicts:      %{name}-jack-audio-connection-kit < 0.3.72-1
 # Replaces libjack subpackage
 Obsoletes:      %{name}-libjack < 0.3.19-2
 Provides:       %{name}-libjack = %{version}-%{release}
@@ -411,12 +411,6 @@ This package contains the mysofa support for PipeWire filter-chain.
 %prep
 %autosetup -p1 %{?snapdate:-n %{name}-%{gitcommit}}
 
-
-%if %{with media-session}
-mkdir subprojects/packagefiles
-cp %{SOURCE1} subprojects/packagefiles/
-%endif
-
 %build
 %meson \
     -D docs=enabled -D man=enabled -D gstreamer=enabled -D systemd=enabled	\
@@ -817,6 +811,10 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
 %endif
 
 %changelog
+* Tue Jan 09 2024 Wim Taymans <wtaymans@redhat.com> - 1.0.0-2
+- Fix install conflict with older versions.
+- Resolves: RHEL-17641
+
 * Mon Jan 08 2024 Wim Taymans <wtaymans@redhat.com> - 1.0.0-1
 - Update to version 1.0.0
 - Add patch to avoid crash in deviceprovider.