* citadel.spec: commented out Icon line and the openldap-servers dependency.

 * citadel.spec: added several BuildRequires. Some of these are, strictly
   speaking, compile time options, but the goal is to document the runtime
   dependencies and make sure our RPM's are always built consistently.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index de4dbf0932df2ff5b3a235abeea9b253650fe688..a007123ff204e5a069a6b521899d6b7b3d2e1c91 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,10 @@
  $Log$
+ Revision 620.14  2004/04/13 22:44:35  nbryant
+  * citadel.spec: commented out Icon line and the openldap-servers dependency.
+  * citadel.spec: added several BuildRequires. Some of these are, strictly
+    speaking, compile time options, but the goal is to document the runtime
+    dependencies and make sure our RPM's are always built consistently.
+
  Revision 620.13  2004/04/13 21:09:20  error
  * citadel.spec: Updated for 6.20p1
 
@@ -5684,3 +5690,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 aa8f8c76a04af173066cce7d5733db066e2e4b7f..f4b6cfd1985e8872f3360b30c173b342a5acd219 100644 (file)
--- a/citadel/citadel.spec
+++ b/citadel/citadel.spec
@@ -7,10 +7,29 @@ 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
+#Icon: citux-64x64.xpm
 Vendor: Citadel/UX Development Team
 URL:  http://uncensored.citadel.org/citadel/
-Requires: openldap-servers
+
+# I don't think we should actually Require this because we can be configured
+# not to connect to an LDAP server. So we really only require the client
+# libraries, and the runtime dependency on that is detected automatically by
+# RPM.
+#Requires: openldap-servers
+
+# Note some of these BuildRequire's are Linux specific and possibly even
+# distribution specific, but I am adding them FOR NOW just to document the
+# dependencies and make it more likely that everyone is building identical
+# packages.
+BuildRequires: gcc
+BuildRequires: glibc-devel
+BuildRequires: openldap-devel
+BuildRequires: db4-devel >= 4.1
+BuildRequires: pam-devel
+BuildRequires: newt-devel
+BuildRequires: openssl-devel
+BuildRequires: ncurses-devel
+BuildRequires: zlib-devel
 #Autoprov: false
 ExcludeOS: hpux