[plex-media-player] More macro changes
by Leigh Scott
commit 1b7d40f126f34b851f35b92ff58b1ce8f0e21277
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Nov 6 15:53:36 2019 +0000
More macro changes
plex-media-player.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plex-media-player.spec b/plex-media-player.spec
index b105ed3..dcb119f 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -117,10 +117,10 @@ install -pm0755 build/src/plexmediaplayer %{buildroot}%{_bindir}/plexmediaplayer
install -pm0755 build/src/pmphelper %{buildroot}%{_bindir}/pmphelper
install -pm0755 %{SOURCE6} %{buildroot}%{_bindir}/plexmediaplayer-standalone
-mkdir -p %{buildroot}%{_datadir}/metainfo
-install -pm0644 %{SOURCE2} %{buildroot}%{_datadir}/metainfo/
+mkdir -p %{buildroot}%{_metainfodir}/
+install -pm0644 %{SOURCE2} %{buildroot}%{_metainfodir}/
appstream-util validate-relax --nonet \
- %{buildroot}%{_datadir}/metainfo/plexmediaplayer.appdata.xml
+ %{buildroot}%{_metainfodir}/plexmediaplayer.appdata.xml
mkdir -p %{buildroot}%{_datadir}/plexmediaplayer/selinux
install -pm0644 %{SOURCE7} %{buildroot}%{_datadir}/plexmediaplayer/selinux/plexmediaplayer.te
@@ -195,7 +195,7 @@ update-desktop-database &> /dev/null || :
%{_sysconfdir}/polkit-1/localauthority/50-local.d/plexmediaplayer.pkla.disabled
%{_unitdir}/plexmediaplayer.service
%{_unitdir}/plexmediaplayer.target
-%{_datadir}/metainfo/plexmediaplayer.appdata.xml
+%{_metainfodir}/plexmediaplayer.appdata.xml
%{_datadir}/applications/plexmediaplayer.desktop
%{_datadir}/icons/hicolor/scalable/apps/plexmediaplayer.svg
%{_datadir}/plexmediaplayer/plexmediaplayer-standalone-enable
4 years, 12 months
[plex-media-player] Use systemd macros
by Leigh Scott
commit 7d9f21fa80338d08bbcf799a93f714f779dcdf7a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Nov 6 15:49:23 2019 +0000
Use systemd macros
plex-media-player.spec | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/plex-media-player.spec b/plex-media-player.spec
index 4f852ea..b105ed3 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -35,6 +35,7 @@ BuildRequires: cmake3
BuildRequires: ninja-build
BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
+BuildRequires: systemd
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -129,9 +130,9 @@ mkdir -p %{buildroot}%{_datadir}/plexmediaplayer
install -pm0755 %{SOURCE9} \
%{buildroot}%{_datadir}/plexmediaplayer/plexmediaplayer-standalone-enable
-mkdir -p %{buildroot}%{_prefix}/lib/systemd/system
-install -pm0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system/plexmediaplayer.service
-install -pm0644 %{SOURCE4} %{buildroot}%{_prefix}/lib/systemd/system/plexmediaplayer.target
+mkdir -p %{buildroot}%{_unitdir}
+install -pm0644 %{SOURCE3} %{buildroot}%{_unitdir}/plexmediaplayer.service
+install -pm0644 %{SOURCE4} %{buildroot}%{_unitdir}/plexmediaplayer.target
mkdir -p %{buildroot}%{_sysconfdir}/polkit-1/localauthority/50-local.d
install -pm0644 %{SOURCE5} \
@@ -192,8 +193,8 @@ update-desktop-database &> /dev/null || :
%{_bindir}/pmphelper
%{_bindir}/plexmediaplayer-standalone
%{_sysconfdir}/polkit-1/localauthority/50-local.d/plexmediaplayer.pkla.disabled
-%{_prefix}/lib/systemd/system/plexmediaplayer.service
-%{_prefix}/lib/systemd/system/plexmediaplayer.target
+%{_unitdir}/plexmediaplayer.service
+%{_unitdir}/plexmediaplayer.target
%{_datadir}/metainfo/plexmediaplayer.appdata.xml
%{_datadir}/applications/plexmediaplayer.desktop
%{_datadir}/icons/hicolor/scalable/apps/plexmediaplayer.svg
4 years, 12 months
[plex-media-player] Remove obsolete scriptlets for fedora and el8
by Leigh Scott
commit 36c4e9ec9d37d1ffcda7f97b9da54db02b82a941
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Nov 6 15:37:03 2019 +0000
Remove obsolete scriptlets for fedora and el8
plex-media-player.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/plex-media-player.spec b/plex-media-player.spec
index 8240da4..4f852ea 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -143,7 +143,7 @@ desktop-file-install \
mkdir -p %{buildroot}%{_sharedstatedir}/plex-media-player
-
+%if 0%{?rhel} == 7
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -159,6 +159,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
fi
update-mime-database %{_datadir}/mime &> /dev/null
update-desktop-database &> /dev/null || :
+%endif
%pre session
# Rename plexmediaplayer to plex-media-player
4 years, 12 months
[mixxx] Fix desktop launcher patch
by Uwe Klotz
Summary of changes:
3dab4c5... Fix desktop launcher patch (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 12 months
[mixxx/f31] Fix desktop launcher patch
by Uwe Klotz
commit 3dab4c55e1b30e6051f4185308b21e90b20dae3e
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Nov 6 11:59:13 2019 +0100
Fix desktop launcher patch
launcher-platform-xcb.patch | 56 ++++++---------------------------------------
mixxx.spec | 5 +++-
2 files changed, 11 insertions(+), 50 deletions(-)
---
diff --git a/launcher-platform-xcb.patch b/launcher-platform-xcb.patch
index d9311bf..e5458be 100644
--- a/launcher-platform-xcb.patch
+++ b/launcher-platform-xcb.patch
@@ -1,53 +1,11 @@
-From c4197fa4cf7e4bfa7f24850fd619a77e9e4f2f32 Mon Sep 17 00:00:00 2001
-From: Uwe Klotz <uklotz(a)mixxx.org>
-Date: Thu, 31 Oct 2019 21:16:51 +0100
-Subject: [PATCH 1/2] Disable QtWayland in desktop launcher
-
-https://bugs.launchpad.net/mixxx/+bug/1850729
----
- build/debian/mixxx.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop
-index fc89fa6da1..3bad29a170 100644
---- a/build/debian/mixxx.desktop
-+++ b/build/debian/mixxx.desktop
-@@ -3,7 +3,7 @@ Version=1.0
- Name=Mixxx
- GenericName=Digital DJ interface
+--- a/res/linux/mixxx.desktop
++++ b/res/linux/mixxx.desktop
+@@ -8,7 +8,7 @@
Comment=A digital DJ interface
--Exec=pasuspender -- mixxx
-+Exec=QT_QPA_PLATFORM=xcb pasuspender -- mixxx
+ Comment[de]=Ein digitales DJ-System
+ Comment[fr]=Une interface numérique pour DJ
+-Exec=sh -c "pasuspender -- mixxx || mixxx"
++Exec=sh -c "pasuspender -- mixxx -platform xcb || mixxx -platform xcb"
Terminal=false
Icon=mixxx_icon
Type=Application
---
-2.23.0
-
-
-From 55d700f4894164b7b8f463eea319cdb9896d3b3d Mon Sep 17 00:00:00 2001
-From: Uwe Klotz <uklotz(a)mixxx.org>
-Date: Thu, 31 Oct 2019 22:55:20 +0100
-Subject: [PATCH 2/2] Use command-line argument to select the platform
- abstraction
-
----
- build/debian/mixxx.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop
-index 3bad29a170..c7c96e7720 100644
---- a/build/debian/mixxx.desktop
-+++ b/build/debian/mixxx.desktop
-@@ -3,7 +3,7 @@ Version=1.0
- Name=Mixxx
- GenericName=Digital DJ interface
- Comment=A digital DJ interface
--Exec=QT_QPA_PLATFORM=xcb pasuspender -- mixxx
-+Exec=pasuspender -- mixxx -platform xcb
- Terminal=false
- Icon=mixxx_icon
- Type=Application
---
-2.23.0
-
diff --git a/mixxx.spec b/mixxx.spec
index 5ad5414..12394ce 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -17,7 +17,7 @@
Name: mixxx
Version: 2.2.2
-Release: 2%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 3%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
@@ -163,6 +163,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Wed Nov 06 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-3
+- Fix desktop launcher patch
+
* Thu Oct 31 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-2
- Use XCB instead of the default Qt Wayland platform adapter
- Use system libebur128
4 years, 12 months
[mixxx/f30] Fix desktop launcher patch
by Uwe Klotz
commit 05ca4f5c7bab26ceae64c473d79537e7ac52648a
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Nov 6 11:59:13 2019 +0100
Fix desktop launcher patch
launcher-platform-xcb.patch | 56 ++++++---------------------------------------
mixxx.spec | 5 +++-
2 files changed, 11 insertions(+), 50 deletions(-)
---
diff --git a/launcher-platform-xcb.patch b/launcher-platform-xcb.patch
index d9311bf..e5458be 100644
--- a/launcher-platform-xcb.patch
+++ b/launcher-platform-xcb.patch
@@ -1,53 +1,11 @@
-From c4197fa4cf7e4bfa7f24850fd619a77e9e4f2f32 Mon Sep 17 00:00:00 2001
-From: Uwe Klotz <uklotz(a)mixxx.org>
-Date: Thu, 31 Oct 2019 21:16:51 +0100
-Subject: [PATCH 1/2] Disable QtWayland in desktop launcher
-
-https://bugs.launchpad.net/mixxx/+bug/1850729
----
- build/debian/mixxx.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop
-index fc89fa6da1..3bad29a170 100644
---- a/build/debian/mixxx.desktop
-+++ b/build/debian/mixxx.desktop
-@@ -3,7 +3,7 @@ Version=1.0
- Name=Mixxx
- GenericName=Digital DJ interface
+--- a/res/linux/mixxx.desktop
++++ b/res/linux/mixxx.desktop
+@@ -8,7 +8,7 @@
Comment=A digital DJ interface
--Exec=pasuspender -- mixxx
-+Exec=QT_QPA_PLATFORM=xcb pasuspender -- mixxx
+ Comment[de]=Ein digitales DJ-System
+ Comment[fr]=Une interface numérique pour DJ
+-Exec=sh -c "pasuspender -- mixxx || mixxx"
++Exec=sh -c "pasuspender -- mixxx -platform xcb || mixxx -platform xcb"
Terminal=false
Icon=mixxx_icon
Type=Application
---
-2.23.0
-
-
-From 55d700f4894164b7b8f463eea319cdb9896d3b3d Mon Sep 17 00:00:00 2001
-From: Uwe Klotz <uklotz(a)mixxx.org>
-Date: Thu, 31 Oct 2019 22:55:20 +0100
-Subject: [PATCH 2/2] Use command-line argument to select the platform
- abstraction
-
----
- build/debian/mixxx.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop
-index 3bad29a170..c7c96e7720 100644
---- a/build/debian/mixxx.desktop
-+++ b/build/debian/mixxx.desktop
-@@ -3,7 +3,7 @@ Version=1.0
- Name=Mixxx
- GenericName=Digital DJ interface
- Comment=A digital DJ interface
--Exec=QT_QPA_PLATFORM=xcb pasuspender -- mixxx
-+Exec=pasuspender -- mixxx -platform xcb
- Terminal=false
- Icon=mixxx_icon
- Type=Application
---
-2.23.0
-
diff --git a/mixxx.spec b/mixxx.spec
index 7475bd8..caee0aa 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -17,7 +17,7 @@
Name: mixxx
Version: 2.2.2
-Release: 2%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 3%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
@@ -163,6 +163,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Wed Nov 06 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-3
+- Fix desktop launcher patch
+
* Thu Oct 31 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-2
- Use XCB instead of the default Qt Wayland platform adapter
- Use system libebur128
4 years, 12 months
[mixxx/f29] Fix desktop launcher patch
by Uwe Klotz
commit 4a7aa76d231061732620cf522a7f2e7fc91a02e8
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Nov 6 11:59:13 2019 +0100
Fix desktop launcher patch
launcher-platform-xcb.patch | 56 ++++++---------------------------------------
mixxx.spec | 5 +++-
2 files changed, 11 insertions(+), 50 deletions(-)
---
diff --git a/launcher-platform-xcb.patch b/launcher-platform-xcb.patch
index d9311bf..e5458be 100644
--- a/launcher-platform-xcb.patch
+++ b/launcher-platform-xcb.patch
@@ -1,53 +1,11 @@
-From c4197fa4cf7e4bfa7f24850fd619a77e9e4f2f32 Mon Sep 17 00:00:00 2001
-From: Uwe Klotz <uklotz(a)mixxx.org>
-Date: Thu, 31 Oct 2019 21:16:51 +0100
-Subject: [PATCH 1/2] Disable QtWayland in desktop launcher
-
-https://bugs.launchpad.net/mixxx/+bug/1850729
----
- build/debian/mixxx.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop
-index fc89fa6da1..3bad29a170 100644
---- a/build/debian/mixxx.desktop
-+++ b/build/debian/mixxx.desktop
-@@ -3,7 +3,7 @@ Version=1.0
- Name=Mixxx
- GenericName=Digital DJ interface
+--- a/res/linux/mixxx.desktop
++++ b/res/linux/mixxx.desktop
+@@ -8,7 +8,7 @@
Comment=A digital DJ interface
--Exec=pasuspender -- mixxx
-+Exec=QT_QPA_PLATFORM=xcb pasuspender -- mixxx
+ Comment[de]=Ein digitales DJ-System
+ Comment[fr]=Une interface numérique pour DJ
+-Exec=sh -c "pasuspender -- mixxx || mixxx"
++Exec=sh -c "pasuspender -- mixxx -platform xcb || mixxx -platform xcb"
Terminal=false
Icon=mixxx_icon
Type=Application
---
-2.23.0
-
-
-From 55d700f4894164b7b8f463eea319cdb9896d3b3d Mon Sep 17 00:00:00 2001
-From: Uwe Klotz <uklotz(a)mixxx.org>
-Date: Thu, 31 Oct 2019 22:55:20 +0100
-Subject: [PATCH 2/2] Use command-line argument to select the platform
- abstraction
-
----
- build/debian/mixxx.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop
-index 3bad29a170..c7c96e7720 100644
---- a/build/debian/mixxx.desktop
-+++ b/build/debian/mixxx.desktop
-@@ -3,7 +3,7 @@ Version=1.0
- Name=Mixxx
- GenericName=Digital DJ interface
- Comment=A digital DJ interface
--Exec=QT_QPA_PLATFORM=xcb pasuspender -- mixxx
-+Exec=pasuspender -- mixxx -platform xcb
- Terminal=false
- Icon=mixxx_icon
- Type=Application
---
-2.23.0
-
diff --git a/mixxx.spec b/mixxx.spec
index 25ce296..b3b75a5 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -17,7 +17,7 @@
Name: mixxx
Version: 2.2.2
-Release: 2%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 3%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
@@ -163,6 +163,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Wed Nov 06 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-3
+- Fix desktop launcher patch
+
* Thu Oct 31 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-2
- Use XCB instead of the default Qt Wayland platform adapter
- Use system libebur128
4 years, 12 months
[celluloid/el8] Update to 0.18.
by Vasiliy Glazov
Summary of changes:
c9717b2... Update to 0.18. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 12 months
[celluloid/f29] Update to 0.18.
by Vasiliy Glazov
Summary of changes:
c9717b2... Update to 0.18. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 12 months
[celluloid/f30] Update to 0.18.
by Vasiliy Glazov
Summary of changes:
c9717b2... Update to 0.18. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 12 months
