pkgrel 3: avoid confliction to base

2 files changed, 21 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 376b8aaaca27..82a3c9afb8c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,8 +10,6 @@ pkgbase = misc-tools-git
 	provides = misc-tools
 	conflicts = misc-tools
 	source = misc-tools::git+https://github.com/ShellShoccar-jpn/misc-tools
-	source = rename-coreutils-util-linux.patch
 	md5sums = SKIP
-	md5sums = 80df841296beaa5144df620f19e941f9
 
 pkgname = misc-tools-git
diff --git a/PKGBUILD b/PKGBUILD
index 8adbdf322585..99e46cb12cac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,11 +16,9 @@ replaces=()
 backup=()
 options=()
 install=
-source=("${pkgname%-git}::git+https://github.com/ShellShoccar-jpn/misc-tools"
-	'rename-coreutils-util-linux.patch')
+source=("${pkgname%-git}::git+https://github.com/ShellShoccar-jpn/misc-tools")
 noextract=()
-md5sums=('SKIP'
-	'80df841296beaa5144df620f19e941f9')
+md5sums=('SKIP')
 
 pkgver() {
 	cd "$srcdir/${pkgname%-git}"
@@ -31,16 +29,32 @@ pkgver() {
 
 prepare() {
 	cd "$srcdir/${pkgname%-git}"
-	patch -p1 < "$srcdir"/rename-coreutils-util-linux.patch
-	chmod a+x misc-tools-*
+
+	# Rename coreutils things
+	mv base64 misc-tools-base64
+	mv mktemp misc-tools-mktemp
+	mv seq misc-tools-seq
+	mv truncate misc-tools-truncate
+	mv C_SRC/sleep.c C_SRC/misc-tools-sleep.c
+
+	# Rename util-linux things
+	mv rev misc-tools-rev
+
+	# We don't need these things
+	rm *.tmp *.old
+
+	# TODO: fsed confliction against open-usp-tukubai
 }
 
 build() {
 	cd "$srcdir/${pkgname%-git}"
 
-# build C programs
+
+	# build C programs
 	cd C_SRC
+	chmod a+x MAKE.sh
 	./MAKE.sh
+	chmod a-x MAKE.sh
 }
 
 package() {
@@ -50,9 +64,6 @@ package() {
 	for x in ./* ./C_SRC/*; do
 		[[ -f $x && -x $x ]] || continue
 
-		# should be updated when upstream repo's policy is changed
-		case "$x" in *MAKE.sh|*.tmp|*.old) continue;; esac
-
 		# finally
 		install -Dm0755 -t "$pkgdir/usr/bin/" "$x"
 	done