Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-02-10 13:54:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix file conflict with kdebase-log

Browse Source
This commit is contained in:
philm 2010-11-30 22:50:24 +01:00
parent af83e86a9b
commit b248acfd87
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kdebase-runtime/PKGBUILD
View File

@ -17,7 +17,7 @@ _origname=kdebase-runtime
#
# package info
#
pkgbase=('kdebase')
pkgbase=('kdebase-runtime')
pkgname=('kdebase-runtime'
'kdebase-runtime-doc')

4
kdesdk/PKGBUILD
View File

@ -47,7 +47,7 @@ license=('GPL' 'LGPL' 'FDL')
options=('docs' '!splithdr' 'splitdbg' 'log')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' "kdebase-runtime>=${_kdever}"
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' "kdebase-runtime>=${_kdever}" 'antlr2'
"kdepimlibs>=${_kdever}" 'subversion' "kdebindings-python>=${_kdever}") # "kdepim-runtime>=${_kdever}"
source=($_mirror/${_origname}-$_kdever.tar.bz2)
@ -319,7 +319,7 @@ package_kdesdk-kuiviewer()
package_kdesdk-poxml()
{
pkgdesc="Tools for using .po-files to translate DocBook XML files"
depends=("${_origname}-common>=${_kdever}" 'qt')
depends=("${_origname}-common>=${_kdever}" 'qt' 'antlr2')
conflicts=("kdemod-${_origname}-poxml")
groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
install=${_origname}.install