From 32fa2c25d6533981731612405fb39cbb137e6c54 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Thu, 15 May 2014 22:12:32 -0400
Subject: Drop patches from upstream.

---
(limited to 'patches')

diff --git a/patches/01_ob-checkbuilddeps-set-substvars.patch b/patches/01_ob-checkbuilddeps-set-substvars.patch
deleted file mode 100644
index 4eff20e..0000000
--- a/patches/01_ob-checkbuilddeps-set-substvars.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: "P. J. McDermott" <pj@pehjota.net>
-Origin: upstream, http://git.proteanos.com/opkbuild/opkbuild.git/commit/?id=512bdbe
-Date: Tue, 13 May 2014 16:01:35 -0400
-Subject: ob-checkbuilddeps: Set substvars.
-
-ob_set_package_substvars() expects the name of a binary package as an
-argument, even though its implementation for SPF 2.x doesn't use the
-argument and SPF 2.0 doesn't specify any substitution variables that are
-specific to a binary package.
-
-I probably planned to add some binary-specific variables ("Binary"
-maybe?) but never did.
-
-For now we'll just call ob_set_package_substvars() with an empty
-argument.
----
- src/ob-checkbuilddeps.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh
-index bb17560..6b41416 100644
---- a/src/ob-checkbuilddeps.sh
-+++ b/src/ob-checkbuilddeps.sh
-@@ -32,6 +32,7 @@ main()
- 
- 	ob_init_package '..' || exit 1
- 	ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
-+	ob_set_package_substvars ''
- 
- 	check_build_deps
- 	return ${?}
diff --git a/patches/02_ob-checkbuilddeps-fix-status-check.patch b/patches/02_ob-checkbuilddeps-fix-status-check.patch
deleted file mode 100644
index 81d6f01..0000000
--- a/patches/02_ob-checkbuilddeps-fix-status-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: "P. J. McDermott" <pj@pehjota.net>
-Origin: upstream, http://git.proteanos.com/opkbuild/opkbuild.git/commit/?id=6208979
-Date: Tue, 13 May 2014 16:25:36 -0400
-Subject: ob-checkbuilddeps: Fix status check.
-
-This was breaking on packages with a status field like:
-
-    Status: install user installed
----
- src/ob-checkbuilddeps.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh
-index 6b41416..6005563 100644
---- a/src/ob-checkbuilddeps.sh
-+++ b/src/ob-checkbuilddeps.sh
-@@ -81,7 +81,7 @@ check_dep()
- 	ob_parse_dep -p dep_pkg -r dep_rel -v dep_ver "${dep}"
- 	status="$(@@OPKG@@ status "${dep_pkg}")"
- 
--	if ! printf '%s\n' "${status}" | grep '^Status: .*ok installed$' \
-+	if ! printf '%s\n' "${status}" | grep '^Status: .* .* installed$' \
- 			>/dev/null 2>&1; then
- 		return 1
- 	fi
--- 
-1.8.5.3
-
--
cgit v0.9.1