Big cleanup of old PKGBUILD

3 files changed, 15 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82e92af7f77f..3c489fbd8b96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
-# Generated by makepkg 5.0.1
-# Fri Dec 16 11:51:01 UTC 2016
+# Generated by makepkg 5.0.2
+# Sun Sep  3 16:30:23 UTC 2017
 pkgbase = nitrogen-git
 	pkgdesc = Background browser and setter for X windows - git version
-	pkgver = r294.7747ef9
+	pkgver = 1.6.1r306.d48ccb8
 	pkgrel = 1
-	epoch = 1
 	url = http://projects.l3ib.org/nitrogen/
 	arch = i686
 	arch = x86_64
@@ -14,12 +13,9 @@ pkgbase = nitrogen-git
 	depends = hicolor-icon-theme
 	depends = librsvg
 	conflicts = nitrogen
-	replaces = nitrogen
 	options = !emptydirs
 	source = nitrogen::git+https://github.com/l3ib/nitrogen.git
-	source = nitrogen.desktop
 	md5sums = SKIP
-	md5sums = a4b70efdc49a17b5a5632d6c2deb8566
 
 pkgname = nitrogen-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 883c0a309f25..6f506ad846f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Étienne Deparis <etienne@depar.is>
 # Maintainer: James Rayner <james@archlinux.org>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
@@ -7,9 +6,8 @@
 
 pkgname=nitrogen-git
 _gitname=nitrogen
-pkgver=r294.7747ef9
+pkgver=1.6.1r306.d48ccb8
 pkgrel=1
-epoch=1
 pkgdesc="Background browser and setter for X windows - git version"
 arch=('i686' 'x86_64')
 url="http://projects.l3ib.org/nitrogen/"
@@ -17,18 +15,22 @@ license=('GPL')
 makedepends=('git')
 depends=('gtkmm' 'hicolor-icon-theme' 'librsvg')
 conflicts=('nitrogen')
-replaces=('nitrogen')
 
-source=("${_gitname}::git+https://github.com/l3ib/nitrogen.git"
-        'nitrogen.desktop')
-md5sums=('SKIP'
-         'a4b70efdc49a17b5a5632d6c2deb8566')
+source=("${_gitname}::git+https://github.com/l3ib/nitrogen.git")
+md5sums=('SKIP')
 
 options=(!emptydirs)
 
 pkgver() {
   cd "$srcdir/${_gitname}/"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  curver=$(sed -n 's/^AC_INIT(\[nitrogen\],\[\([0-9.]*\)\],\[daf@minuslab.net\])$/\1/p' configure.ac)
+  printf "%sr%s.%s" "$curver" "$(git rev-list --count HEAD)" \
+         "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd "$srcdir/${_gitname}/data"
+  sed -i 's/^Categories=Utility;GTK;DesktopSettings;$/Categories=Settings;DesktopSettings;GTK;/' nitrogen.desktop.in
 }
 
 build() {
@@ -41,5 +43,5 @@ build() {
 package() {
   cd "$srcdir/${_gitname}"
   make DESTDIR="$pkgdir/" install
-  install -D -m644 "${srcdir}/nitrogen.desktop" "${pkgdir}/usr/share/applications/nitrogen.desktop"
+  install -D -m644 data/nitrogen.desktop "${pkgdir}/usr/share/applications/nitrogen.desktop"
 }
diff --git a/nitrogen.desktop b/nitrogen.desktop
deleted file mode 100644
index 36301cb4a260..000000000000
--- a/nitrogen.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Nitrogen
-Comment=
-Exec=nitrogen %f
-Terminal=false
-Type=Application
-Icon=nitrogen
-Categories=GTK;Graphics;2DGraphics;Viewer;
-MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-sun-raster;image/x-tga;image/x-xbitmap;image/x-xpixmap;image/svg+xml;