SPECS: nmh.spec - better late than never: 1.1, dropped hardlink in...

[freetz]

Author: freetz                       Date: Mon Jul 25 14:30:15 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- better late than never: 1.1, dropped hardlink insanity stuff, revisited
  build process, dropped old patches, added DESTDIR and quote-fix patches,
  %%files updates, URL/sources updated

---- Files affected:
SPECS:
   nmh.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/nmh.spec
diff -u SPECS/nmh.spec:1.25 SPECS/nmh.spec:1.26
--- SPECS/nmh.spec:1.25	Thu Sep  2 13:27:26 2004
+++ SPECS/nmh.spec	Mon Jul 25 16:30:09 2005
@@ -1,31 +1,22 @@
 # $Revision$, $Date$
-# TODO:
-# - update to 1.1RC1 - project moved to savannah.nongnu.org
-#
 Summary:	A capable mail handling system with a command line interface
 Summary(pl):	System obsługi poczty z interfejsem z linii poleceń
 Name:		nmh
-Provides:	mh
-Version:	1.0.4
-Release:	6
+Version:	1.1
+Release:	0.1
 License:	Freeware
 Group:		Applications/Mail
-Source0:	ftp://ftp.math.gatech.edu/pub/nmh/%{name}-%{version}.tar.gz
-# Source0-md5:	caff7fbd5588d08701413fe4eaa87e87
-Patch0:		%{name}-config.patch
-Patch1:		%{name}-buildroot.patch
-Patch2:		%{name}-compat21.patch
-Patch3:		%{name}-bug7246.patch
+Source0:	http://savannah.nongnu.org/download/nmh/%{name}-%{version}.tar.gz
+# Source0-md5:	060647c9c60514a2a86f7f194c830096
+Patch0:		%{name}-DESTDIR.patch
+Patch1:		%{name}-unquote.patch
+URL:		http://savannah.nongnu.org/projects/nmh/
 BuildRequires:	gdbm-devel
 BuildRequires:	ncurses-devel
-Requires:	smtpdaemon
-Requires:	/bin/vi
 Obsoletes:	mh
+Provides:	mh
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_nmhlibdir	%{_libdir}/nmh
-%define		_sysconfdir	/etc/nmh
-
 %description
 Nmh is an email system based on the MH email system and is intended to
 be a (mostly) compatible drop-in replacement for MH. Nmh isn't a
@@ -49,61 +40,43 @@
 linii poleceń.
 
 %prep
-%setup -q
+%setup -qn %{name}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch1 -p0
 
 %build
-%configure2_13 \
-	--with-editor=/bin/vi
-
-%{__make} LIBS="-lgdbm -lgdbm_compat"
-
+%configure \
+	--with-locking=fcntl \
+	--with-mts=sendmail \
+	--enable-pop
+%{__make} \
+	bindir=%{_bindir}/mh \
+	libdir=%{_libdir}/mh \
+	etcdir=%{_sysconfdir}/nmh
+	
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT SETGID_MAIL=
-
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.old
-
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	SETGID_MAIL= \
+	bindir=%{_bindir}/mh \
+	libdir=%{_libdir}/mh \
+	etcdir=%{_sysconfdir}/nmh
+	
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-if [ ! -d %{_bindir}/mh -a ! -L %{_bindir}/mh ] ; then
-	ln -sf . %{_bindir}/mh
-fi
-if [ ! -d %{_libdir}/mh -a ! -L %{_libdir}/mh ] ; then
-	ln -sf nmh %{_libdir}/mh
-fi
-if [ -d /etc/smrsh -a ! -L /etc/smrsh/slocal ] ; then
-	ln -sf %{_nmhlibdir}/slocal /etc/smrsh/slocal
-fi
-
-%triggerpostun -- mh, nmh <= 0.27-7
-if [ ! -d %{_bindir}/mh -a ! -L %{_bindir}/mh ] ; then
-	ln -sf . %{_bindir}/mh
-fi
-if [ ! -d %{_libdir}/mh -a ! -L %{_libdir}/mh ] ; then
-	ln -sf nmh %{_libdir}/mh
-fi
-
-%preun
-if [ "$1" = "0" ]; then
-	[ ! -L %{_bindir}/mh ] || rm -f %{_bindir}/mh
-	[ ! -L %{_libdir}/mh ] || rm -f %{_libdir}/mh
-	[ ! -d /etc/smrsh -a -L /etc/smrsh/slocal ] || rm -f /etc/smrsh/slocal
-fi
-
 %files
 %defattr(644,root,root,755)
-%doc COPYRIGHT DIFFERENCES FAQ MAIL.FILTERING README TODO VERSION
-%dir %{_nmhlibdir}
-%dir %{_sysconfdir}
-%config %{_sysconfdir}/*
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_nmhlibdir}/*
+%doc COPYRIGHT ChangeLog README docs/{COMP*,FAQ,MAIL*,README.*,TODO}
+%dir %{_bindir}/mh
+%dir %{_libdir}/mh
+%attr(755,root,root) %{_bindir}/mh/*
+%attr(755,root,root) %{_libdir}/mh/*
+
+%dir %{_sysconfdir}/nmh
+%config %{_sysconfdir}/nmh/*
+
 %{_mandir}/*/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -112,6 +85,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2005/07/25 14:30:09  freetz
+- better late than never: 1.1, dropped hardlink insanity stuff, revisited
+  build process, dropped old patches, added DESTDIR and quote-fix patches,
+  %%files updates, URL/sources updated
+
 Revision 1.25  2004/09/02 11:27:26  snurf
 - typos / formatting / etc.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nmh.spec?r1=1.25&r2=1.26&f=u