X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=nmh.spec;h=08a0b915d0ed4d6315e954ff9333367f5d370b2f;hb=5f2ff254eb4949a28a844a627b1ad1e10ec76d0c;hp=e5fdb1237300056ad8caede2b331c449d8508eef;hpb=1039d32b8c066fb2f7e657a38055df0ee16c1e6a;p=mmh

diff --git a/nmh.spec b/nmh.spec
index e5fdb12..08a0b91 100644
--- a/nmh.spec
+++ b/nmh.spec
@@ -13,12 +13,17 @@
 #    For example:
 #      $ 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' \
 #          --bb ~/lib/rpmbuild/SPECS/nmh.spec
 #
 # 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
@@ -31,10 +36,10 @@
 # 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)
-Release:       0%{?dist}
-Summary:       A capable mail handling system with a command line interface.
+Version:       %(sed "s/-/_/g" VERSION)
+%define        rawversion %(cat VERSION)
+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 +48,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
@@ -62,7 +66,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,15 +84,12 @@ else
   %endif
   %configure %configure_opts
 fi
-make all nmhdist
+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 +98,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/*