upgpkg: sigil-git 0.8.900.r27.gaaa6196-1

Adopt package, Schwartzify.
upstream release

3 files changed, 17 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 952f52acd660..82d135a389ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = sigil-git
 	pkgdesc = A WYSIWYG ebook editor
-	pkgver = 0.8.6.r3135.g9975f58
+	pkgver = 0.8.900.r27.gaaa6196
 	pkgrel = 1
-	url = https://github.com/user-none/Sigil
+	url = https://github.com/Sigil-Ebook/Sigil
 	install = sigil.install
 	arch = i686
 	arch = x86_64
@@ -19,9 +19,7 @@ pkgbase = sigil-git
 	depends = python-lxml
 	provides = sigil
 	conflicts = sigil
-	source = sigil::git+https://github.com/user-none/Sigil.git
-	source = sigil.desktop
-	md5sums = SKIP
+	source = sigil::git+https://github.com/Sigil-Ebook/Sigil
 	md5sums = SKIP
 
 pkgname = sigil-git
diff --git a/PKGBUILD b/PKGBUILD
index 8813b4e5055c..92822a5de7b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,29 @@
-# Maintainer: David Mougey <imapiekindaguy at gmail dot com>
+# Maintainer: Eli Schwartz <eschwartz93@gmail.com>
+# Contributor: David Mougey <imapiekindaguy at gmail dot com>
 
 pkgname=sigil-git
-pkgver=0.8.6.r3135.g9975f58
+pkgver=0.8.900.r27.gaaa6196
 pkgrel=1
 pkgdesc="A WYSIWYG ebook editor"
 arch=('i686' 'x86_64')
-url="https://github.com/user-none/Sigil"
+url="https://github.com/Sigil-Ebook/Sigil"
 license=('GPL3')
 depends=('qt5-base' 'qt5-svg' 'qt5-webkit' 'qt5-xmlpatterns' 'qt5-tools' 'qt5-multimedia' 'python-lxml')
 makedepends=('git' 'cmake' 'boost')
-provides=('sigil')
-conflicts=('sigil')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
 install=sigil.install
-source=(sigil::'git+https://github.com/user-none/Sigil.git' 'sigil.desktop')
-md5sums=('SKIP' 'SKIP')
-
-_gitroot="https://github.com/user-none/Sigil"
-_gitname=sigil
+source=("${pkgname%-git}"::"git+${url}")
+md5sums=('SKIP')
 
 pkgver() {
-    cd "$srcdir/$_gitname"
-    printf "%s.r%s.g%s" "$(grep current-version version.xml | grep -oP '([0-9]{1,2}(\.){0,1}){3}')" \
-        "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "${srcdir}/${pkgname%-git}"
+    git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd "$srcdir" && rm -rf ${_gitname}-build
-    cp -r ${_gitname} ${_gitname}-build
-    cd ${_gitname}-build
-    mkdir build
-    cd build
+    mkdir -p "${srcdir}/${pkgname%-git}/build"
+    cd "${srcdir}/${pkgname%-git}/build"
     cmake -G "Unix Makefiles" \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
@@ -40,10 +34,9 @@ build() {
 }
 
 package() {
-    cd "$srcdir/${_gitname}"-build/build
+    cd "${srcdir}/${pkgname%-git}/build"
     make install DESTDIR="${pkgdir}"
-    install -d -m 0755 "${pkgdir}"/usr/share/applications
-    install -m 0644 "${srcdir}"/sigil.desktop "${pkgdir}"/usr/share/applications
+
     for _pic in 16 32 48 128 256; do
         install -D -m 0644 ../src/Resource_Files/icon/app_icon_${_pic}.png \
             "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/sigil.png
diff --git a/sigil.desktop b/sigil.desktop
deleted file mode 100755
index cdb4ce1b26c0..000000000000
--- a/sigil.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Sigil
-Comment=WYSIWYG ebook editor
-TryExec=sigil
-Exec=sigil %F
-Icon=sigil
-Terminal=false
-StartupNotify=false
-Categories=Application;Office;
-MimeType=application/epub+zip;