diff --git a/pacman-helpme/PKGBUILD b/pacman-helpme/PKGBUILD new file mode 100644 index 000000000..8ca9af583 --- /dev/null +++ b/pacman-helpme/PKGBUILD @@ -0,0 +1,24 @@ +# +# Core Packages for Chakra, part of chakra-project.org +# +# maintainer: abveritas@chakra-project.org + +pkgname=pacman-helpme +pkgver=2012.12 +pkgrel=1 +pkgdesc="Scripts to assist with conflicts in updates" +arch=('x86_64') +url="http://www.chakra-project.org" +license=('GPL2') +depends=('filesystem') +makedepends=('asciidoc') +install=pacman-helpme.install +source=('pacman-helpme') +md5sums=('5c13e46fecfe8ae9f448338fadc905ea') + +package() { + cd ${srcdir} + # setup /etc + mkdir ${pkgdir}/etc + install -m644 -t ${pkgdir}/etc pacman-helpme +} diff --git a/pacman-helpme/pacman-helpme b/pacman-helpme/pacman-helpme new file mode 100644 index 000000000..7585f9632 --- /dev/null +++ b/pacman-helpme/pacman-helpme @@ -0,0 +1,2 @@ +#!/bin/bash +# Any needed instructions or command for updates \ No newline at end of file diff --git a/pacman-helpme/pacman-helpme.install b/pacman-helpme/pacman-helpme.install new file mode 100644 index 000000000..fb38e456a --- /dev/null +++ b/pacman-helpme/pacman-helpme.install @@ -0,0 +1,17 @@ +#!/bin/bash +# tputcolors +post_install() { + post_upgrade +} + +post_upgrade() { + # remove symlinks from old talloc 2.0.1 + echo -e '\e[31;46m WARNING' + echo -e '\e[31;46m Talloc is an old package that created symlinks, which pacman does not recognize as belonging to talloc' + echo -e '\e[31;46m How to handle this update:' + echo -e '\e[31;46m sudo pacman -S talloc --force' + echo -e '\e[31;46m sudo pacman -Syu \e[0m' + #rm -f /usr/lib/libtalloc.so.1 + #rm -f /usr/lib/libtalloc.so.2 + +} diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD index 8758f2a4f..1d3f95846 100644 --- a/pacman/PKGBUILD +++ b/pacman/PKGBUILD @@ -1,18 +1,18 @@ # # Chakra Packages for Chakra, part of chakra-project.org # -# maintainer abveritas +# maintainer pkgname=pacman pkgver=4.0.2 -pkgrel=8 +pkgrel=9 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base') depends=('bash' 'glibc' 'libarchive>=3.0.2' 'curl>=7.19.4' - 'gpgme' 'pacman-mirrorlist') + 'gpgme' 'pacman-mirrorlist' 'pacman-helpme') makedepends=('asciidoc') optdepends=('fakeroot: for makepkg usage as normal user') backup=(etc/pacman.conf etc/makepkg.conf) @@ -22,14 +22,12 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf.x86_64 pacman.conf makepkg.conf - add_categories.patch - https://gitorious.org/chakra/pacman-info/blobs/raw/master/pacman) + add_categories.patch) md5sums=('289ba4a19a16393096e065cec1cb9b0a' - '7cc09e46386579933ef50cea30b8389a' - '6c79bb013b5b6a14126ebcdaef12fdcd' + '5b4f1048875e50226071edf7d71ce0fa' + '898941a2b58152c45b00a139847606c3' '5beebe36bfc1e1f677d5ae12fcff8083' - 'a5d5c520ed75311d1875e0835563af33' - 'f18bdf69f551138b093a4d7c7c299e9a') + 'a5d5c520ed75311d1875e0835563af33') build() { cd $srcdir/$pkgname-$pkgver @@ -69,8 +67,5 @@ package() { ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f" done install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman - - mv $pkgdir/usr/bin/pacman $pkgdir/usr/bin/pacmanbin - install -Dm775 $srcdir/pacman $pkgdir/usr/bin/pacman } diff --git a/pacman/pacman.conf b/pacman/pacman.conf index 42d6f18bb..8288d78f3 100644 --- a/pacman/pacman.conf +++ b/pacman/pacman.conf @@ -13,9 +13,9 @@ #DBPath = /var/lib/pacman/ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log -HoldPkg = pacman glibc +HoldPkg = pacman glibc pacman-helpme # If upgrades are available for these packages they will be asked for first -SyncFirst = pacman +SyncFirst = pacman-helpme pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/curl -C - %u > %o #CleanMethod = KeepInstalled diff --git a/pacman/pacman.conf.x86_64 b/pacman/pacman.conf.x86_64 index e25dc92e0..c39484895 100644 --- a/pacman/pacman.conf.x86_64 +++ b/pacman/pacman.conf.x86_64 @@ -13,9 +13,9 @@ #DBPath = /var/lib/pacman/ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log -HoldPkg = pacman glibc +HoldPkg = pacman glibc pacman-helpme # If upgrades are available for these packages they will be asked for first -SyncFirst = pacman +SyncFirst = pacman-helpme pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/curl -C - %u > %o #CleanMethod = KeepInstalled diff --git a/sed/PKGBUILD b/sed/PKGBUILD index 9c0ae1c96..520ea27ac 100644 --- a/sed/PKGBUILD +++ b/sed/PKGBUILD @@ -6,7 +6,7 @@ pkgname=sed pkgver=4.2.1 -pkgrel=5 +pkgrel=6 pkgdesc="GNU stream editor" arch=('x86_64') url="http://www.gnu.org/software/sed" @@ -23,6 +23,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ + --bindir=/bin \ --without-included-regex make