Merge branch '2.6' into 2.7

Conflicts: lvm2/Pkgfile
2010-09-28 20:30:58 +02:00 · 2010-09-28 20:30:58 +02:00 · 9cbb3c6ebf
commit 9cbb3c6ebf
parent 6d6c1dd25e 88f9231290
3 changed files with 3 additions and 3 deletions
--- a/gnuplot/.md5sum
+++ b/gnuplot/.md5sum
@ -1 +1 @@
-296e2904363e508bd8cb7e8ea1d267e8  gnuplot-4.4.1.tar.gz
+a4f0dd89f9b9334890464f687ddd9f50  gnuplot-4.4.2.tar.gz
--- a/gnuplot/Pkgfile
+++ b/gnuplot/Pkgfile
@ -5,7 +5,7 @@
 # Depends on:  libgd pango

 name=gnuplot
-version=4.4.1
+version=4.4.2
 release=1
 source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz)

--- a/lvm2/Pkgfile
+++ b/lvm2/Pkgfile
@ -6,7 +6,7 @@
 name=lvm2
 version=2.02.73
 release=1
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$version.tgz
+source=(ftp://sources.redhat.com/pub/lvm2/old/LVM2.$version.tgz
        lvm2-static_build.patch)

 build() {