[interchange-cvs] interchange - jon modified SPECS/interchange.spec

[interchange-core@interchange.redhat.com]

User:      jon
Date:      2001-12-20 06:16:50 GMT
Modified:  SPECS    interchange.spec
Log:
Merge in change to stable branch from September.

Revision  Changes    Path
2.9       +8 -2      interchange/SPECS/interchange.spec


rev 2.9, prev_rev 2.8
Index: interchange.spec
===================================================================
RCS file: /var/cvs/interchange/SPECS/interchange.spec,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -u -r2.8 -r2.9
--- interchange.spec	2001/12/11 03:07:02	2.8
+++ interchange.spec	2001/12/20 06:16:50	2.9
@@ -44,6 +44,7 @@
 %package %{cat_name}-demo
 Summary: Interchange Foundation demo - a prebuilt demonstration store
 Group: Applications/Internet
+Prereq: %ic_package_basename
 Requires: %ic_package_basename
 Provides: %{ic_package_basename}-%{cat_name}-demo
 Obsoletes: %{ic_package_basename}-%{cat_name}-demo
@@ -368,10 +369,9 @@
 %defattr(-, root, root)
 %{_libdir}/interchange/%cat_name
 
-%endif
 
+%else
 
-%ifarch i386
 
 %files %{cat_name}-demo
 
@@ -532,6 +532,12 @@
 
 
 %changelog
+
+* Wed Sep 19 2001 Jon Jensen <jon@redhat.com>
+- Add Prereq: interchange to interchange-foundation-demo because the demo
+  installs files owned by the interch user, which gets created when the base
+  package is installed. This way the order the RPMs are given on the command
+  line won't cause trouble.
 
 * Fri Jul 27 2001 Jon Jensen <jon@redhat.com>
 - Make a symlink to /usr{/share}/doc/interchange-x.x.x in