X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/80f7b47ec7714362d1a34941655dcec2a25484dc..d1797eb2b2d5f3aa1b653e6a2562bf79c559eeb2:/SPECS/nmh.spec?ds=sidebyside

diff --git a/SPECS/nmh.spec b/SPECS/nmh.spec
index 08a0b915..002426a3 100644
--- a/SPECS/nmh.spec
+++ b/SPECS/nmh.spec
@@ -1,11 +1,16 @@
 # This spec supports two methods of RPM creation:
 #
 # 1) Start from an nmh workspace, run configure as desired and then "make rpm".
-#    For example:
+#    For example, from a tarball:
+#      $ tar xpf nmh-1.6.tar.gz
+#      $ cd nmh-1.6
+#      $ ./configure --with-cyrus-sasl --with-tls  &&  make rpm
+#
+#    Another example, starting from the source code repository:
 #      $ git clone git://git.savannah.nongnu.org/nmh.git
 #      $ cd nmh
 #      $ ./autogen.sh
-#      $ ./configure --with-cyrus-sasl --with-locking=fcntl  &&  make rpm
+#      $ ./configure --with-cyrus-sasl --with-tls  &&  make rpm
 #
 # 2) Start with a source RPM and use rpmbuild.  Configure options are hard
 #    coded below, but they can be overridden on the rpmbuild command line
@@ -14,7 +19,7 @@
 #      $ rpm -i nmh-1.4-0.fc16.src.rpm
 #      $ rpmbuild --rmsource --rmspec \
 #          --define '_sysconfdir /usr/local/nmh/etc' \
-#          --define 'configure_opts --with-cyrus-sasl --with-locking=fcntl' \
+#          --define 'configure_opts --with-cyrus-sasl --with-tls' \
 #          --bb ~/lib/rpmbuild/SPECS/nmh.spec
 #
 # If configure has previously been run successfully in the workspace,
@@ -43,7 +48,7 @@ Summary:       A capable mail handling system with a command line interface
 Group:         Applications/Internet
 License:       BSD
 URL:           http://savannah.nongnu.org/projects/nmh
-BuildRequires: gdbm-devel ncurses-devel
+BuildRequires: flex ncurses-devel
 %define        tarfile nmh-%rawversion.tar.gz
 Source0:       %tarfile
 Source1:       VERSION
@@ -57,9 +62,9 @@ single comprehensive program.  Instead, it consists of a number of
 fairly simple single-purpose programs for sending, receiving, saving,
 retrieving and otherwise manipulating email messages.  You can freely
 intersperse nmh commands with other shell commands or write custom
-scripts which utilize nmh commands.  If you want to use nmh as a true
-email user agent, you'll want to also install exmh to provide a user
-interface for it--nmh only has a command line interface.
+scripts which utilize nmh commands.  nmh only has a command line
+interface; if you want a more sophisticated user interface, you'll
+want to also install exmh.
 
 
 %prep
@@ -80,7 +85,7 @@ if [ -f %srcdir/config.status ]; then
   ./config.status
 else
   %if %{undefined configure_opts}
-    %define configure_opts --enable-pop --with-cyrus-sasl --with-locking=fcntl
+    %define configure_opts --with-cyrus-sasl
   %endif
   %configure %configure_opts
 fi
@@ -89,7 +94,7 @@ make all dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT SETGID_MAIL=
+make install DESTDIR=$RPM_BUILD_ROOT
 
 gz_manpages='-e '