================================
anaconda:source=10.2.1.5-13.1 (previous: 10.0-33.31)
cvc rdiff anaconda -1 /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/10.2.1.5-13.1
================================
10.2.1.5-13.1 Ken VanDine ([EMAIL PROTECTED]) Sun Aug 28 21:55:08 2005
Merged new tarball and some of the patch to intgegrate in Foresight
rpath_foresight.patch: new
diff -ur anaconda-10.2.1.5.orig/product.py anaconda-10.2.1.5/product.py
--- anaconda-10.2.1.5.orig/product.py 2005-08-20 23:39:24.000000000 -0400
+++ anaconda-10.2.1.5/product.py 2005-08-28 00:17:46.000000000 -0400
@@ -22,7 +22,7 @@
productName = "anaconda"
productVersion = "bluesky"
-productPath = "rpath"
+productPath = "Foresight"
bugUrl = "your distribution provided bug reporting tool."
if path is not None:
diff -ur anaconda-10.2.1.5.orig/scripts/mk-images
anaconda-10.2.1.5/scripts/mk-images
--- anaconda-10.2.1.5.orig/scripts/mk-images 2005-08-18 15:51:41.000000000
-0400
+++ anaconda-10.2.1.5/scripts/mk-images 2005-08-28 00:19:38.000000000 -0400
@@ -628,7 +628,8 @@
if [ $CONARY -eq 1 ]; then
# XXX hard code for now
- echo "installLabelPath [EMAIL PROTECTED]:devel [EMAIL PROTECTED]:devel"
> $MBD_DIR/etc/conaryrc
+ echo "autoResolve True" > $MBD_DIR/etc/conaryrc
+ echo "installLabelPath [EMAIL PROTECTED]:desktop [EMAIL
PROTECTED]:devel [EMAIL PROTECTED]:devel" >> $MBD_DIR/etc/conaryrc
fi
if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then
anaconda-10.2.1.5.tar.bz2: new
anaconda.recipe: changed
Index: anaconda.recipe
====================================================================
contents(size sha1)
inode(owner group)
--- anaconda.recipe /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/10.0-33.31
+++ anaconda.recipe /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/10.2.1.5-13.1
@@ -1,18 +1,30 @@
#
-# Copyright (c) 2004 Specifix, Inc.
+# Copyright (c) 2004-2005 rpath, Inc.
# All rights reserved
#
class Anaconda(PackageRecipe):
- buildRequires = [ 'bogl:devel', 'kudzu:devel', 'pump:devel',
- 'module-init-tools:runtime', 'newt:devel', 'rhpl:python',
- 'pciutils:devel', 'gtk:devel', 'popt:devel' ]
name = "anaconda"
- version = "10.0"
+ version = "10.2.1.5"
+ buildRequires = [ 'atk:devel', 'bogl:devel', 'bogl:runtime',
+ 'kudzu:devel', 'kudzu:python', 'pump:devel',
+ 'newt:devel', 'rhpl:python', 'pciutils:devel',
+ 'gtk:devel', 'popt:devel', 'e2fsprogs:devel',
+ 'slang:devel', 'pango:devel', 'pkgconfig:devel',
+ 'gettext:runtime', 'xorg-x11:devel',
+ 'glib:devel', 'zlib:devel', 'python:devel',
+ 'glibc:locale', 'bzip2:devel' ]
+
+ if Arch.x86:
+ buildRequires.extend([ 'dietlibc:runtime', 'dietlibc:devel' ])
def setup(self):
self.addArchive('anaconda-%(version)s.tar.bz2')
self.addPatch('fdl.patch')
self.Make('depend')
self.Make()
+
+ # keep _isys.so in /usr/lib/anaconda/ instead of /usr/lib64/anaconda
+ # since anaconda doesn't know about lib64 yet
+ self.FixupMultilibPaths(exceptions='.*')
self.MakeInstall()
anaconda-10.0.tar.bz2: removed
Committed by: krv
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
