[biosdisk-git] fix up

1 files changed, 30 insertions, 77 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b39df5b7a2e7..5b126c3a6c72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,89 +1,42 @@
-# Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Maintainer: Yardena Cohen <yardenack at gmail dot com>
+# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor: Eric Mertens <emertens@gmail.com>
 # Contributor: Murtuza Akhtari <inxsible at gmail dot com>
 
-_pkgname="biosdisk"
-pkgname="${_pkgname}-git"
-
-pkgver=20120219
-pkgrel="1"
+gitname="biosdisk"
+pkgname="${gitname}-git"
+pkgver=21.42a22fe
+pkgrel=1
 arch=('any')
 pkgdesc="Utility for creating Dell BIOS flash disks"
-url="http://linux.dell.com/biosdisk/"
+url="https://linux.dell.com/biosdisk"
 license=("GPL")
-
-makedepends=()
-depends=('dos2unix' 'wget' 'syslinux' 'python2')
-# optdepends=('python2: For /usr/sbin/blconf script')
-
-conflicts=("${_pkgname}")
-provides=("${_pkgname}")
+makedepends=('git')
+depends=('hd2u' 'wget' 'syslinux' 'python2')
+conflicts=("${gitname}")
+provides=("${gitname}")
 backup=("etc/biosdisk.conf")
-options=('!strip' 'docs' 'libtool' 'emptydirs' 'zipman' '!purge' '!upx')
-
-source=()
-sha256sums=()
-
-_gitroot="http://linux.dell.com/git/biosdisk.git"
-_gitname="${_pkgname}"
-_gitbranch="master"
-
-_update_git() {
-	
-	cd "${srcdir}/"
-	
-	msg "Connecting to GIT server...."
-	
-	if [[ -d "${srcdir}/${_gitname}/" ]]; then
-		cd "${srcdir}/${_gitname}/"
-		git reset --hard
-		
-		git remote rm origin
-		git remote add origin "${_gitroot}"
-		
-		git fetch
-		git checkout "${_gitbranch}"
-		git merge "remotes/origin/${_gitbranch}"
-		msg "The local GIT repo has been updated."
-	else
-		git clone "${_gitroot}" "${_gitname}"
-		cd "${srcdir}/${_gitname}/"
-		git checkout "${_gitbranch}"
-		msg "GIT checkout done or server timeout"
-	fi
-	
-	echo
-	
-}
+options=('!strip')
+source=("git+http://linux.dell.com/git/${gitname}.git")
+md5sums=('SKIP')
 
-build() {
-	
-	cd "${srcdir}/${_gitname}/"
-	
-	_update_git
-	
+pkgver() {
+	 cd "${srcdir}/${gitname}"
+	 git describe --tags | sed 's|-|\.|g'
 }
 
 package() {
-	
-	cd "${srcdir}/${_gitname}/"
-	
-	install -d "${pkgdir}/usr/sbin"
-	install -D -m0755 "${srcdir}/${_gitname}/biosdisk" "${pkgdir}/usr/sbin/biosdisk"
-	install -D -m0755 "${srcdir}/${_gitname}/blconf" "${pkgdir}/usr/sbin/blconf"
-	sed 's|#!/usr/bin/python|#!/usr/bin/env python2|g' -i "${pkgdir}/usr/sbin/blconf"
-	
-	install -d "${pkgdir}/etc"
-	install -D -m0644 "${srcdir}/${_gitname}/biosdisk.conf" "${pkgdir}/etc/biosdisk.conf"
-	
-	install -d "${pkgdir}/usr/share/man/man8"
-	install -D -m0644 "${srcdir}/${_gitname}/biosdisk.8.gz" "${pkgdir}/usr/share/man/man8"
-	
-	install -d "${pkgdir}/usr/share/biosdisk"
-	install -D -m0644 "${srcdir}/${_gitname}/dosdisk.img" "${pkgdir}/usr/share/biosdisk/dosdisk.img"
-	install -D -m0644 "${srcdir}/${_gitname}/dosdisk288.img" "${pkgdir}/usr/share/biosdisk/dosdisk288.img"
-	install -D -m0644 "${srcdir}/${_gitname}/dosdisk8192.img" "${pkgdir}/usr/share/biosdisk/dosdisk8192.img"
-	
-	install -d "${pkgdir}/var/lib/biosdisk"
-	
+	 cd "${srcdir}/${gitname}"
+
+	 install -Dm 755 {,"${pkgdir}"/usr/bin/}biosdisk
+	 install -Dm 755 {,"${pkgdir}"/usr/bin/}blconf
+	 install -Dm 644 {,"${pkgdir}"/etc/}biosdisk.conf
+	 install -Dm 644 {,"${pkgdir}"/usr/man/man8/}biosdisk.8.gz
+	 install -Dm 644 {,"${pkgdir}"/usr/share/biosdisk/}dosdisk.img
+	 install -Dm 644 {,"${pkgdir}"/usr/share/biosdisk/}dosdisk288.img
+	 install -Dm 644 {,"${pkgdir}"/usr/share/biosdisk/}dosdisk8192.img
+	 install -Dm 644 {,"${pkgdir}"/usr/share/biosdisk/}biosdisk-mkrpm-redhat-template.spec
+	 install -Dm 644 {,"${pkgdir}"/usr/share/biosdisk/}biosdisk-mkrpm-generic-template.spec
+
+	 sed -i 's|python|python2|' "${pkgdir}"/usr/bin/blconf
 }