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

[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  1daa04bab784f205a8863d0eebc918444b2a9042 (commit)
      from  4f2471026d69f8eeffa1b9403d96aca5e050399b (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=1daa04bab784f205a8863d0eebc918444b2a9042


commit 1daa04bab784f205a8863d0eebc918444b2a9042
Author: David Levine <address@hidden>
Date:   Wed Jan 25 22:22:02 2012 -0600

    Fixed rpm target now that nmhdist is gone.

diff --git a/Makefile.am b/Makefile.am
index 1e326b3..820ec74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -486,7 +486,7 @@ endif
 ## Our RPM build target
 ##
 
-rpm: $(DIST_ARCHIVES)
+rpm: dist
        @test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES
        @test -d $(rpmdir)/SPECS || $(MKDIR_P) $(rpmdir)/SPECS
        @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
diff --git a/nmh.spec b/nmh.spec
index e5fdb12..68a67a9 100644
--- a/nmh.spec
+++ b/nmh.spec
@@ -31,8 +31,8 @@
 # nmh.spec used to build the Fedora 15 nmh rpm.
 
 Name:          nmh
-Version:       %(sed "s/-/_/g" $RPM_SOURCE_DIR/VERSION)
-%define        rawversion %(cat $RPM_SOURCE_DIR/VERSION)
+Version:       %(sed "s/-/_/g" VERSION)
+%define        rawversion %(cat VERSION)
 Release:       0%{?dist}
 Summary:       A capable mail handling system with a command line interface.
 Group:         Applications/Internet
@@ -62,7 +62,7 @@ interface for it--nmh only has a command line interface.
 if [ ! -f $RPM_SOURCE_DIR/%tarfile ]; then
   #### The tarfile wasn't already installed and we started with a
   #### workspace (using make rpm), so get it from there.
-  [ -f %srcdir/%tarfile ]  ||  (cd %srcdir  &&  make nmhdist)
+  [ -f %srcdir/%tarfile ]  ||  (cd %srcdir  &&  make dist)
   cp -p %srcdir/%tarfile $RPM_SOURCE_DIR/%tarfile
 fi
 [ -f $RPM_SOURCE_DIR/VERSION ]  ||  cp -p %srcdir/VERSION $RPM_SOURCE_DIR
@@ -80,7 +80,7 @@ else
   %endif
   %configure %configure_opts
 fi
-make all nmhdist
+make all dist
 
 
 %install

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

Summary of changes:
 Makefile.am |    2 +-
 nmh.spec    |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


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