emacs: Fix conflict with Ctags

This commit is contained in:
Alexander Shukaev
2014-11-06 02:53:43 +01:00
parent 52f8b00376
commit 28d55ff5e5
2 changed files with 8 additions and 2 deletions

View File

@@ -2,8 +2,8 @@
_name='emacs'
pkgname="${MINGW_PACKAGE_PREFIX}-${_name}-git"
pkgver='r133068.41afbbe'
pkgrel='1'
pkgver=r133086.ba9fc93
pkgrel=1
pkgdesc=\
"The extensible, customizable, self-documenting, real-time display editor."
url="http://www.gnu.org/software/${_name}/"
@@ -17,6 +17,7 @@ conflicts=(
"${MINGW_PACKAGE_PREFIX}-${_name}"
)
depends=(
"${MINGW_PACKAGE_PREFIX}-ctags"
"${MINGW_PACKAGE_PREFIX}-dbus"
"${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-giflib"
@@ -96,4 +97,6 @@ build() {
package() {
cd ".build/${MINGW_CHOST}"
make DESTDIR="${pkgdir}" install
rm -f "${pkgdir}${MINGW_PREFIX}/bin/ctags.exe"
rm -f "${pkgdir}${MINGW_PREFIX}/share/man/man1/ctags.1.gz"
}

View File

@@ -17,6 +17,7 @@ conflicts=(
"${MINGW_PACKAGE_PREFIX}-${_name}-git"
)
depends=(
"${MINGW_PACKAGE_PREFIX}-ctags"
"${MINGW_PACKAGE_PREFIX}-dbus"
"${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-giflib"
@@ -98,4 +99,6 @@ build() {
package() {
cd ".build/${MINGW_CHOST}"
make DESTDIR="${pkgdir}" install
rm -f "${pkgdir}${MINGW_PREFIX}/bin/ctags.exe"
rm -f "${pkgdir}${MINGW_PREFIX}/share/man/man1/ctags.1.gz"
}