[interchange-cvs] interchange - jon modified 2 files

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Mon Jun 17 17:36:01 2002


User:      jon
Date:      2002-06-17 21:35:34 GMT
Modified:  .        Tag: STABLE_4_8-branch MANIFEST
Modified:  SPECS    Tag: STABLE_4_8-branch interchange.spec
Log:
- Quell /sbin/service stop errors
- Re-add main filelist omitted by oversight
- On uninstall, remove autogenerated /usr/lib/interchange/etc/varnames

Revision  Changes    Path
No                   revision



No                   revision



2.17.2.15 +2 -2      interchange/MANIFEST


rev 2.17.2.15, prev_rev 2.17.2.14
Index: MANIFEST
===================================================================
RCS file: /var/cvs/interchange/MANIFEST,v
retrieving revision 2.17.2.14
retrieving revision 2.17.2.15
diff -u -u -r2.17.2.14 -r2.17.2.15
--- MANIFEST	21 May 2002 20:48:36 -0000	2.17.2.14
+++ MANIFEST	17 Jun 2002 21:35:33 -0000	2.17.2.15
@@ -953,10 +953,10 @@
 share/interchange/es_ES/B6_b.gif
 share/interchange/es_ES/B7.gif
 share/interchange/es_ES/B7_b.gif
-share/interchange/es_ES/B9.gif
-share/interchange/es_ES/B9_b.gif
 share/interchange/es_ES/B8.gif
 share/interchange/es_ES/B8_b.gif
+share/interchange/es_ES/B9.gif
+share/interchange/es_ES/B9_b.gif
 share/interchange/he_IL/A1.gif
 share/interchange/he_IL/A1_b.gif
 share/interchange/he_IL/A2.gif



No                   revision



No                   revision



2.4.2.14  +10 -4     interchange/SPECS/interchange.spec


rev 2.4.2.14, prev_rev 2.4.2.13
Index: interchange.spec
===================================================================
RCS file: /var/cvs/interchange/SPECS/interchange.spec,v
retrieving revision 2.4.2.13
retrieving revision 2.4.2.14
diff -u -u -r2.4.2.13 -r2.4.2.14
--- interchange.spec	8 May 2002 23:20:08 -0000	2.4.2.13
+++ interchange.spec	17 Jun 2002 21:35:34 -0000	2.4.2.14
@@ -203,7 +203,7 @@
 
 %pre
 
-/sbin/service interchange stop 2>&1 || :
+/sbin/service interchange stop >/dev/null 2>&1 || :
 
 # Create interch user/group if they don't already exist
 /usr/sbin/groupadd -g 52 %ic_group 2>/dev/null || :
@@ -217,7 +217,7 @@
 %{_libdir}/interchange/foundation
 
 
-%files
+%files -f %filelist
 
 %defattr(-, %{ic_user}, %{ic_group})
 
@@ -320,7 +320,7 @@
 
 if [ $1 = 0 ]; then
 	# Stop Interchange if running
-	/sbin/service interchange stop 2>&1
+	/sbin/service interchange stop >/dev/null 2>&1
 
 	# Remove autostart of interchange
 	/sbin/chkconfig --del interchange 2>/dev/null
@@ -329,6 +329,7 @@
 	%__rm -rf %{_localstatedir}/run/interchange/*
 	%__rm -rf %{_localstatedir}/cache/interchange/*
 	%__rm -rf %{_libdir}/interchange/lib/HTML
+	%__rm -rf %{_libdir}/interchange/etc/varnames
 fi
 
 
@@ -368,7 +369,12 @@
 
 
 %changelog
-* Tue May 07 2002 Jon Jensen <jon@redhat.com> 4.8.6-1
+* Mon Jun 17 2002 Jon Jensen <jon@redhat.com> 4.8.6-1
+- Quell /sbin/service stop errors
+- Re-add main filelist omitted by oversight
+- On uninstall, remove autogenerated /usr/lib/interchange/etc/varnames
+
+* Tue May 07 2002 Jon Jensen <jon@redhat.com>
 - Turn off autostart
 - Pass on message if shutting down running Interchange daemon
 - Use macros for executables where possible