Date: Saturday, January 7, 2017 @ 16:38:33 Author: heftig Revision: 206033
3.0.4-2: FS#51390 deps Added: cdemu-client/trunk/build-fixes.diff Modified: cdemu-client/trunk/PKGBUILD Deleted: cdemu-client/trunk/cdemu-client.install ----------------------+ PKGBUILD | 22 +++++++--------------- build-fixes.diff | 23 +++++++++++++++++++++++ cdemu-client.install | 11 ----------- 3 files changed, 30 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-01-07 16:37:50 UTC (rev 206032) +++ PKGBUILD 2017-01-07 16:38:33 UTC (rev 206033) @@ -5,31 +5,23 @@ pkgname=cdemu-client pkgver=3.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Simple command-line client for controlling cdemu-daemon" arch=(any) url="http://cdemu.sourceforge.net/" license=(GPL) -depends=(python2 dbus-python cdemu-daemon) +depends=(python-gobject cdemu-daemon) makedepends=(intltool cmake) conflicts=('cdemu') -source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2") -sha256sums=('e415a98672ac1ed908dab2ba43a94bc0af7653c470a87d6d9338a59d9856fd86') +source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" + build-fixes.diff) +sha256sums=('e415a98672ac1ed908dab2ba43a94bc0af7653c470a87d6d9338a59d9856fd86' + '168b12cc879bd40c116b2da3803215b5d8290383d3b27d16419ddd6eb53f7f72') prepare() { mkdir build cd $pkgname-$pkgver - - # python2 fix - sed -i '1s|^#!.*python$|&2|' src/cdemu - - # fix text domain - sed -i '/^project /s/cdemu/&-client/' CMakeLists.txt - - # bash completions - sed -e 's|${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d|${CMAKE_INSTALL_DATADIR}/bash-completion/completions|g' \ - -e '/FILES data\/cdemu-bash-completion.sh/aRENAME cdemu' \ - -i CMakeLists.txt + patch -Np2 -i ../build-fixes.diff } build() { Added: build-fixes.diff =================================================================== --- build-fixes.diff (rev 0) +++ build-fixes.diff 2017-01-07 16:38:33 UTC (rev 206033) @@ -0,0 +1,23 @@ +diff --git i/cdemu-client/CMakeLists.txt w/cdemu-client/CMakeLists.txt +index cdcff25232886440..33507a7a5db4332e 100644 +--- i/cdemu-client/CMakeLists.txt ++++ w/cdemu-client/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required (VERSION 2.8.5) + + # Project name +-project (cdemu NONE) ++project (cdemu-client NONE) + + # Additional CMake modules. + list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) +@@ -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 ( Deleted: cdemu-client.install =================================================================== --- cdemu-client.install 2017-01-07 16:37:50 UTC (rev 206032) +++ cdemu-client.install 2017-01-07 16:38:33 UTC (rev 206033) @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}