* update citadel.spec for 6.00* update citadel.spec for 6.00* update citadel.spec...

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index c05bc0fc471dc4fe6af069ae81126e2621d77e74..2a6f875e870788d363c6bbf52c2101fd2aaf8812 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 601.3  2002/09/10 08:07:38  error
+ * update citadel.spec for 6.00* update citadel.spec for 6.00* update citadel.spec for 6.00* update citadel.spec for 6.00* update citadel.spec for 6.00* update citadel.spec for 6.00* update citadel.spec for 6.00* update citadel.spec for 6.00
+
  Revision 601.2  2002/09/09 03:03:18  ajc
  * When a user logs in, create the Mail> room if it doesn't exist.  (Should
    never happen, but one site had a situation where this patch came in handy.)
@@ -3988,3 +3991,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/citadel.spec b/citadel/citadel.spec
index 55dce55d87936351c4078d53f0f0159908553d3a..5fa93b3224f8da69fd1f9692433742678abb7e92 100644 (file)
--- a/citadel/citadel.spec
+++ b/citadel/citadel.spec
@@ -1,13 +1,13 @@
 # $Id$
 Summary: Citadel/UX, the flexible, powerful way to build online communities
 Name: citadel
-Version: 5.90
+Version: 6.00
 Release: 1
 Copyright: GPL
 Group: Applications/Communications
 Source0: http://uncensored.citadel.org/pub/citadel/citadel-ux-%{PACKAGE_VERSION}.tar.gz
 Buildroot: /var/tmp/citadel-%{PACKAGE_VERSION}-root
-Icon: citux-64x64.xpm
+#Icon: citux-64x64.xpm
 Vendor: Citadel/UX Development Team
 URL:  http://uncensored.citadel.org/citadel/
 #Autoprov: false
@@ -107,6 +107,15 @@ upgrading this package.
 /usr/local/citadel/modules/libvandelay.la
 /usr/local/citadel/modules/libical.so
 /usr/local/citadel/modules/libical.la
+/usr/local/citadel/modules/liblistsub.so
+/usr/local/citadel/modules/liblistsub.la
+/usr/local/citadel/modules/libmrtg.so
+/usr/local/citadel/modules/libmrtg.la
+/usr/local/citadel/modules/libnetfilter.so
+/usr/local/citadel/modules/libnetfilter.la
+# Not in use yet
+#/usr/local/citadel/modules/libspam.so
+#/usr/local/citadel/modules/libspam.la
 %pre server
 # Add the "bbs" user
 /usr/sbin/useradd -c "Citadel" -s /bin/false -r -d /usr/local/citadel \
@@ -127,7 +136,7 @@ cd /usr/local/citadel
 /usr/local/citadel/setup -q
 %postun server
 if [ -f /etc/inittab ]; then
-       grep -v 'citserver' < /etc/inittab > /etc/inittab.new
+       grep -v 'citserver' < /etc/inittab > /etc/inittab.new && \
        mv /etc/inittab.new /etc/inittab
        /sbin/init q
 fi