--- a/ChangeLog Wed Sep 01 13:41:35 2004 +0000
+++ b/ChangeLog Wed Sep 01 13:42:01 2004 +0000
@@ -1,3 +1,10 @@
+2004-09-01 Dermot McCluskey <[email protected]>
+ * apoc-adapter-java.spec apoc-agent-templates.spec apoc-base.spec
+ * apoc-cli-misc.spec apoc-cli.spec apoc-config.spec
+ * apoc-gnome-templates.spec apoc-gnome26-templates.spec
+ * apoc-manager.spec apoc-misc.spec apoc-staroffice-templates.spec
+ * apoc.spec: new taballs for build 17b
+
2004-09-01 Matt Keenan <[email protected]>
* gnome-im-switcher.spec : Added javahelp-convert for imswitcher docs
--- a/Solaris/ChangeLog Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/ChangeLog Wed Sep 01 13:42:01 2004 +0000
@@ -1,3 +1,9 @@
+2004-09-01 Dermot McCluskey <[email protected]>
+ * SUNWapbas.spec SUNWapcj.spec SUNWapcli.spec SUNWapcmc.spec
+ * SUNWapdc.spec SUNWapg26.spec SUNWapm.spec SUNWapmca.spec
+ * SUNWapmgo.spec SUNWapmsc.spec SUNWapmso.spec SUNWapoc.spec:
+ * new tarballs for build 17b
+
2004-08-30 Damien Donlon <[email protected]>
* Uprevved SUNWgnome-dtlogin-integration.spec to fix 5093158
--- a/Solaris/SUNWapbas.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/SUNWapbas.spec Wed Sep 01 13:42:01 2004 +0000
@@ -5,7 +5,7 @@
#
%include Solaris.inc
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%ifarch sparc
%define PLATFORM unxsols4
@@ -48,6 +48,9 @@
make PLATFORM=%{PLATFORM} apoc-base
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarballs for build 17b
+
* Fri Aug 13 2004 - [email protected]
- corrected product version to 1.1
--- a/Solaris/SUNWapcj.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/SUNWapcj.spec Wed Sep 01 13:42:01 2004 +0000
@@ -5,7 +5,7 @@
#
%include Solaris.inc
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%ifarch sparc
%define PLATFORM unxsols4
@@ -54,6 +54,9 @@
make PLATFORM=%{PLATFORM} apoc-adapter-java
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarballs for build 17b
+
* Fri Aug 13 2004 - [email protected]
- corrected product version to 1.1
--- a/Solaris/SUNWapcli.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/SUNWapcli.spec Wed Sep 01 13:42:01 2004 +0000
@@ -5,7 +5,7 @@
#
%include Solaris.inc
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%ifarch sparc
%define PLATFORM unxsols4
@@ -55,6 +55,9 @@
make PLATFORM=%{PLATFORM} apoc-cli
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarballs for build 17b
+
* Fri Jul 23 2004 - [email protected]
- adapted source tarball name for build 15
--- a/Solaris/SUNWapcmc.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/SUNWapcmc.spec Wed Sep 01 13:42:01 2004 +0000
@@ -5,7 +5,7 @@
#
%include Solaris.inc
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%ifarch sparc
%define PLATFORM unxsols4
@@ -44,6 +44,9 @@
make PLATFORM=%{PLATFORM} apoc-cli-misc
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarballs for build 17b
+
* Fri Aug 13 2004 - [email protected]
- corrected product version to 1.1
--- a/Solaris/SUNWapdc.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/SUNWapdc.spec Wed Sep 01 13:42:01 2004 +0000
@@ -5,7 +5,7 @@
#
%include Solaris.inc
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%ifarch sparc
%define PLATFORM unxsols4
@@ -76,6 +76,9 @@
make PLATFORM=%{PLATFORM} apoc-config
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarballs for build 17b
+
* Fri Aug 13 2004 - [email protected]
- renamed SUNWapdcl to SUNWapdc-root as requested by RE
--- a/Solaris/SUNWapg26.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/SUNWapg26.spec Wed Sep 01 13:42:01 2004 +0000
@@ -5,7 +5,7 @@
#
%include Solaris.inc
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%ifarch sparc
%define PLATFORM unxsols4
@@ -62,6 +62,9 @@
make PLATFORM=%{PLATFORM} apoc-gnome26-templates
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarballs for build 17b
+
* Fri Jul 23 2004 - [email protected]
- adapted source tarball name for build 15
--- a/Solaris/SUNWapm.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/SUNWapm.spec Wed Sep 01 13:42:01 2004 +0000
@@ -5,7 +5,7 @@
#
%include Solaris.inc
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%ifarch sparc
%define PLATFORM unxsols4
@@ -77,6 +77,9 @@
make PLATFORM=%{PLATFORM} apoc-manager
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarballs for build 17b
+
* Fri Jul 23 2004 - [email protected]
- adapted source tarball name for build 15
--- a/Solaris/SUNWapmca.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/SUNWapmca.spec Wed Sep 01 13:42:01 2004 +0000
@@ -5,7 +5,7 @@
#
%include Solaris.inc
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%ifarch sparc
%define PLATFORM unxsols4
@@ -62,6 +62,9 @@
make PLATFORM=%{PLATFORM} apoc-agent-templates
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarballs for build 17b
+
* Fri Jul 23 2004 - [email protected]
- adapted source tarball name for build 15
--- a/Solaris/SUNWapmgo.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/SUNWapmgo.spec Wed Sep 01 13:42:01 2004 +0000
@@ -5,7 +5,7 @@
#
%include Solaris.inc
-%define t_suffix -build14
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%ifarch sparc
%define PLATFORM unxsols4
@@ -62,5 +62,8 @@
make PLATFORM=%{PLATFORM} apoc-gnome-templates
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarballs for build 17b
+
* Sat Jun 26 2004 [email protected]
- Changed SUNW_Category to "APOC,application,JDS3"
--- a/Solaris/SUNWapmsc.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/SUNWapmsc.spec Wed Sep 01 13:42:01 2004 +0000
@@ -5,7 +5,7 @@
#
%include Solaris.inc
-%define t_suffix -build15
+%define t_suffix -build7b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%ifarch sparc
%define PLATFORM unxsols4
@@ -47,6 +47,9 @@
make PLATFORM=%{PLATFORM} apoc-misc
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarballs for build 17b
+
* Fri Aug 13 2004 - [email protected]
- corrected product version to 1.1
--- a/Solaris/SUNWapmso.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/SUNWapmso.spec Wed Sep 01 13:42:01 2004 +0000
@@ -5,7 +5,7 @@
#
%include Solaris.inc
-%define t_suffix -build15
+%define t_suffix -build7b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%ifarch sparc
%define PLATFORM unxsols4
@@ -62,6 +62,9 @@
make PLATFORM=%{PLATFORM} apoc-staroffice-templates
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarballs for build 17b
+
* Fri Jul 23 2004 - [email protected]
- adapted source tarball name for build 15
--- a/Solaris/SUNWapoc.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/Solaris/SUNWapoc.spec Wed Sep 01 13:42:01 2004 +0000
@@ -5,7 +5,7 @@
#
%include Solaris.inc
-%define t_suffix -build15
+%define t_suffix -build7b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%ifarch sparc
%define PLATFORM unxsols4
@@ -98,6 +98,9 @@
make PLATFORM=%{PLATFORM} apoc
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarballs for build 17b
+
* Fri Aug 20 2004 - [email protected]
- Ensuring greenline stuff doesn't go in beta
--- a/apoc-adapter-java.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/apoc-adapter-java.spec Wed Sep 01 13:42:01 2004 +0000
@@ -4,7 +4,7 @@
# package are under the same license as the package itself.
#
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%define PLATFORM unxlngi5
@@ -12,7 +12,7 @@
License: Sun Microsystems Binary Code License (BCL)
Group: User Interface/Desktops
Version: 1.1
-Release: 17
+Release: 18
Distribution: Cinnabar
Vendor: Sun Microsystems, Inc.
Summary: Java Preferences Adapter for Configuration Manager
@@ -55,6 +55,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarball for build 17b
+
* Fri Aug 13 2004 - [email protected]
- corrected product version to 1.1
--- a/apoc-agent-templates.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/apoc-agent-templates.spec Wed Sep 01 13:42:01 2004 +0000
@@ -4,14 +4,14 @@
# package are under the same license as the package itself.
#
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%define PLATFORM unxlngi5
Name: apoc-agent-templates
Group: Applications/Internet
Version: 1.1
-Release: 17
+Release: 18
Distribution: Cinnabar
Vendor: Sun Microsystems Inc.
License: Sun Microsystems Binary Code License (BCL)
@@ -66,6 +66,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarball for build 17b
+
* Fri Jul 23 2004 - [email protected]
- adapted source tarball name for build 15
--- a/apoc-base.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/apoc-base.spec Wed Sep 01 13:42:01 2004 +0000
@@ -4,7 +4,7 @@
# package are under the same license as the package itself.
#
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%define PLATFORM unxlngi5
@@ -12,7 +12,7 @@
License: Sun Microsystems Binary Code License (BCL)
Group: User Interface/Desktops
Version: 1.1
-Release: 17
+Release: 18
Distribution: Cinnabar
Vendor: Sun Microsystems, Inc.
Summary: Configuration Agent
@@ -53,6 +53,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarball for build 17b
+
* Wed Aug 25 2004 - [email protected]
- Change JAVA_HOME dir for new build environment.
--- a/apoc-cli-misc.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/apoc-cli-misc.spec Wed Sep 01 13:42:01 2004 +0000
@@ -4,14 +4,14 @@
# package are under the same license as the package itself.
#
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%define PLATFORM unxlngi5
Name: apoc-cli-misc
Group: Applications/Internet
Version: 1.1
-Release: 17
+Release: 18
Distribution: Cinnabar
Vendor: Sun Microsystems Inc.
License: Sun Microsystems Binary Code License (BCL)
@@ -54,6 +54,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarball for build 17b
+
* Fri Aug 13 2004 - [email protected]
- corrected product version to 1.1
--- a/apoc-cli.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/apoc-cli.spec Wed Sep 01 13:42:01 2004 +0000
@@ -4,14 +4,14 @@
# package are under the same license as the package itself.
#
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%define PLATFORM unxlngi5
Name: apoc-cli
Group: Applications/Internet
Version: 1.1
-Release: 17
+Release: 18
Distribution: Cinnabar
Vendor: Sun Microsystems Inc.
License: Sun Microsystems Binary Code License (BCL)
@@ -57,6 +57,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarball for build 17b
+
* Fri Aug 13 2004 - [email protected]
- corrected product version to 1.1
--- a/apoc-config.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/apoc-config.spec Wed Sep 01 13:42:01 2004 +0000
@@ -4,14 +4,14 @@
# package are under the same license as the package itself.
#
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%define PLATFORM unxlngi5
Name: apoc-config
Group: Applications/Internet
Version: 1.1
-Release: 17
+Release: 18
Distribution: Cinnabar
Vendor: Sun Microsystems Inc.
License: Sun Microsystems Binary Code License (BCL)
@@ -74,6 +74,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarball for build 17b
+
* Fri Jul 23 2004 - [email protected]
- adapted source tarball name for build 15
--- a/apoc-gnome-templates.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/apoc-gnome-templates.spec Wed Sep 01 13:42:01 2004 +0000
@@ -4,7 +4,7 @@
# package are under the same license as the package itself.
#
-%define t_suffix -build14
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%define PLATFORM unxlngi5
@@ -12,7 +12,7 @@
Name: apoc-gnome-templates
Group: Applications/Internet
Version: 1.1
-Release: 17
+Release: 18
Distribution: Cinnabar
Vendor: Sun Microsystems Inc.
License: Sun Microsystems Binary Code License (BCL)
@@ -67,5 +67,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarball for build 17b
+
* Wed Jul 07 2004 - [email protected]
- added "-j $CPUS" to make to speed up builds
--- a/apoc-gnome26-templates.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/apoc-gnome26-templates.spec Wed Sep 01 13:42:01 2004 +0000
@@ -4,7 +4,7 @@
# package are under the same license as the package itself.
#
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%define PLATFORM unxlngi5
@@ -12,7 +12,7 @@
Name: apoc-gnome26-templates
Group: Applications/Internet
Version: 1.1
-Release: 17
+Release: 18
Distribution: Cinnabar
Vendor: Sun Microsystems Inc.
License: Sun Microsystems Binary Code License (BCL)
@@ -67,6 +67,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarball for build 17b
+
* Fri Jul 23 2004 - [email protected]
- adapted source tarball name for build 15
--- a/apoc-manager.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/apoc-manager.spec Wed Sep 01 13:42:01 2004 +0000
@@ -4,14 +4,14 @@
# package are under the same license as the package itself.
#
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%define PLATFORM unxlngi5
Name: apoc-manager
Group: Applications/Internet
Version: 1.1
-Release: 17
+Release: 18
Distribution: Cinnabar
Vendor: Sun Microsystems Inc.
License: Sun Microsystems Binary Code License (BCL)
@@ -80,6 +80,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarball for build 17b
+
* Wed Aug 25 2004 - [email protected]
- Change JAVA_HOME dir for new build environment.
--- a/apoc-misc.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/apoc-misc.spec Wed Sep 01 13:42:01 2004 +0000
@@ -4,7 +4,7 @@
# package are under the same license as the package itself.
#
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%define PLATFORM unxlngi5
@@ -12,7 +12,7 @@
License: Sun Microsystems Binary Code License (BCL)
Group: User Interface/Desktops
Version: 1.1
-Release: 17
+Release: 18
Distribution: Cinnabar
Vendor: Sun Microsystems, Inc.
Summary: Configuration Agent
@@ -54,6 +54,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarball for build 17b
+
* Fri Aug 13 2004 - [email protected]
- corrected product version to 1.1
--- a/apoc-staroffice-templates.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/apoc-staroffice-templates.spec Wed Sep 01 13:42:01 2004 +0000
@@ -4,7 +4,7 @@
# package are under the same license as the package itself.
#
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%define PLATFORM unxlngi5
@@ -12,7 +12,7 @@
Name: apoc-staroffice-templates
Group: Applications/Internet
Version: 1.1
-Release: 17
+Release: 18
Distribution: Cinnabar
Vendor: Sun Microsystems Inc.
License: Sun Microsystems Binary Code License (BCL)
@@ -67,6 +67,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarball for build 17b
+
* Fri Jul 23 2004 - [email protected]
- adapted source tarball name for build 15
--- a/apoc.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/apoc.spec Wed Sep 01 13:42:01 2004 +0000
@@ -4,7 +4,7 @@
# package are under the same license as the package itself.
#
-%define t_suffix -build15
+%define t_suffix -build17b
%{?nightly:%define t_suffix -%(TZ=GMT date +%Y%m%d)}
%define PLATFORM unxlngi5
@@ -12,7 +12,7 @@
License: Sun Microsystems Binary Code License (BCL)
Group: User Interface/Desktops
Version: 1.1
-Release: 17
+Release: 18
Distribution: Cinnabar
Vendor: Sun Microsystems, Inc.
Summary: Configuration Agent
@@ -80,6 +80,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 01 2004 - [email protected]
+- new tarball for build 17b
+
* Fri Aug 13 2004 - [email protected]
- Correcting version
--- a/build-gnome2 Wed Sep 01 13:41:35 2004 +0000
+++ b/build-gnome2 Wed Sep 01 13:42:01 2004 +0000
@@ -9,6 +9,13 @@
my $default_spec_dir = `dirname $0`;
$default_spec_dir =~ s/\s//g;
+# use "rpmbuild" (RPM v4) if present or "rpm -ba" (RPM v3) if not
+my $RPM_BUILD = 'rpmbuild';
+my $cmd_found = `which rpmbuild | wc -l`;
+if ($cmd_found == 0) {
+ $RPM_BUILD = 'rpm';
+}
+
my $default_log_dir = '/tmp';
my $default_tarball_dir = "/sgnome/pkgs/gnome-2.2/misc/tarballs";
my $default_source_dirs = $default_spec_dir . "/ext-sources" .
@@ -1130,7 +1137,7 @@
if ($live_summary) {
$build_status[$spec_id] = 'BEING_BUILT';
- $status_details[$spec_id] = 'rpmbuild -ba running';
+ $status_details[$spec_id] = "$RPM_BUILD -ba running";
print_live_status;
}
run_rpmbuild_ba ($spec_id) || return 0;
@@ -1159,7 +1166,7 @@
msg_info (1, "Log file: $the_log_dir/$log_name");
my $save_log_name = $current_log;
- msg_log ("INFO: Starting rpmbuild -ba at " . `date`);
+ msg_log ("INFO: Starting $RPM_BUILD -ba at " . `date`);
close_log;
my $tempfile = "/tmp/rpm.out.$$";
my $defnightly = "";
@@ -1167,14 +1174,14 @@
$defnightly = " --define \"nightly 1\""
}
if (defined($rpm_target) and ($rpm_target eq $spec->{buildarchitecture})) {
- system ("rpmbuild --target $rpm_target -ba $the_sys_rpm_dir/SPECS/$base_name $defnightly > $tempfile 2>&1");
+ system ("$RPM_BUILD --target $rpm_target -ba $the_sys_rpm_dir/SPECS/$base_name $defnightly > $tempfile 2>&1");
} else {
- system ("rpmbuild -ba $the_sys_rpm_dir/SPECS/$base_name $defnightly > $tempfile 2>&1");
+ system ("$RPM_BUILD -ba $the_sys_rpm_dir/SPECS/$base_name $defnightly > $tempfile 2>&1");
}
my $rpm_result = $?;
system ("sed -e 's/^/RPM: /' $tempfile >> $the_log_dir/$log_name 2>&1; rm -f $tempfile");
open_log ($save_log_name);
- msg_log ("INFO: rpmbuild -ba finished at " . `date`);
+ msg_log ("INFO: $RPM_BUILD -ba finished at " . `date`);
if ($rpm_result) {
msg_error ("Build of $spec->{name} FAILED");
--- a/gst.spec Wed Sep 01 13:41:35 2004 +0000
+++ b/gst.spec Wed Sep 01 13:42:01 2004 +0000
@@ -32,6 +32,8 @@
%define glib2_version 2.0.1
%define libxml2_version 2.4.0
+%define JDS_CBE_prefix /opt/jds
+
Requires: glib2 >= %{glib2_version}
Requires: libxml2 >= %{libxml2_version}
Requires: popt
@@ -105,6 +107,11 @@
CPUS=1
fi
+%ifos linux
+export PATH=%{JDS_CBE_prefix}/bin:$PATH
+export ACLOCAL_FLAGS="-I %{JDS_CBE_prefix}/share/aclocal -I %{_datadir}/aclocal"
+%endif
+
glib-gettextize -f
libtoolize --force
aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros -I common/m4