* Replaced all "Citadel/UX" references with "Citadel"

[citadel.git] / citadel / citadel.spec

diff --git a/citadel/citadel.spec b/citadel/citadel.spec
index f4b6cfd1985e8872f3360b30c173b342a5acd219..3613d8189384f4e85d3a1bcafea41fa9f2a6d2ce 100644 (file)
--- a/citadel/citadel.spec
+++ b/citadel/citadel.spec
@@ -1,14 +1,14 @@
 # $Id$
-Summary: Citadel/UX, the flexible, powerful way to build online communities
+Summary: Citadel, the flexible, powerful way to build online communities
 Name: citadel
-Version: 6.20p1
-Release: 2
+Version: 6.24
+Release: 1
 Copyright: GPL
 Group: Applications/Communications
 Source0: http://my.citadel.org/download/citadel-ux-%{PACKAGE_VERSION}.tar.gz
 Buildroot: /var/tmp/citadel-%{PACKAGE_VERSION}-root
 #Icon: citux-64x64.xpm
-Vendor: Citadel/UX Development Team
+Vendor: Citadel Development Team
 URL:  http://uncensored.citadel.org/citadel/
 
 # I don't think we should actually Require this because we can be configured
@@ -22,14 +22,24 @@ URL:  http://uncensored.citadel.org/citadel/
 # dependencies and make it more likely that everyone is building identical
 # packages.
 BuildRequires: gcc
+BuildRequires: bison
 BuildRequires: glibc-devel
 BuildRequires: openldap-devel
 BuildRequires: db4-devel >= 4.1
 BuildRequires: pam-devel
-BuildRequires: newt-devel
+
+# Newt is not supported by redhat for binary compatibility with future
+# distributions, so we've disabled it.
+#BuildRequires: newt-devel
+
 BuildRequires: openssl-devel
 BuildRequires: ncurses-devel
 BuildRequires: zlib-devel
+
+# debuginfo packages don't get built unless this packages is installed:
+# NB: We do not DISTRIBUTE the debuginfo packages - error
+BuildRequires: redhat-rpm-config
+
 #Autoprov: false
 ExcludeOS: hpux
 
@@ -42,7 +52,7 @@ driven, and accessible via a growing selection of front ends.
 %setup -n citadel
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --with-pam --enable-autologin --with-ldap --with-newt --with-libical
+CFLAGS="$RPM_OPT_FLAGS" ./configure --with-pam --enable-autologin --with-ldap --without-newt --with-libical
 make
 
 %install
@@ -60,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT/usr/local/citadel/techdoc
 rm -rf "$RPM_BUILD_ROOT"
 
 %package server
-Summary: Citadel/UX, the flexible, powerful way to build online communities
+Summary: Citadel, the flexible, powerful way to build online communities
 Group: System Environment/Daemons
 Requires: citadel-data
 Obsoletes: citadel
@@ -71,7 +81,7 @@ Obsoletes: citadel-imap
 Obsoletes: citadel-mrtg
 Obsoletes: citadel-calendar
 %description server
-Citadel/UX is an advanced messaging system which can be used for BBS, email,
+Citadel is an advanced messaging system which can be used for BBS, email,
 groupware and online community applications.  It is multithreaded,
 client/server, database driven, and accessible via a growing selection of
 front ends.
@@ -123,11 +133,11 @@ if [ -f /etc/inittab ]; then
 fi
 
 %package data
-Summary: Data files for the Citadel/UX messaging system.
+Summary: Data files for the Citadel messaging system.
 Group: System Environment/Daemons
 %description data
-Default data files for the Citadel/UX messaging system.  These files are
-required by the Citadel/UX server.
+Default data files for the Citadel messaging system.  These files are
+required by the Citadel server.
 %defattr(-,root,root)
 %files data
 /usr/local/citadel/.hushlogin
@@ -136,10 +146,7 @@ required by the Citadel/UX server.
 %dir /usr/local/citadel/network/spoolin
 %dir /usr/local/citadel/network/spoolout
 %dir /usr/local/citadel/network/systems
-%config(noreplace) /usr/local/citadel/network/filterlist
 %config(noreplace) /usr/local/citadel/network/mail.aliases
-%config(noreplace) /usr/local/citadel/network/mailinglists
-%config(noreplace) /usr/local/citadel/network/rnews.xref
 %config(noreplace) /usr/local/citadel/public_clients
 %config /usr/local/citadel/help/aide
 %config /usr/local/citadel/help/software
@@ -172,11 +179,11 @@ required by the Citadel/UX server.
 /bin/ls /usr/local/citadel/help > "/usr/local/citadel/help/?"
 
 %package client
-Summary: Client for the Citadel/UX messaging system
+Summary: Client for the Citadel messaging system
 Group: Applications/Communications
 %description client
-This is the text client software for the Citadel/UX messaging system.
-Install this software if you need to connect to a Citadel/UX server.
+This is the text client software for the Citadel messaging system.
+Install this software if you need to connect to a Citadel server.
 %defattr(-,root,root)
 %files client
 /usr/local/citadel/citadel