--- a/ChangeLog	Tue Feb 24 16:00:39 2004 +0000
+++ b/ChangeLog	Tue Feb 24 16:20:31 2004 +0000
@@ -1,3 +1,12 @@
+2004-02-24  Niall Power  <[email protected]>
+
+	* libtool.spec: add build requirement of autoconf-jds and set up PATH
+	  to detect it during build stage.
+	* autoconf-jds.spec: update to version 2.59 to fix broken builds
+	* automake-jds.spec: update to version 1.82 to fix broken builds
+	* control-center.spec: set and export ACLOCAL_FLAGS on linux to
+	  pick up necessary JDS_CBE aclocal macros
+
 2004-02-24  Ghee Teo  <[email protected]>
 
 	* Ported nautilus printing patch and also corrected a typo in function

--- a/autoconf-jds.spec	Tue Feb 24 16:00:39 2004 +0000
+++ b/autoconf-jds.spec	Tue Feb 24 16:20:31 2004 +0000
@@ -1,5 +1,5 @@
 #
-# spec file for package autoconf-jds (Version 2.58)
+# spec file for package autoconf-jds (Version 2.59)
 #
 # Copyright (c) 2004 Sun Micorsystems, Inc.
 # This file and all modifications and additions to the pristine
@@ -16,8 +16,8 @@
 Autoreqprov:  on
 Requires:     m4
 PreReq:       %{install_info_prereq}
-Version:      2.58
-Release:      4
+Version:      2.59
+Release:      0
 Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 Summary:      A Java Desktop System (TM) Specific GNU Tool for Automatically Configuring Source Code
@@ -73,11 +73,11 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{bindir}/*
 %{datadir}/autoconf
-%{datadir}/emacs/site-lisp/*.el
-%{datadir}/emacs/site-lisp/*.elc
 %doc %{infodir}/*
 %doc %{mandir}/man1/*.1
 
 %changelog -n autoconf-jds
+* Tue Feb 24 2004 - [email protected]
+- update to version 2.59
 * Fri Feb 20 2004 - [email protected]
 - Initial version 2.58

--- a/automake-jds.spec	Tue Feb 24 16:00:39 2004 +0000
+++ b/automake-jds.spec	Tue Feb 24 16:20:31 2004 +0000
@@ -15,9 +15,8 @@
 Group:        Development/Tools/Building
 Autoreqprov:  on
 PreReq:       %{install_info_prereq}
-Version:      1.8
-Release:      4
-Distribution: Cinnabar
+Version:      1.8.2
+Release:      0
 %define apiversion %(echo %version | sed -e 's/^\\([0-9]*\\.[0-9]*[a-z]*\\).*$/\\1/')
 Summary:      A Java Desktop System (TM) Specific Program for Automatically Generating GNU-Style Makefile.in files
 URL:          http://www.gnu.org/software/automake
@@ -77,5 +76,7 @@
 %{datadir}/automake-%{apiversion}
 
 %changelog -n automake
+* Tue Feb 24 2004 - [email protected]
+- update to version 1.82
 * Fri Feb 20 2004 - [email protected]
 - new spec file version 1.8

--- a/control-center.spec	Tue Feb 24 16:00:39 2004 +0000
+++ b/control-center.spec	Tue Feb 24 16:20:31 2004 +0000
@@ -2,10 +2,10 @@
 License:      GPL
 Group:        System/GUI/GNOME
 Version:      2.5.3
-Release:      4
-Distribution: Cinnabar
+Release:      5
+Distribution: Mercury
 Vendor:       Sun Microsystems, Inc.
-Summary:      The GNOME control center for GNOME 2.4
+Summary:      The GNOME control center for GNOME 2.6
 Source:       http://ftp.gnome.org/pub/GNOME/sources/control-center/2.4/control-center-%{version}.tar.bz2
 Source1:      control-center-l10n-po-0.6.tar.bz2
 Source2:      gnome-accessibility-keyboard-properties.1.gz
@@ -61,7 +61,7 @@
 BuildRequires: libxklavier-devel >= %{libxklavier_version}
 BuildRequires: autoconf-jds >= %{autoconf_jds_version}
 BuildRequires: automake-jds >= %{automake_jds_version}
-# BuildRequires: libtool-jds >= %{libtool_jds_version}
+BuildRequires: libtool-jds >= %{libtool_jds_version}
 
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: esound >= %{esound_version}
@@ -92,9 +92,10 @@
 %build
 %ifos linux
 export PATH=%{JDS_CBE_prefix}/bin:$PATH
+export ACLOCAL_FLAGS="-I %{JDS_CBE_prefix}/share/aclocal -I %{_datadir}/aclocal"
 %endif
 libtoolize --force
-aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal -I %{_datadir}/aclocal/gnome2-macros -I .
+aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros -I .
 autoheader
 automake -a -c -f
 autoconf
@@ -166,6 +167,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 24 2004 - [email protected]
+- set and export ACLOCAL_FLAGS on linux to
+  pick up necessary JDS_CBE  aclocal macros.
+
 * Fri Feb 20 2004 - [email protected]
 - Added build dependencies on jds CBE auto* tools
   and set PATH to pick up their location on linux

--- a/libtool-jds.spec	Tue Feb 24 16:00:39 2004 +0000
+++ b/libtool-jds.spec	Tue Feb 24 16:20:31 2004 +0000
@@ -17,13 +17,16 @@
 PreReq:       %{install_info_prereq}
 Summary:      A Java Desktop System (TM) specifictool to build shared libraries
 Version:      1.5
-Release:      4
+Release:      5
 Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 URL:          http://www.gnu.org/software/libtool/
 Source:       ftp://ftp.gnu.org/pub/gnu/libtool/libtool-%{version}.tar.bz2
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
+# Defines the standard prefix of the JDS common build environment
+%define JDS_CBE_prefix /opt/jds
+
 %define prefix          /opt/jds
 %define bindir          %{prefix}/bin
 %define includedir	%{prefix}/include
@@ -34,6 +37,9 @@
 %define infodir         %{datadir}/info
 %define mandir          %{datadir}/man
 %define sysconfdir      %{prefix}/etc
+%define autoconf_jds_version 2.58
+
+BuildRequires: autoconf-jds >= %{autoconf_jds_version}
 
 
 %description
@@ -50,6 +56,8 @@
 %setup -q -n libtool-%{version}
 
 %build
+export PATH=%{JDS_CBE_prefix}/bin:$PATH
+
 ./configure CFLAGS="$RPM_OPT_FLAGS" \
    --prefix=%{prefix} --infodir=%{infodir} --libdir=%{libdir}
 make
@@ -74,5 +82,8 @@
 %{datadir}/libtool
 
 %changelog -n libtool-jds
+* Tue Feb 24 2004 - [email protected]
+- add build requirement of autoconf-jds and
+  set up PATH to pick it up during build stage
 * Fri Feb 20 2004 - [email protected]
 - inital spec file created, version 1.5