PKGBUILD cleanup and adding back help files

2 files changed, 9 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3577e9bef513..c7b1a6f07d3f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Jun 12 20:29:23 UTC 2017
+# Mon Oct  2 06:04:28 UTC 2017
 pkgbase = easytag-git
 	pkgdesc = Utility for viewing and editing tags for most audio formats - git version
-	pkgver = 2.4.3.r51.gd0c0513
+	pkgver = 2.4.3.r55.g6e3a7e9
 	pkgrel = 1
 	url = http://projects.gnome.org/easytag/
 	arch = i686
@@ -12,6 +12,7 @@ pkgbase = easytag-git
 	makedepends = intltool
 	makedepends = appdata-tools
 	makedepends = autoconf-archive
+	makedepends = yelp-tools
 	depends = id3lib
 	depends = taglib
 	depends = libid3tag
@@ -22,6 +23,7 @@ pkgbase = easytag-git
 	depends = opusfile
 	depends = wavpack
 	depends = desktop-file-utils
+	depends = yelp
 	provides = easytag
 	conflicts = easytag
 	source = git://git.gnome.org/easytag
diff --git a/PKGBUILD b/PKGBUILD
index 6d1a2237c11d..29454524393f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,18 @@
 # Maintainer: Frederic Bezies <fredbezies at gmail dot com>
 # Contributor rtfreedman (rob<d0t>til<d0t>freedman<aT>gmail<d0t>com
 # 
-## enable/disable gnome help files; adds makedepends+='yelp-tools' and depends+='yelp'
-_build_gnome_help="no" # yes|no
 
 pkgname=easytag-git
 _gitname=easytag
-pkgver=2.4.3.r51.gd0c0513
+pkgver=2.4.3.r55.g6e3a7e9
 pkgrel=1
 pkgdesc="Utility for viewing and editing tags for most audio formats - git version"
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://projects.gnome.org/easytag/'
-depends=('id3lib' 'taglib' 'libid3tag' 'gtk3' 'libvorbis' 'flac' 'speex' 'opusfile' 'wavpack' 'desktop-file-utils')
-makedepends=('git' 'intltool' 'appdata-tools' 'autoconf-archive')
+depends=('id3lib' 'taglib' 'libid3tag' 'gtk3' 'libvorbis' 'flac' 'speex' 'opusfile' 'wavpack' 'desktop-file-utils' 'yelp')
+makedepends=('git' 'intltool' 'appdata-tools' 'autoconf-archive' 'yelp-tools')
 ## depends on building gnome help files
-if [ "$_build_gnome_help" = 'yes' ]; then
-  echo -e "\n>>>\n>>> Build with GNOME help files\n>>>\n"
-  depends+=('yelp')
-  makedepends+=('yelp-tools')
-fi
 
 provides=('easytag')
 conflicts=('easytag')
@@ -28,19 +21,11 @@ sha1sums=('SKIP')
 
 pkgver() {
   cd "$_gitname"
-  git describe --long --tags | sed 's/^easytag-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --tags | sed 's/^easytag-//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
   cd "$_gitname"
-  ## disable-gnome-help-files
-  if [ "$_build_gnome_help" != 'yes' ]; then
-    echo -e "\n>>>\n>>> Build without GNOME help files\n>>>\n"
-    sed -i 's@= help po@= po@' Makefile.am
-  	sed -e'/help\/Makefile/d' -e 's/AC_MSG_ERROR(\[yelp-tools/AC_MSG_WARN([yelp-tools/' -i configure.ac
-    rm -fr help/
-  fi
-  ## add git rev to version
   sed "s/(\[EasyTAG\], \[\([0-9]\).\([0-9]\).\([0-9]\)\],/(\[EasyTAG\], [\1.\2.\3-$(git rev-list --count master).$(git rev-parse --short master)], /" -i configure.ac
   ./autogen.sh
 }
@@ -50,7 +35,7 @@ build() {
   CXXFLAGS="$CXXFLAGS -Wno-error=deprecated-declarations -Wno-error"
   # Workaround for gcc 7 
   CFLAGS="$CFLAGS -Wno-error"
-  ./configure --prefix=/usr 
+  ./configure --prefix=/usr
   make
 }