Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=3fdce4c5eeb37d79f473b1e45feef13df7fa8f0c
commit 3fdce4c5eeb37d79f473b1e45feef13df7fa8f0c Author: crazy <[email protected]> Date: Wed Jan 6 21:00:44 2016 +0100 pacman-g2-3.9.0-26-x86_64 * added fix from git , commit 7c90cc5 diff --git a/source/base/pacman-g2/0001-makepkg-frugalware-package-is-allowed-to-add-all-kin.patch b/source/base/pacman-g2/0001-makepkg-frugalware-package-is-allowed-to-add-all-kin.patch new file mode 100644 index 0000000..0b0c871 --- /dev/null +++ b/source/base/pacman-g2/0001-makepkg-frugalware-package-is-allowed-to-add-all-kin.patch @@ -0,0 +1,36 @@ +From 7c90cc591e60dea0b9957771119c636a9d480157 Mon Sep 17 00:00:00 2001 +From: crazy <[email protected]> +Date: Wed, 6 Jan 2016 20:51:50 +0100 +Subject: [PATCH] makepkg - frugalware package is allowed to add all kind + folders + +--- + scripts/makepkg | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/scripts/makepkg b/scripts/makepkg +index ded62a7..f11b328 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -1728,11 +1728,13 @@ do + ## /lib64 and /usr/lib/64 .. this is a symlink in our layout + ## so don't install there + if [ -d ${dir}/lib64 ] || [ -d ${dir}/usr/lib64 ]; then +- error "Your package has broken /lib or /usr/lib PATH" +- error "Files are installed in 'lib64'" +- error "but should be /lib or /usr/lib!" +- error "Bailing out, please fix your package!" +- exit 1 ++ if [[ ! $pkgname =~ "frugalware" ]]; then ++ error "Your package has broken /lib or /usr/lib PATH" ++ error "Files are installed in 'lib64'" ++ error "but should be /lib or /usr/lib!" ++ error "Bailing out, please fix your package!" ++ exit 1 ++ fi + fi + ## don't insstall files in /usr/<file> + files=$(find ${dir}/usr -maxdepth 1 -type f) +-- +2.6.4 + diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 2d1d302..8b3c79c 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -10,7 +10,7 @@ USE_STABLE=${USE_STABLE:-"n"} pkgname=pacman-g2 pkgver=3.9.0 Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053 -pkgrel=25 +pkgrel=26 pkgdesc="A .tar.xz based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/"; backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) @@ -54,8 +54,9 @@ if ! Fuse $USE_DEVEL; then 0002-makepkg-print-host-flags-in-build.patch \ 0001-makepkg-fix-optimization-check.patch \ 0001-try-to-fix-gpg-verify-issues.patch \ - 0001-makepkg-check-for-errors.patch) - signatures=("$source.asc" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') + 0001-makepkg-check-for-errors.patch \ + 0001-makepkg-frugalware-package-is-allowed-to-add-all-kin.patch) + signatures=("$source.asc" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') if Fuse $USE_STABLE; then source=("${source[@]}" stable.patch) signatures=("${signatures[@]}" '') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
