summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD30
2 files changed, 15 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 86497df5175..fdd22391c03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
# Generated by mksrcinfo v8
-# Sat Nov 18 18:00:11 UTC 2017
+# Tue Dec 12 02:40:38 UTC 2017
pkgbase = dockbarx-git
pkgdesc = TaskBar with groupping and group manipulation
- pkgver = 595.1aa7665
+ pkgver = 0.92+10+g34fe342
pkgrel = 1
+ epoch = 1
url = https://github.com/M7S/dockbarx
arch = i686
arch = x86_64
@@ -32,9 +33,7 @@ pkgbase = dockbarx-git
replaces = dockbarx-awn-applet-bzr
replaces = dockbarx-bzr
source = dockbarx::git+https://github.com/M7S/dockbarx.git
- source = freedesktop_quicklist.patch::https://github.com/M7S/dockbarx/commit/db984a935c60253dcf3c5cbdb2e623b4692b038d.patch
sha256sums = SKIP
- sha256sums = 6eba00088c1094aee041b26407d5c8e9f19da2eaee491cc9aff92a11285efba2
pkgname = dockbarx-git
diff --git a/PKGBUILD b/PKGBUILD
index 7bb7551cfdd..1a9ba355a78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,8 @@
pkgname=dockbarx-git
_pkgname=dockbarx
-pkgver=595.1aa7665
+epoch=1
+pkgver=0.92+10+g34fe342
pkgrel=1
pkgdesc="TaskBar with groupping and group manipulation"
arch=('i686' 'x86_64')
@@ -21,31 +22,24 @@ makedepends=('git')
conflicts=('dockbarx' 'dockbarx-awn-applet-bzr')
replaces=('dockbarx-awn-applet-bzr' 'dockbarx-bzr')
provides=('dockbarx=0.92')
-source=("${_pkgname}"::git+https://github.com/M7S/dockbarx.git
- 'freedesktop_quicklist.patch::https://github.com/M7S/dockbarx/commit/db984a935c60253dcf3c5cbdb2e623b4692b038d.patch')
-sha256sums=('SKIP'
- '6eba00088c1094aee041b26407d5c8e9f19da2eaee491cc9aff92a11285efba2')
+source=("${_pkgname}"::git+https://github.com/M7S/dockbarx.git)
+sha256sums=('SKIP')
pkgver() {
cd "${srcdir}/${_pkgname}"
- echo $(git rev-list --count master).$(git rev-parse --short master)
-}
-
-prepare() {
- cd ${srcdir}/${_pkgname}
- patch -Np1 -i ../freedesktop_quicklist.patch
+ git describe --long --tags | sed -r "s/-/+/g"
}
package() {
- cd ${srcdir}/${_pkgname}
+ cd "${srcdir}/${_pkgname}"
- python2 setup.py install --root ${pkgdir}
+ python2 setup.py install --root "${pkgdir}"
- mkdir -p ${pkgdir}/usr/share/avant-window-navigator/applets
- cp -r ${srcdir}/${_pkgname}/AWN/* ${pkgdir}/usr/share/avant-window-navigator/applets
+ mkdir -p "${pkgdir}"/usr/share/avant-window-navigator/applets
+ cp -r "${srcdir}/${_pkgname}"/AWN/* "${pkgdir}"/usr/share/avant-window-navigator/applets
- mkdir -p ${pkgdir}/usr/share/pixmaps
- install -Dm644 ${srcdir}/${_pkgname}/icons/hicolor/128x128/apps/dockbarx.png ${pkgdir}/usr/share/pixmaps/dockbarx.png
+ mkdir -p "${pkgdir}"/usr/share/pixmaps
+ install -Dm644 "${srcdir}/${_pkgname}"/icons/hicolor/128x128/apps/dockbarx.png "${pkgdir}"/usr/share/pixmaps/dockbarx.png
- sed -i 's:^Categories=.*:Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;:' ${pkgdir}/usr/share/applications/dbx_preference.desktop
+ sed -i 's:^Categories=.*:Categories=Settings:' "${pkgdir}"/usr/share/applications/dbx_preference.desktop
}