* citadel.spec: major modifications for 6.xx (hasn't been updated since 5.xx)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 9e5d554c9de08aaa631d80181048e75ef3ca5106..0a096422a52b451a386476efec7d8841b6ec3d8e 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 620.2  2004/03/29 02:33:19  error
+ * citadel.spec: major modifications for 6.xx (hasn't been updated since 5.xx)
+
  Revision 620.1  2004/03/27 23:04:59  error
  * citadel.lsm: update version number, sending to ibiblio
 
@@ -5639,3 +5642,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 d00a2b50f1482e4a7274b92e61a00dbc2d96913c..fc90c13a4de1de92bb59a713df0f4740dca10697 100644 (file)
--- a/citadel/citadel.spec
+++ b/citadel/citadel.spec
@@ -40,6 +40,11 @@ Group: System Environment/Daemons
 Requires: citadel-data
 Obsoletes: citadel
 Obsoletes: citadel-ux
+Obsoletes: citadel-smtp
+Obsoletes: citadel-pop3
+Obsoletes: citadel-imap
+Obsoletes: citadel-mrtg
+Obsoletes: citadel-calendar
 %description server
 Citadel/UX is an advanced messaging system which can be used for BBS,
 groupware, and online community applications.  It is multithreaded,
@@ -49,18 +54,7 @@ upgrading this package.
 %defattr(-,root,root)
 %files server
 /etc/pam.d/citadel
-%doc docs/chat.txt
-%doc docs/citadel-with-berkeley-db.txt
-%doc docs/COPYING.txt
-%doc docs/copyright.txt
-%doc docs/import-export.txt
-%doc docs/inetsiteconfig.txt
-%doc docs/mailinglists.txt
-%doc docs/room-sharing-howto.txt
-%doc docs/siteconfig.txt
-%doc docs/sysop.txt
-%doc docs/upgrading.txt
-%doc docs/utils.txt
+%doc docs/citadel.html
 %dir /usr/local/citadel/bio
 %dir /usr/local/citadel/bitbucket
 %dir /usr/local/citadel/files
@@ -72,42 +66,13 @@ upgrading this package.
 %attr(4755,root,root) /usr/local/citadel/chkpwd
 /usr/local/citadel/citmail
 /usr/local/citadel/citserver
-/usr/local/citadel/libcitserver.so
-/usr/local/citadel/libcitserver.la
-/usr/local/citadel/migratenet
 /usr/local/citadel/msgform
-/usr/local/citadel/readlog
 /usr/local/citadel/sendcommand
 /usr/local/citadel/setup
 /usr/local/citadel/stats
+/usr/local/citadel/stress
 /usr/local/citadel/userlist
 /usr/local/citadel/utilsmenu
-/usr/local/citadel/modules/libbio.so
-/usr/local/citadel/modules/libbio.la
-/usr/local/citadel/modules/libchat.so
-/usr/local/citadel/modules/libchat.la
-/usr/local/citadel/modules/libexpire.so
-/usr/local/citadel/modules/libexpire.la
-/usr/local/citadel/modules/libinetcfg.so
-/usr/local/citadel/modules/libinetcfg.la
-/usr/local/citadel/modules/liblistsub.so
-/usr/local/citadel/modules/liblistsub.la
-/usr/local/citadel/modules/libnetfilter.so
-/usr/local/citadel/modules/libnetfilter.la
-/usr/local/citadel/modules/libnetwork.so
-/usr/local/citadel/modules/libnetwork.la
-/usr/local/citadel/modules/libpas2.so
-/usr/local/citadel/modules/libpas2.la
-/usr/local/citadel/modules/librwho.so
-/usr/local/citadel/modules/librwho.la
-/usr/local/citadel/modules/libspam.so
-/usr/local/citadel/modules/libspam.la
-/usr/local/citadel/modules/libupgrade.so
-/usr/local/citadel/modules/libupgrade.la
-/usr/local/citadel/modules/libvandelay.so
-/usr/local/citadel/modules/libvandelay.la
-/usr/local/citadel/modules/libvcard.so
-/usr/local/citadel/modules/libvcard.la
 %pre server
 # Add the "bbs" user
 /usr/sbin/useradd -c "Citadel" -s /bin/false -r -d /usr/local/citadel \
@@ -115,7 +80,7 @@ upgrading this package.
 %post server
 if [ -f /etc/inittab ]; then
        if ! grep 'citserver' /etc/inittab > /dev/null; then
-               echo "c1:2345:/usr/local/citadel/citserver -h/usr/local/citadel -t/usr/local/citadel/citserver.trace" >> /etc/inittab
+               echo "c1:2345:/usr/local/citadel/citserver -h/usr/local/citadel -x7 -llocal4" >> /etc/inittab
        fi
 fi
 if [ -f /etc/services ]; then
@@ -123,7 +88,6 @@ if [ -f /etc/services ]; then
                echo "citadel           504/tcp         # citadel" >> /etc/services
        fi
 fi
-/sbin/ldconfig -n /usr/local/citadel /usr/local/citadel/modules
 cd /usr/local/citadel
 /usr/local/citadel/setup -q
 %postun server
@@ -179,8 +143,8 @@ required by the Citadel/UX server.
 %post data
 # Yes, this is supposed to be executed twice; as ? might not yet exist
 # but we want it to be listed.  It's kludgey; sue me.
-ls /usr/local/citadel/help > "/usr/local/citadel/help/?"
-ls /usr/local/citadel/help > "/usr/local/citadel/help/?"
+/bin/ls /usr/local/citadel/help > "/usr/local/citadel/help/?"
+/bin/ls /usr/local/citadel/help > "/usr/local/citadel/help/?"
 
 %package client
 Summary: Client for the Citadel/UX messaging system
@@ -192,83 +156,10 @@ Install this software if you need to connect to a Citadel/UX server.
 %files client
 /usr/local/citadel/citadel
 /usr/local/citadel/citadel.rc
-%doc docs/chat.txt
+/usr/local/citadel/whobbs
 %post client
 if [ -f /etc/services ]; then
        if ! grep '^citadel' /etc/services > /dev/null; then
                echo "citadel           504/tcp         # citadel" >> /etc/services
        fi
 fi
-
-%package smtp
-Summary: SMTP server for the Citadel/UX messaging system
-Group: System Environment/Daemons
-Requires: citadel-server
-%description smtp
-This package provides the Citadel/UX SMTP service, which provides inbound
-and outbound SMTP service for the Citadel/UX messaging system.  Install this
-package if your Citadel/UX users should be able to send and receive Internet
-e-mail.  If you also run another SMTP server you will need to read
-docs/inetmailsetupmx.txt to configure SMTP service.
-%defattr(-,root,root)
-%files smtp
-/usr/local/citadel/modules/libsmtp.so
-/usr/local/citadel/modules/libsmtp.la
-%doc docs/inetmailsetupmx.txt
-%doc docs/inetmailsetup.txt
-
-%package imap
-Summary: IMAP server for the Citadel/UX messaging system
-Group: System Environment/Daemons
-Requires: citadel-server
-%description imap
-This package provides the Citadel/UX IMAP service, which provides IMAP
-connectivity.  Install this package if you want to connect to the Citadel/UX
-server with IMAP clients such as Outlook Express or Netscape.  Using this
-access method, users can access both e-mail and all public rooms on the server.
-%defattr(-,root,root)
-%files imap
-/usr/local/citadel/modules/libimap.so
-/usr/local/citadel/modules/libimap.la
-
-%package pop3
-Summary: POP3 server for the Citadel/UX messaging system
-Group: System Environment/Daemons
-Requires: citadel-server
-%description pop3
-This package provides the Citadel/UX POP3 service, which provides POP3
-connectivity.  Install this package if you want to connect to the Citadel/UX
-server with POP3 clients such as Outlook Express or Netscape.  Note that the
-POP3 client can only receive mail; install citadel-smtp as well if you want
-users to be able to send mail.
-%defattr(-,root,root)
-%files pop3
-/usr/local/citadel/modules/libpop3.so
-/usr/local/citadel/modules/libpop3.la
-
-%package mrtg
-Summary: Export Citadel/UX statistics to MRTG
-Group: System Environment/Daemons
-Requires: citadel-server
-Requires: mrtg
-%description mrtg
-This package allows Citadel/UX to export server statistics in a format
-compatible with the Multi Router Traffic Grapher.
-%files mrtg
-/usr/local/citadel/modules/libmrtg.so
-/usr/local/citadel/modules/libmrtg.la
-
-%package calendar
-Summary: Citadel/UX calendaring and scheduling services
-Group: System Environment/Daemons
-Requires: citadel-server
-Requires: libical.so
-%description calendar
-This package provides calendaring and scheduling services for Citadel/UX.
-It will interoperate with other calendaring packages that support the Internet
-standard vCalendar formats.  Currently only meeting scheduling is supported.
-(This is an experimental package!)
-%files calendar
-/usr/local/citadel/modules/libcalendar.so
-/usr/local/citadel/modules/libcalendar.la
-