[arch-commits] Commit in cdemu-client/trunk (PKGBUILD build-fixes.diff fixes.diff)

[Jan Steffens]

    Date: Sunday, January 8, 2017 @ 18:25:51
  Author: heftig
Revision: 206102

3.0.4-3: FS#52437 Fix python3 compat

Added:
  cdemu-client/trunk/fixes.diff
    (from rev 206101, cdemu-client/trunk/build-fixes.diff)
Modified:
  cdemu-client/trunk/PKGBUILD
Deleted:
  cdemu-client/trunk/build-fixes.diff

------------------+
 PKGBUILD         |    8 ++++----
 build-fixes.diff |   14 --------------
 fixes.diff       |   27 +++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-08 16:56:27 UTC (rev 206101)
+++ PKGBUILD	2017-01-08 18:25:51 UTC (rev 206102)
@@ -5,7 +5,7 @@
 
 pkgname=cdemu-client
 pkgver=3.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple command-line client for controlling cdemu-daemon"
 arch=(any)
 url="http://cdemu.sourceforge.net/"
@@ -14,14 +14,14 @@
 makedepends=(intltool cmake)
 conflicts=('cdemu')
 source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
-        build-fixes.diff)
+        fixes.diff)
 sha256sums=('e415a98672ac1ed908dab2ba43a94bc0af7653c470a87d6d9338a59d9856fd86'
-            '908f919e779832eb05013cb0e3ecb49795afddaa4aa8cb946ec78c3218acf534')
+            'f918450e3eff8123b830817fe763702f123f8ad6d0186798aa2defa8f0f9782f')
 
 prepare() {
   mkdir build
   cd $pkgname-$pkgver
-  patch -Np2 -i ../build-fixes.diff
+  patch -Np2 -i ../fixes.diff
 }
 
 build() {

Deleted: build-fixes.diff
===================================================================
--- build-fixes.diff	2017-01-08 16:56:27 UTC (rev 206101)
+++ build-fixes.diff	2017-01-08 18:25:51 UTC (rev 206102)
@@ -1,14 +0,0 @@
-diff --git i/cdemu-client/CMakeLists.txt w/cdemu-client/CMakeLists.txt
-index cdcff25232886440..5296229538cd64bf 100644
---- i/cdemu-client/CMakeLists.txt
-+++ w/cdemu-client/CMakeLists.txt
-@@ -38,7 +38,8 @@ install (
- 
- install (
-     FILES data/cdemu-bash-completion.sh
--    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
-+    DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions
-+    RENAME cdemu
- )
- 
- install (

Copied: cdemu-client/trunk/fixes.diff (from rev 206101, cdemu-client/trunk/build-fixes.diff)
===================================================================
--- fixes.diff	                        (rev 0)
+++ fixes.diff	2017-01-08 18:25:51 UTC (rev 206102)
@@ -0,0 +1,27 @@
+diff --git i/cdemu-client/CMakeLists.txt w/cdemu-client/CMakeLists.txt
+index cdcff25232886440..5296229538cd64bf 100644
+--- i/cdemu-client/CMakeLists.txt
++++ w/cdemu-client/CMakeLists.txt
+@@ -38,7 +38,8 @@ install (
+ 
+ install (
+     FILES data/cdemu-bash-completion.sh
+-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
++    DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions
++    RENAME cdemu
+ )
+ 
+ install (
+diff --git i/cdemu-client/src/cdemu w/cdemu-client/src/cdemu
+index 85bdcc5f30cdffef..a3fa132492266a7a 100755
+--- i/cdemu-client/src/cdemu
++++ w/cdemu-client/src/cdemu
+@@ -116,7 +116,7 @@ class cmd_load (object):
+ 
+     def __call__ (self, proxy, arguments):
+         # We need to pass absolute filenames to daemon
+-        filenames = map(os.path.abspath, arguments.image_file)
++        filenames = [os.path.abspath(f) for f in arguments.image_file]
+ 
+         # Gather parser parameters into a dictionary
+         parser_params = {}