summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-06-22 08:28:03 +0200
committerErich Eckner <git@eckner.net>2018-06-22 08:28:03 +0200
commitb452a2a85237eef50db49d793caae4ffca8de243 (patch)
tree30fd9a70d62f6a960f65ab788fbf8d95867b8ff0
parent4fc55d42a2aae1c677ebb7ac9d52fe05815dd36c (diff)
downloadbuilder-b452a2a85237eef50db49d793caae4ffca8de243.tar.xz
lib/common-functions, lib/mysql-functions: remove artificial dependencies $p-{doc,i18n} -> $p -- they should be covered by the "package-source blob" logic
-rwxr-xr-xlib/common-functions15
-rwxr-xr-xlib/mysql-functions11
2 files changed, 1 insertions, 25 deletions
diff --git a/lib/common-functions b/lib/common-functions
index 64a11a7..8c21101 100755
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -319,20 +319,7 @@ make_source_info() {
printf 'upstream_git_repository = %s\n' "${git_repo}"
printf 'PKGBUILD = %s\n' "${PKGBUILD}"
printf 'PKGBUILD_mod = %s\n' "${PKGBUILD_mod}"
- makepkg --printsrcinfo | \
- sed '
- /^pkgname = / ! b
- /= python2\?-oslo-i18n$/ b
- s/= \(\S\+\)-i18n$/\0\n\tdepends = \1/
- t
- /= gtk-doc$/ b
- s/= \(openjdk[0-9]\+\)-doc$/\0\n\tdepends = \1-src/
- t
- s/= \(qt5\)-doc$/\0\n\tdepends = \1-base/
- t
- s/= \(\S\+\)-docs\?$/\0\n\tdepends = \1/
- t
- '
+ makepkg --printsrcinfo
cd ..
} > \
"${output}" || \
diff --git a/lib/mysql-functions b/lib/mysql-functions
index fc8e9f6..c7c87f0 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -510,17 +510,6 @@ mysql_generate_package_metadata() {
s|^| (from_base64("|
s|$|")),|
'
- # TODO: this seems not the right place to insert these dependencies
- # make_source_info() seems suited much better, but there we don't
- # have (yet) the pkgver extracted ...
- if printf '%s' "${pkgname}" | \
- base64 -d | \
- grep -q -- '-doc$'; then
- printf ' (CONCAT(from_base64("%s"),"-",from_base64("%s"),":",from_base64("%s"))),\n' \
- "$(printf '%s' "${pkgname}" | base64 -d | sed 's/-doc$//' | base64 -w0)" \
- "${epoch}" \
- "${pkgver}"
- fi
printf ' ("base");\n'
echo "${checkdepends}" | \