Date: Tuesday, January 15, 2019 @ 20:44:27 Author: heftig Revision: 423371
3.2.1-2 Modified: cdemu-daemon/trunk/0001-Patch-system-daemon-for-Arch-friendliness.patch cdemu-daemon/trunk/PKGBUILD ------------------------------------------------------+ 0001-Patch-system-daemon-for-Arch-friendliness.patch | 46 ++++++++--------- PKGBUILD | 7 +- 2 files changed, 27 insertions(+), 26 deletions(-) Modified: 0001-Patch-system-daemon-for-Arch-friendliness.patch =================================================================== --- 0001-Patch-system-daemon-for-Arch-friendliness.patch 2019-01-15 20:22:39 UTC (rev 423370) +++ 0001-Patch-system-daemon-for-Arch-friendliness.patch 2019-01-15 20:44:27 UTC (rev 423371) @@ -1,21 +1,22 @@ -From 17d054bc9fb02bbb557f9de68e29e715a17f3ee6 Mon Sep 17 00:00:00 2001 +From de8825af23b63b78e6d8262b408f8350581ba58e Mon Sep 17 00:00:00 2001 +Message-Id: <de8825af23b63b78e6d8262b408f8350581ba58e.1547584763.git.jan.steff...@gmail.com> From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> Date: Mon, 12 Jun 2017 22:22:51 +0200 Subject: [PATCH] Patch system daemon for Arch-friendliness --- - cdemu-daemon/CMakeLists.txt | 15 ++++++++++++++- - cdemu-daemon/system/cdemu-daemon-dbus.conf | 9 +++++++-- - cdemu-daemon/system/cdemu-daemon-system.sh | 6 +++--- - cdemu-daemon/system/cdemu-daemon.conf | 8 ++++++++ - cdemu-daemon/system/cdemu-daemon.service.in | 10 ++++++++++ - cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in | 4 ++-- - 6 files changed, 44 insertions(+), 8 deletions(-) + cdemu-daemon/CMakeLists.txt | 17 +++++++++++++++-- + cdemu-daemon/system/cdemu-daemon-dbus.conf | 9 +++++++-- + cdemu-daemon/system/cdemu-daemon-system.sh | 6 +++--- + cdemu-daemon/system/cdemu-daemon.conf | 8 ++++++++ + cdemu-daemon/system/cdemu-daemon.service.in | 10 ++++++++++ + .../system/net.sf.cdemu.CDEmuDaemon.service.in | 4 ++-- + 6 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 cdemu-daemon/system/cdemu-daemon.conf create mode 100644 cdemu-daemon/system/cdemu-daemon.service.in diff --git a/cdemu-daemon/CMakeLists.txt b/cdemu-daemon/CMakeLists.txt -index 76feb818d09a57af..c6abd56b82484b6f 100644 +index cf41234a..adfcc3ac 100644 --- a/cdemu-daemon/CMakeLists.txt +++ b/cdemu-daemon/CMakeLists.txt @@ -15,7 +15,7 @@ set (CDEMU_DAEMON_INTERFACE_VERSION_MINOR 0) @@ -38,31 +39,32 @@ # Global definitions add_definitions (-std=c99) # We're compiling using C99 -@@ -121,13 +125,22 @@ if (SYSTEM_BUS_SERVICE) +@@ -122,13 +126,22 @@ if (SYSTEM_BUS_SERVICE) + PROGRAMS system/cdemu-daemon-system.sh DESTINATION ${CMAKE_INSTALL_LIBEXECDIR} ) - install ( ++ install ( + FILES ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service + DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/ + ) -+ install ( + install ( FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/ ) install ( FILES system/cdemu-daemon-dbus.conf - DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d - ) +- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system.d ++ ) + install ( + FILES system/cdemu-daemon.conf + RENAME cdemu-daemon + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/conf.d -+ ) + ) endif () - # Translations; we use the version provided by our FindIntlTool.cmake diff --git a/cdemu-daemon/system/cdemu-daemon-dbus.conf b/cdemu-daemon/system/cdemu-daemon-dbus.conf -index c450d78cf03bce6a..e86b62cf0437a9fd 100644 +index c450d78c..e86b62cf 100644 --- a/cdemu-daemon/system/cdemu-daemon-dbus.conf +++ b/cdemu-daemon/system/cdemu-daemon-dbus.conf @@ -11,8 +11,13 @@ @@ -82,7 +84,7 @@ </policy> </busconfig> diff --git a/cdemu-daemon/system/cdemu-daemon-system.sh b/cdemu-daemon/system/cdemu-daemon-system.sh -index d9ab60aaff559400..735c24442a82e8bc 100755 +index d9ab60aa..735c2444 100755 --- a/cdemu-daemon/system/cdemu-daemon-system.sh +++ b/cdemu-daemon/system/cdemu-daemon-system.sh @@ -1,15 +1,15 @@ @@ -106,7 +108,7 @@ . ${CONFIG_FILE}; diff --git a/cdemu-daemon/system/cdemu-daemon.conf b/cdemu-daemon/system/cdemu-daemon.conf new file mode 100644 -index 0000000000000000..d0d6ecfebb77fbfb +index 00000000..d0d6ecfe --- /dev/null +++ b/cdemu-daemon/system/cdemu-daemon.conf @@ -0,0 +1,8 @@ @@ -120,7 +122,7 @@ +#LOG_FILE=/var/log/cdemu-daemon.log diff --git a/cdemu-daemon/system/cdemu-daemon.service.in b/cdemu-daemon/system/cdemu-daemon.service.in new file mode 100644 -index 0000000000000000..43b5a61dc476e384 +index 00000000..43b5a61d --- /dev/null +++ b/cdemu-daemon/system/cdemu-daemon.service.in @@ -0,0 +1,10 @@ @@ -135,7 +137,7 @@ +[Install] +WantedBy=multi-user.target diff --git a/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in b/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in -index f9cf646b57c3563f..9004c310595273e4 100644 +index f9cf646b..9004c310 100644 --- a/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in +++ b/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in @@ -1,5 +1,5 @@ @@ -147,5 +149,5 @@ - +SystemdService=cdemu-daemon.service -- -2.13.1 +2.20.1 Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-01-15 20:22:39 UTC (rev 423370) +++ PKGBUILD 2019-01-15 20:44:27 UTC (rev 423371) @@ -5,7 +5,7 @@ pkgname=cdemu-daemon pkgver=3.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="CD/DVD-ROM device emulator daemon" arch=(x86_64) url="http://cdemu.sourceforge.net/" @@ -14,13 +14,12 @@ makedepends=(cmake intltool ninja) optdepends=('alsa-lib: to enable the ALSA audio driver' 'pulseaudio: to enable the PA audio driver') -backup=(etc/conf.d/cdemu-daemon - etc/dbus-1/system.d/cdemu-daemon-dbus.conf) +backup=(etc/conf.d/cdemu-daemon) install=cdemu-daemon.install source=("https://downloads.sourceforge.net/cdemu/$pkgname/$pkgname-$pkgver.tar.bz2" 0001-Patch-system-daemon-for-Arch-friendliness.patch) sha256sums=('842d889094be45fb913ee6649cba8f12e6190e83497764536bc63d1c3fc3389c' - 'e83467d342abd979b38b3a971b97942787f5b5a0e18c569b034a636c54eb8154') + '233dc79359e53da3a0df880984b5ea6033756070cfe84183f39c602274f4b2d6') prepare() { mkdir build