[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. a4999fa48c92214848cc5d792d1d6a35e3a189bb

[David Levine]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  a4999fa48c92214848cc5d792d1d6a35e3a189bb (commit)
       via  e6677b63aa90a57b00c2a3f5284b50a837be51a7 (commit)
       via  3e432bc052fc8d51775893f49c264560ffe8558e (commit)
      from  1dd8eb505ef646b8489a08edd60309ee97248143 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=a4999fa48c92214848cc5d792d1d6a35e3a189bb


commit a4999fa48c92214848cc5d792d1d6a35e3a189bb
Author: David Levine <address@hidden>
Date:   Tue Feb 21 19:35:05 2012 -0600

    Removed reference to mhost.com.

diff --git a/docs/README.developers b/docs/README.developers
index 3876ba6..b342d1b 100644
--- a/docs/README.developers
+++ b/docs/README.developers
@@ -136,9 +136,9 @@ getpass()    nmh_getpass()
 releasing nmh
 -------------
 
-To make a public release of nmh (we'll use version 1.5 and my mhost.com
-account, danh, as examples here; the convention for release candidates
-is to use something like "1.5-RC1"):
+To make a public release of nmh (we'll use version 1.5 as the example
+here; the convention for release candidates is to use something like
+"1.5-RC1"):
 
  1. % echo 1.5 > VERSION
     % date +"%e %B %Y" > DATE
@@ -161,7 +161,7 @@ is to use something like "1.5-RC1"):
 
  5. If all is well and your tarball is final, go back to your workspace and do:
 
-    % echo 1.0.4+dev > VERSION
+    % echo 1.5+dev > VERSION
 
  6. % git commit VERSION; git push
 

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=e6677b63aa90a57b00c2a3f5284b50a837be51a7


commit e6677b63aa90a57b00c2a3f5284b50a837be51a7
Author: David Levine <address@hidden>
Date:   Tue Feb 21 19:34:33 2012 -0600

    Updated to reflect that all of the lists are on nongnu.org.

diff --git a/docs/MAILING-LISTS b/docs/MAILING-LISTS
index 66d49a9..eb50e17 100644
--- a/docs/MAILING-LISTS
+++ b/docs/MAILING-LISTS
@@ -1,34 +1,36 @@
 There are currently three mailing lists related to nmh:
 
address@hidden
-----------------------
address@hidden
+-----------------------
 This is a very low-traffic mailing list for announcing new releases,
-patches, and important events related to nmh. 
+patches, and important events related to nmh.
+
+To subscribe or manage your subscription options, go to:
+  https://lists.nongnu.org/mailman/listinfo/nmh-announce
+
+
address@hidden
+----------------------
+This is the main list for discussing work on nmh.  There is currently
+no nmh-users mailing list, so user questions are acceptable here (the
+comp.mail.mh newsgroup is another good option).  Bug reports and
+feedback should be submitted here.
+
+To subscribe or manage your subscription options, go to:
+  https://lists.nongnu.org/mailman/listinfo/nmh-workers
 
address@hidden
-------------------
-This an open-submission list for reporting bugs.  It is moderated to
-prevent being spammed.  Any nmh-related mail is approved.
 
address@hidden
----------------------
-This is the main list for discussing work on nmh.  Both of the above
-mailing lists are forwarded to this one.  There is currently no 
-nmh-users mailing list, so user questions are acceptable here (the
-comp.mail.mh newsgroup is another good option).
address@hidden
+----------------------
+All commits to the nmh source code repository are copied to this list.
+Therefore, it is probably only of interest to nmh developers.
+
+To subscribe or manage your subscription options, go to:
+  https://lists.nongnu.org/mailman/listinfo/nmh-commit
 
 
 mail archives
 -------------
-The mail archives are only available to people subscribed to the
-mailing list.  This restriction is in place to prevent harvesting of
-email addresses by spammers.  To access the archives, you need to send
-mail to nmh-workers-request with an archive access command.  You can
-get a current list of commands the archive server understands by
-sending a message to address@hidden with the subject
-"archive help". 
-
-Of interest in the archive are the directories "latest" which contains
-everything since the nmh-workers mailing list has been hosted on
-mhost.com, and "old-list" which contians all the mail from when the
-list was formerly hosted at math.gatech.edu.
+The nmh-workers and nmh-commits mailings lists archives are available here:
+  http://lists.nongnu.org/archive/html/nmh-workers/
+  http://lists.nongnu.org/archive/html/nmh-commits/

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=3e432bc052fc8d51775893f49c264560ffe8558e


commit 3e432bc052fc8d51775893f49c264560ffe8558e
Author: David Levine <address@hidden>
Date:   Tue Feb 21 19:31:08 2012 -0600

    With "make rpm", configure all modified files in sysconfdir (etc) to be 
saved when erasing or upgrading the package.  Also, leave the doc directory 
whereever "make install" puts it.

diff --git a/Makefile.am b/Makefile.am
index 082c9c7..3b6b84a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -534,6 +534,7 @@ rpm: dist
        @cp -p nmh.spec $(rpmdir)/SPECS
        @rpmbuild --define '_topdir $(rpmdir)' \
          --define '_tmppath %{_topdir}/TMP' \
+         --define "_sysconfdir $(DESTDIR)$(sysconfdir)" \
          -ba $(rpmdir)/SPECS/nmh.spec
 .PHONY: rpm
 
diff --git a/nmh.spec b/nmh.spec
index 68a67a9..213abc6 100644
--- a/nmh.spec
+++ b/nmh.spec
@@ -19,6 +19,10 @@
 # If configure has previously been run successfully in the workspace,
 # it will not be invoked again, even if configure_opts is defined.
 #
+# Note that "make rpm" sets _sysconfdir.  If configuring to install
+# anyplace other than the default _sysconfdir, typically /etc, and
+# you're not using this through "make rpm", be sure to set _sysconfdir.
+#
 # With kernel (fcntl, flock, or lockf) locking, or with dot locking
 # and a lockdir that's writable by the user, bin/inc does not need to
 # be setgid.  This spec assumes that.  But if needed, add something
@@ -33,8 +37,8 @@
 Name:          nmh
 Version:       %(sed "s/-/_/g" VERSION)
 %define        rawversion %(cat VERSION)
-Release:       0%{?dist}
-Summary:       A capable mail handling system with a command line interface.
+Release:       1%{?dist}
+Summary:       A capable mail handling system with a command line interface
 Group:         Applications/Internet
 License:       BSD
 URL:           http://savannah.nongnu.org/projects/nmh
@@ -43,8 +47,7 @@ BuildRequires: gdbm-devel ncurses-devel
 Source0:       %tarfile
 Source1:       VERSION
 %define        srcdir %(pwd)
-# This should already be defined in /usr/lib/rpm/macros:
-# BuildRoot:     %{_buildrootdir}/%{name}-%{version}-%{release}.%{_arch}
+
 
 %description
 Nmh is an email system based on the MH email system and is intended to
@@ -84,11 +87,8 @@ make all dist
 
 
 %install
-rm -rf $RPM_BUILD_ROOT doc
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT SETGID_MAIL=
-#### Exclude docs from nmh_files because its files are added with the
-#### %doc directive in the %files section below.
-mv `find $RPM_BUILD_ROOT -type d -name doc` .
 
 gz_manpages='-e '
 
@@ -97,14 +97,16 @@ if find $RPM_BUILD_ROOT -name 'inc.1*' | \
   #### brp-compress will gzip the man pages, so account for that.
   gz_manpages='-e s#\(/man/man./.*\)#\1.gz#'
 fi
-find $RPM_BUILD_ROOT ! -type d -print | \
+
+#### etc is brought into files using %config{noreplace}
+find $RPM_BUILD_ROOT -name etc -prune -o ! -type d -print | \
   sed -e "s#^$RPM_BUILD_ROOT##" "$gz_manpages" > nmh_files
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT doc $RPM_BUILD_DIR/%name-%rawversion
+rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%buildsubdir
 
 
 %files -f nmh_files
 %defattr(-,root,root,-)
-%doc doc/*
+%config(noreplace) %_sysconfdir/

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am            |    1 +
 docs/MAILING-LISTS     |   52 ++++++++++++++++++++++++-----------------------
 docs/README.developers |    8 +++---
 nmh.spec               |   24 ++++++++++++----------
 4 files changed, 45 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System