refind-git 0.12.0.r692.g4a84fce-3

Rename to refind-git to match the name of the package in the official repos.

2 files changed, 29 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e62a1ba78908..50c19c780c6d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = refind-efi-git
+pkgbase = refind-git
 	pkgdesc = rEFInd Boot Manager - git version
 	pkgver = 0.12.0.r692.g4a84fce
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.rodsbooks.com/refind/
 	arch = any
 	license = BSD
@@ -28,9 +28,10 @@ pkgbase = refind-efi-git
 	provides = refind-efi=0.12.0.r692.g4a84fce
 	conflicts = refind
 	conflicts = refind-efi
+	replaces = refind-efi-git
 	options = !makeflags
 	source = refind::git+https://git.code.sf.net/p/refind/code#branch=master
 	sha512sums = SKIP
 
-pkgname = refind-efi-git
+pkgname = refind-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 71c4036d380a..ed4c1bf6f334 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: David Runge <dvzrv@archlinux.org>
 
-pkgname='refind-efi-git'
+pkgname='refind-git'
 pkgver=0.12.0.r692.g4a84fce
-pkgrel=2
+pkgrel=3
 pkgdesc='rEFInd Boot Manager - git version'
 url='https://www.rodsbooks.com/refind/'
 arch=('any')
@@ -20,62 +20,64 @@ optdepends=('gptfdisk: for finding non-vfat ESP with refind-install'
             'sudo: for privilege elevation in refind-install and refind-mkdefault'
             'shim-signed: pre-signed Secure Boot shim loader'
             'sbsigntools: for EFI binary signing with refind-install')
+conflicts=("${pkgname%-git}" "refind-efi")
+replaces=('refind-efi-git')
+provides=("${pkgname%-git}=${pkgver}" "refind-efi=${pkgver}")
+# the drivers don't build with many jobs
 options=('!makeflags')
-conflicts=("${pkgname%-efi-git}" "${pkgname%-git}")
-provides=("${pkgname%-efi-git}=${pkgver}" "${pkgname%-git}=${pkgver}")
 source=('refind::git+https://git.code.sf.net/p/refind/code#branch=master')
 sha512sums=('SKIP')
 _arch='x64'
 
 pkgver() {
-	cd "${srcdir}/${pkgname%-efi-git}/"
-	printf '%s.r%s.g%s' "$(grep -Po 'REFIND_VERSION L"\K[\d.]+' "${srcdir}/${pkgname%-efi-git}/include/version.h")" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd "${srcdir}/${pkgname%-git}/"
+	printf '%s.r%s.g%s' "$(grep -Po 'REFIND_VERSION L"\K[\d.]+' "${srcdir}/${pkgname%-git}/include/version.h")" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-	cd "${srcdir}/${pkgname%-efi-git}/"
+	cd "${srcdir}/${pkgname%-git}/"
 	# removing the path prefix from the css reference, so that the css can live in the same directory
-	sed -e 's|../Styles/||g' -i "docs/${pkgname%-efi-git}/"*.html
+	sed -e 's|../Styles/||g' -i "docs/${pkgname%-git}/"*.html
 	# hardcode RefindDir, so that refind-install can find refind_x64.efi
 	sed -e 's|RefindDir=\"\$ThisDir/refind\"|RefindDir="/usr/share/refind/"|g' -i refind-install
 }
 
 build() {
-	cd "${srcdir}/${pkgname%-efi-git}/"
+	cd "${srcdir}/${pkgname%-git}/"
 	make
 	make gptsync
 	make fs
 }
 
 package() {
-	cd "${srcdir}/${pkgname%-efi-git}/"
+	cd "${srcdir}/${pkgname%-git}/"
 	# the install target calls refind-install, therefore we install things manually
 
 	# efi binaries
-	install -vDm 0644 refind/*.efi -t "${pkgdir}/usr/share/${pkgname%-efi-git}"
+	install -vDm 0644 refind/*.efi -t "${pkgdir}/usr/share/${pkgname%-git}"
 	install -vDm 0644 drivers_*/*.efi -t "${pkgdir}/usr/share/refind/drivers_${_arch}"
-	install -vDm 0644 gptsync/*.efi -t "${pkgdir}/usr/share/${pkgname%-efi-git}/tools_${_arch}"
+	install -vDm 0644 gptsync/*.efi -t "${pkgdir}/usr/share/${pkgname%-git}/tools_${_arch}"
 	# sample config
-	install -vDm 0644 "${pkgname%-efi-git}.conf-sample" -t "${pkgdir}/usr/share/${pkgname%-efi-git}"
+	install -vDm 0644 "${pkgname%-git}.conf-sample" -t "${pkgdir}/usr/share/${pkgname%-git}"
 	# keys
-	install -vDm 0644 keys/*{cer,crt} -t "${pkgdir}/usr/share/${pkgname%-efi-git}/keys"
+	install -vDm 0644 keys/*{cer,crt} -t "${pkgdir}/usr/share/${pkgname%-git}/keys"
 	# keysdir
 	install -vdm 0640 "${pkgdir}/etc/refind.d/keys"
 	# icons
-	install -vDm 0644 icons/*.png -t "${pkgdir}/usr/share/${pkgname%-efi-git}/icons"
-	install -vDm 0644 icons/svg/*.svg -t "${pkgdir}/usr/share/${pkgname%-efi-git}/icons/svg"
+	install -vDm 0644 icons/*.png -t "${pkgdir}/usr/share/${pkgname%-git}/icons"
+	install -vDm 0644 icons/svg/*.svg -t "${pkgdir}/usr/share/${pkgname%-git}/icons/svg"
 	# scripts
 	install -vDm 0755 {refind-{install,mkdefault},mkrlconf,mvrefind} -t "${pkgdir}/usr/bin"
-	install -vDm 0755 fonts/mkfont.sh "${pkgdir}/usr/bin/${pkgname%-efi-git}-mkfont"
+	install -vDm 0755 fonts/mkfont.sh "${pkgdir}/usr/bin/${pkgname%-git}-mkfont"
 	# man pages
 	install -vDm 0644 docs/man/*.8 -t "${pkgdir}/usr/share/man/man8"
 	# docs
-	install -vDm 0644 {CREDITS,NEWS,README}.txt -t "${pkgdir}/usr/share/doc/${pkgname%-efi-git}"
-	install -vDm 0755 fonts/README.txt "${pkgdir}/usr/share/doc/${pkgname%-efi-git}/README.${pkgname%-efi-git}-mkfont.txt"
-	install -vDm 0755 icons/README "${pkgdir}/usr/share/doc/${pkgname%-efi-git}/README.icons.txt"
-	install -vDm 0755 keys/README.txt "${pkgdir}/usr/share/doc/${pkgname%-efi-git}/README.keys.txt"
-	install -vDm 0644 "docs/${pkgname%-efi-git}/"*.{html,png,svg,txt} -t "${pkgdir}/usr/share/doc/${pkgname%-efi-git}/html"
-	install -vDm 0644 docs/Styles/*.css -t "${pkgdir}/usr/share/doc/${pkgname%-efi-git}/html"
+	install -vDm 0644 {CREDITS,NEWS,README}.txt -t "${pkgdir}/usr/share/doc/${pkgname%-git}"
+	install -vDm 0644 fonts/README.txt "${pkgdir}/usr/share/doc/${pkgname%-git}/README.${pkgname%-git}-mkfont.txt"
+	install -vDm 0644 icons/README "${pkgdir}/usr/share/doc/${pkgname%-git}/README.icons.txt"
+	install -vDm 0644 keys/README.txt "${pkgdir}/usr/share/doc/${pkgname%-git}/README.keys.txt"
+	install -vDm 0644 "docs/${pkgname%-git}/"*.{html,png,svg,txt} -t "${pkgdir}/usr/share/doc/${pkgname%-git}/html"
+	install -vDm 0644 docs/Styles/*.css -t "${pkgdir}/usr/share/doc/${pkgname%-git}/html"
 	# license
 	install -vDm 0644 LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }