Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing

Conflicts:
	abs/core/tzdata/PKGBUILD

5 files changed, 17 insertions, 4 deletions

diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD
index e25f7a7..80dabe4 100644
--- a/abs/core/pacman/PKGBUILD
+++ b/abs/core/pacman/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=pacman
 pkgver=3.5.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
diff --git a/abs/core/pacman/pacman-3.5.3-2.src.tar.gz b/abs/core/pacman/pacman-3.5.3-2.src.tar.gz
deleted file mode 120000
index 3ed024f..0000000
--- a/abs/core/pacman/pacman-3.5.3-2.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/data/pkg_repo/packages/pacman-3.5.3-2.src.tar.gz
\ No newline at end of file
diff --git a/abs/core/pacman/pacman-3.5.3-3.src.tar.gz b/abs/core/pacman/pacman-3.5.3-3.src.tar.gz
deleted file mode 120000
index 2736d3b..0000000
--- a/abs/core/pacman/pacman-3.5.3-3.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/data/pkg_repo/packages/pacman-3.5.3-3.src.tar.gz
\ No newline at end of file
diff --git a/abs/core/pacman/pacman-3.5.3-4.src.tar.gz b/abs/core/pacman/pacman-3.5.3-4.src.tar.gz
deleted file mode 120000
index 1404e78..0000000
--- a/abs/core/pacman/pacman-3.5.3-4.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/data/pkg_repo/packages/pacman-3.5.3-4.src.tar.gz
\ No newline at end of file
diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install
index a3066bc..c066733 100644
--- a/abs/core/pacman/pacman.install
+++ b/abs/core/pacman/pacman.install
@@ -9,6 +9,7 @@ post_upgrade() {
     if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then
         _warnupgrade
     fi
+    _updateconf
     echo ">>>"
     echo ">>> ATTENTION! ATTENTION! ATTENTION!"
     echo ">>> /etc/pacman.conf has changed. If you have customized your"
@@ -18,6 +19,21 @@ post_upgrade() {
     echo ">>>"
 }
 
+_updateconf() {
+    pacconf="/etc/pacman.conf"
+    #add SyncFirst
+    grep -q SyncFirst $pacconf
+    if [ $? -eq 1 ]
+    then
+        sed -i '/\[options\]/  a\SyncFirst = pacman ' $pacconf
+    fi
+    #remove larch
+    sed -i '/larch/d' $pacconf
+
+}
+    
+
+
 _warnupgrade() {
     echo ">>>"
     echo ">>> The pacman database format has changed as of pacman 3.5.0."