Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3eb29570eb9de3b4fd2764097ee79fd00fc8a204

commit 3eb29570eb9de3b4fd2764097ee79fd00fc8a204
Author: crazy <[email protected]>
Date:   Wed Feb 1 12:58:14 2017 +0100

pacman-g2-3.9.2-14-x86_64
* fix mercurial cmd

diff --git a/source/base/pacman-g2/0001-fix-mercurial-cmd.patch 
b/source/base/pacman-g2/0001-fix-mercurial-cmd.patch
new file mode 100644
index 0000000..f808734
--- /dev/null
+++ b/source/base/pacman-g2/0001-fix-mercurial-cmd.patch
@@ -0,0 +1,25 @@
+From 4980f34c8554594c8935c3a3370797d34f31ea4b Mon Sep 17 00:00:00 2001
+From: crazy <[email protected]>
+Date: Wed, 1 Feb 2017 12:52:03 +0100
+Subject: [PATCH] fix mercurial cmd
+
+---
+ scripts/makepkg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/makepkg b/scripts/makepkg
+index e2487658..41468d7e 100755
+--- a/scripts/makepkg
++++ b/scripts/makepkg
+@@ -1284,7 +1284,7 @@ if [ "$NOUP2DATE" = "0" ]; then
+                                       cvs)    cmd="cvs";;
+                                       subversion)     cmd="subversion";;
+                                       git)    cmd="git";;
+-                                      mercurial)      cmd="mercurial";;
++                                      mercurial)      cmd="hg";;
+                                       bzr)    cmd="bzr";;
+                               esac
+                       else
+--
+2.11.0
+
diff --git a/source/base/pacman-g2/FrugalBuild 
b/source/base/pacman-g2/FrugalBuild
index 9d6af62..53bcddc 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -9,7 +9,7 @@ USE_MINIMAL=${USE_MINIMAL:-"n"}
pkgname=pacman-g2
pkgver=3.9.2
Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053
-pkgrel=13
+pkgrel=14
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-current)
@@ -41,8 +41,8 @@ if ! Fuse $USE_DEVEL; then
0001-workaround-LDFLAGS-mess-here.patch \
0002-remove-duplicated-check.patch \
0001-workaround-some-issues-with-up2date-checking.patch \
-       strip-multilib.patch strip-2-multilib.patch)
-       signatures=("$source.asc" '' '' '' '' '' '' '' '' '' '' '')
+       strip-multilib.patch strip-2-multilib.patch 
0001-fix-mercurial-cmd.patch)
+       signatures=("$source.asc" '' '' '' '' '' '' '' '' '' '' '' '')
else
_F_scm_type="git"
_F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2"
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to