Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5b54aa6d10ae29ba8bb4399e0dec4b0909220c47
commit 5b54aa6d10ae29ba8bb4399e0dec4b0909220c47
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sun May 15 16:36:32 2011 +0200
pacman-g2-3.8.2-1-i686
- version bump
- drop no longer necessary arm fix
diff --git a/source/base/pacman-g2/FrugalBuild
b/source/base/pacman-g2/FrugalBuild
index 8021501..37c9a5c 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -6,16 +6,16 @@ USE_DEVEL=${USE_DEVEL:-"n"}
USE_MINIMAL=${USE_MINIMAL:-"n"}
pkgname=pacman-g2
-pkgver=3.8.1
-Fuse $USE_DEVEL && pkgver=3.7.3.32.gedb838c
-pkgrel=5
+pkgver=3.8.2
+Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053
+pkgrel=1
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})
depends=('libarchive>=2.8.3-4' 'glibc>=2.12.1' 'grep>=2.5.3-4' 'util-linux')
if ! Fuse $USE_MINIMAL; then
makedepends=('doxygen>=1.7.3-1' 'po4a' 'swig' \
- 'java-gcj-compat>=1.0.77-2' 'ecj>=3.3.2-2' 'mono' 'asciidoc'
'docbook-xsl' \
+ 'openjdk' 'mono' 'asciidoc' 'docbook-xsl' \
'docbook-xml' 'sgml-common' 'cvs' 'vala')
options=('scriptlet')
fi
@@ -26,10 +26,8 @@ archs=('i686' 'x86_64' 'ppc' 'arm')
_F_archive_nosort=y
up2date="Flasttar $url/releases/"
if ! Fuse $USE_DEVEL; then
- source=($url/releases/$pkgname-$pkgver.tar.gz \
- http://git.frugalware.org/patches/pacman-g2/dfce2c5.patch \
- http://git.frugalware.org/patches/pacman-g2/eb95c03.patch)
- signatures=("$source.asc" "" "")
+ source=($url/releases/$pkgname-$pkgver.tar.gz)
+ signatures=("$source.asc")
else
_F_scm_type="git"
_F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2"
@@ -37,8 +35,6 @@ else
fi
if [ "$CARCH" == "arm" ]; then
- source=(${source[@]} fix-arch-package-arm.patch)
- signatures=("${signatures[@]}" "")
Fconfopts="$Fconfopts --disable-java"
fi
if [ "$CARCH" == "ppc" ]; then
diff --git a/source/base/pacman-g2/fix-arch-package-arm.patch
b/source/base/pacman-g2/fix-arch-package-arm.patch
deleted file mode 100644
index 8219df9..0000000
--- a/source/base/pacman-g2/fix-arch-package-arm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur pacman-g2-3.8.1//lib/libpacman/package.c
pacman-g2-3.8.1new//lib/libpacman/package.c
---- pacman-g2-3.8.1//lib/libpacman/package.c 2011-01-10 22:44:52.000000000
+0100
-+++ pacman-g2-3.8.1new//lib/libpacman/package.c 2011-02-17
23:00:08.355426001 +0100
-@@ -352,7 +352,7 @@
- }
-
- uname (&name);
-- if(strcmp(name.machine, info->arch)) {
-+ if(strncmp(name.machine, info->arch,
strlen(info->arch))) {
- _pacman_log(PM_LOG_ERROR, _("wrong
package architecture in %s"), pkgfile);
- pm_errno = PM_ERR_WRONG_ARCH;
- unlink(descfile);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
