From b3fa3341e50d6a761fe20c6ca4ce4de27529b38b Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Fri, 03 Feb 2012 13:53:57 -0500
Subject: Remove distinct version and revision variables.

---
diff --git a/src/oh-buildopk b/src/oh-buildopk
index 77c5e0f..1855173 100644
--- a/src/oh-buildopk
+++ b/src/oh-buildopk
@@ -67,7 +67,7 @@ if [ -n "${is_srcpkg}" ]; then
 	cd ..
 
 	# Pack opk file.
-	tar -czf ../../${pkg}_${OH_PKGVER}-${OH_PKGREV}_all.opk \
+	tar -czf ../../${pkg}_${OH_PKGVER}_all.opk \
 		debian-binary data.tar.gz control.tar.gz || exit 2
 	rm -Rf debian-binary control data.tar.gz control.tar.gz || exit 2
 else
@@ -96,7 +96,7 @@ else
 		cd ..
 
 		# Pack opk file.
-		tar -czf ../../${1}_${OH_PKGVER}-${OH_PKGREV}_${arch}.opk \
+		tar -czf ../../${1}_${OH_PKGVER}_${arch}.opk \
 			debian-binary data.tar.gz control.tar.gz || exit 2
 		rm -Rf debian-binary control data.tar.gz control.tar.gz || exit 2
 
diff --git a/src/opkbuild b/src/opkbuild
index 542fe4e..902e331 100644
--- a/src/opkbuild
+++ b/src/opkbuild
@@ -145,8 +145,7 @@ ${OH_ARCH}
 EOF
 export OH_ARCH_CPU OH_ARCH_VENDOR OH_ARCH_KERNEL OH_ARCH_LIBS
 export OH_SRCPKG="${srcpkg}"
-export OH_PKGVER=${version%'-'*}
-export OH_PKGREV=${version#*'-'}
+export OH_PKGVER=${version}
 
 # Check build dependencies.
 oh-checkbuilddeps || error "${srcpkg}-src"
--
cgit v0.9.1