From fd990c5d4ad8c9e0fd7f745db58b5d7859baeb1a Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Sun, 17 Aug 2003 13:31:09 +0000
Subject: [PATCH] "Stefan Paletta" <stefanp@cabal1.com>: mergeant011: needs to
 be built after libgnomedb08, fix attached. mono: $PATH lacks location of
 just-installed mcs; fix attached. mozilla does not build under Linux 2.6 for
 no good reason; a fix is attached. epiphany and galeon13 failed because of
 this.

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1097 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/sysfiles/mkpkg.sh                | 12 +++++++++---
 package/gnome2/libgnomedb08/libgnomedb08.desc |  2 +-
 package/mnemoc/mono/mono.in                   |  2 +-
 package/x11/mozilla/mozilla.conf              |  4 +++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/package/base/sysfiles/mkpkg.sh b/package/base/sysfiles/mkpkg.sh
index 05068ee4a..81edfad38 100644
--- a/package/base/sysfiles/mkpkg.sh
+++ b/package/base/sysfiles/mkpkg.sh
@@ -26,13 +26,19 @@ strace_pid=$!; sleep 1; cd $PWD
 sleep 1; kill -INT $strace_pid; sleep 1
 /usr/lib/fl_stparse -w $wlog < $slog
 touch /var/adm/flists/$pkg
-/usr/lib/fl_wrparse -s -r / -p "$pkg" < $wlog | cat /var/adm/flists/$pkg - |
+{
+  /usr/lib/fl_wrparse -s -r / -p "$pkg" < $wlog
+  for x in flists packages dependencies descs cksums md5sums ; do
+	echo "$pkg: var/adm/$x/$pkg" ; done
+} | cat /var/adm/flists/$pkg - |
 	egrep -v '^[^ ]+: (dev|proc|tmp)(/|$)' | sort -u > $flog
 cat $flog > /var/adm/flists/$pkg
 
 cd /
-cut -f2- -d' ' < var/adm/flists/$pkg | xargs cksum > var/adm/cksums/$pkg
-cut -f2- -d' ' < var/adm/flists/$pkg | xargs md5sum > var/adm/md5sums/$pkg
+egrep -v "^$pkg: var/adm/" var/adm/flists/$pkg | cut -f2- -d' ' | \
+ xargs cksum > var/adm/cksums/$pkg
+egrep -v "^$pkg: var/adm/" var/adm/flists/$pkg | cut -f2- -d' ' | \
+ xargs md5sum > var/adm/md5sums/$pkg
 
 touch var/adm/{dependencies,descs}/$pkg
 echo "Package Name and Version: $pkg 0000 mkpkg" > var/adm/packages/$pkg
diff --git a/package/gnome2/libgnomedb08/libgnomedb08.desc b/package/gnome2/libgnomedb08/libgnomedb08.desc
index 540dcbb28..26acebd0e 100644
--- a/package/gnome2/libgnomedb08/libgnomedb08.desc
+++ b/package/gnome2/libgnomedb08/libgnomedb08.desc
@@ -35,7 +35,7 @@
 [L] LGPL
 [S] Beta
 [V] 0.90.0
-[P] X -----5---9 548.000
+[P] X -----5---9 521.999
 
 [D] 0 libgnomedb-0.90.0.tar.gz ftp://ftp.gnome-db.org/pub/gnome-db/sources/v0.90.0/
 
diff --git a/package/mnemoc/mono/mono.in b/package/mnemoc/mono/mono.in
index cf2f87dc3..aa1573773 100644
--- a/package/mnemoc/mono/mono.in
+++ b/package/mnemoc/mono/mono.in
@@ -1,4 +1,4 @@
 [ "$prefix_auto" = 1 ] && prefix="opt/mono"
 set_confopt
 sysconfdir=${sysconfdir%/mono}
-
+PATH="$root/$prefix/bin:$PATH"
diff --git a/package/x11/mozilla/mozilla.conf b/package/x11/mozilla/mozilla.conf
index a839fc3a4..7205feb40 100644
--- a/package/x11/mozilla/mozilla.conf
+++ b/package/x11/mozilla/mozilla.conf
@@ -27,11 +27,13 @@ main_mozilla() {
 	export MOZILLA_FIVE_HOME=/usr/lib/mozilla-$ver
 	export MOZ_INTERNAL_LIBART_LGPL=1
 
-	# replace the 00... build-id with s.th. usefull
+	# replace the 00... build-id with s.th. useful
 	sed "s,0000000000,ROCK Linux - $rockver," \
 		xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new
 	mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in
 
+	cp security/coreconf/Linux2.5.mk security/coreconf/Linux2.6.mk
+
 	cat > .mozconfig <<-EOP
 # sh
 # Build configuration script