rpms/nmh/devel nmh-1.1-makefile.patch, NONE, 1.1 nmh.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Josh Bressers (bressers)
fedora-extras-commits at redhat.com
Fri Apr 15 01:40:36 UTC 2005
Author: bressers
Update of /cvs/extras/rpms/nmh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29598/devel
Modified Files:
.cvsignore sources
Added Files:
nmh-1.1-makefile.patch nmh.spec
Log Message:
auto-import nmh-1.1-5 on branch devel from nmh-1.1-5.src.rpm
nmh-1.1-makefile.patch:
--- NEW FILE nmh-1.1-makefile.patch ---
diff -urNp nmh.orig/etc/Makefile.in nmh/etc/Makefile.in
--- nmh.orig/etc/Makefile.in 2003-10-24 15:17:19.000000000 -0500
+++ nmh/etc/Makefile.in 2005-04-03 12:11:43.596859208 -0500
@@ -83,13 +83,13 @@ sendfiles: $(srcdir)/sendfiles.in Makefi
install: install-bin-files install-etc-files
install-bin-files:
- $(top_srcdir)/mkinstalldirs $(bindir)
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
for script in $(GENERATED_BIN_FILES); do \
- $(INSTALL_PROGRAM) $$script $(bindir)/$$script; \
+ $(INSTALL_PROGRAM) $$script ${DESTDIR}$(bindir)/$$script; \
done
install-etc-files:
- $(top_srcdir)/mkinstalldirs $(etcdir)
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(etcdir)
INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
for file in $(STATIC_FILES); do \
INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
@@ -97,11 +97,11 @@ install-etc-files:
for path in $$INSTALL_FILES; do \
file=`basename $$path`; \
echo "Installing $$file..."; \
- if [ -f $(etcdir)/$$file ]; then \
- mv $(etcdir)/$$file $(etcdir)/$$file.prev; \
- $(INSTALL_DATA) $$path $(etcdir)/$$file; \
- if diff $(etcdir)/$$file.prev $(etcdir)/$$file; then \
- rm $(etcdir)/$$file.prev; \
+ if [ -f ${DESTDIR}$(etcdir)/$$file ]; then \
+ mv ${DESTDIR}$(etcdir)/$$file ${DESTDIR}$(etcdir)/$$file.prev; \
+ $(INSTALL_DATA) $$path ${DESTDIR}$(etcdir)/$$file; \
+ if diff ${DESTDIR}$(etcdir)/$$file.prev ${DESTDIR}$(etcdir)/$$file; then \
+ rm ${DESTDIR}$(etcdir)/$$file.prev; \
else \
echo; \
echo " Previous version of $$file saved as $$file.prev due\c";\
@@ -111,7 +111,7 @@ install-etc-files:
echo; \
fi; \
else \
- $(INSTALL_DATA) $$path $(etcdir)/$$file; \
+ $(INSTALL_DATA) $$path ${DESTDIR}$(etcdir)/$$file; \
fi; \
done
diff -urNp nmh.orig/man/Makefile.in nmh/man/Makefile.in
--- nmh.orig/man/Makefile.in 2003-10-24 15:17:36.000000000 -0500
+++ nmh/man/Makefile.in 2005-04-03 11:59:35.656522960 -0500
@@ -130,27 +130,27 @@ install: install-man1 install-man5 insta
# install the man pages in man1
install-man1:
- $(top_srcdir)/mkinstalldirs $(mandir)/man$(manext1)
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(mandir)/man$(manext1)
for file in $(MAN1); do \
- $(INSTALL_DATA) $$file $(mandir)/man$(manext1) ; \
+ $(INSTALL_DATA) $$file ${DESTDIR}$(mandir)/man$(manext1) ; \
done
# install the man pages in man5
install-man5:
- $(top_srcdir)/mkinstalldirs $(mandir)/man$(manext5)
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(mandir)/man$(manext5)
for file in $(MAN5); do \
- $(INSTALL_DATA) $$file $(mandir)/man$(manext5) ; \
+ $(INSTALL_DATA) $$file ${DESTDIR}$(mandir)/man$(manext5) ; \
done
- if [ ! -f $(mandir)/man$(manext5)/mh_profile.$(manext5) ] ; then \
- ( cd $(mandir)/man$(manext5) ; ln mh-profile.$(manext5) \
+ if [ ! -f ${DESTDIR}$(mandir)/man$(manext5)/mh_profile.$(manext5) ] ; then \
+ ( cd ${DESTDIR}$(mandir)/man$(manext5) ; ln mh-profile.$(manext5) \
mh_profile.$(manext5) ) \
fi
# install the man pages in man8
install-man8:
- $(top_srcdir)/mkinstalldirs $(mandir)/man$(manext8)
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(mandir)/man$(manext8)
for file in $(MAN8); do \
- $(INSTALL_DATA) $$file $(mandir)/man$(manext8) ; \
+ $(INSTALL_DATA) $$file ${DESTDIR}$(mandir)/man$(manext8) ; \
done
# ========= UNINSTALL TARGETS =========
diff -urNp nmh.orig/uip/Makefile.in nmh/uip/Makefile.in
--- nmh.orig/uip/Makefile.in 2003-10-24 15:17:38.000000000 -0500
+++ nmh/uip/Makefile.in 2005-04-03 12:01:32.861705064 -0500
@@ -255,37 +255,37 @@ install: install-cmds install-misc insta
# install commands
install-cmds:
- $(top_srcdir)/mkinstalldirs $(bindir)
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
for cmd in $(CMDS); do \
- $(INSTALL_PROGRAM) $$cmd $(bindir)/$$cmd; \
+ $(INSTALL_PROGRAM) $$cmd ${DESTDIR}$(bindir)/$$cmd; \
done
# install links
install-lcmds:
- rm -f $(bindir)/flists
- rm -f $(bindir)/folders
- rm -f $(bindir)/prev
- rm -f $(bindir)/next
- rm -f $(libdir)/install-mh
- $(LN) $(bindir)/flist $(bindir)/flists
- $(LN) $(bindir)/folder $(bindir)/folders
- $(LN) $(bindir)/show $(bindir)/prev
- $(LN) $(bindir)/show $(bindir)/next
- $(LN) $(bindir)/install-mh $(libdir)/install-mh
+ rm -f ${DESTDIR}$(bindir)/flists
+ rm -f ${DESTDIR}$(bindir)/folders
+ rm -f ${DESTDIR}$(bindir)/prev
+ rm -f ${DESTDIR}$(bindir)/next
+ rm -f ${DESTDIR}$(libdir)/install-mh
+ $(LN) ${DESTDIR}$(bindir)/flist ${DESTDIR}$(bindir)/flists
+ $(LN) ${DESTDIR}$(bindir)/folder ${DESTDIR}$(bindir)/folders
+ $(LN) ${DESTDIR}$(bindir)/show ${DESTDIR}$(bindir)/prev
+ $(LN) ${DESTDIR}$(bindir)/show ${DESTDIR}$(bindir)/next
+ $(LN) ${DESTDIR}$(bindir)/install-mh ${DESTDIR}$(libdir)/install-mh
# install misc support binaries
install-misc:
- $(top_srcdir)/mkinstalldirs $(libdir)
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(libdir)
for misc in $(MISC); do \
- $(INSTALL_PROGRAM) $$misc $(libdir)/$$misc; \
+ $(INSTALL_PROGRAM) $$misc ${DESTDIR}$(libdir)/$$misc; \
done
# install commands with special installation needs (thus no $(SCMDS) use here)
install-scmds:
if test x$(SETGID_MAIL) != x; then \
- $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(bindir)/$$cmd; \
+ $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc ${DESTDIR}$(bindir)/$$cmd; \
else \
- $(INSTALL_PROGRAM) inc $(bindir)/$$cmd; \
+ $(INSTALL_PROGRAM) inc ${DESTDIR}$(bindir)/$$cmd; \
fi
uninstall:
--- NEW FILE nmh.spec ---
Name: nmh
Version: 1.1
Release: 5
Summary: A capable mail handling system with a command line interface.
Group: Applications/Internet
License: BSD
URL: http://savannah.nongnu.org/projects/nmh
Source0: http://savannah.nongnu.org/download/nmh/nmh-1.1.tar.gz
Patch0: nmh-1.1-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtermcap-devel
BuildRequires: db4-devel
%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
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.
%prep
%setup -q -n nmh
%patch0 -p1
%build
#%{expand: %%define _sysconfdir %{_sysconfdir}/nmh}
#%{expand: %%define _libdir %{_libdir}/nmh}
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir}/nmh \
--libdir=%{_libdir}/nmh \
--mandir=%{_mandir} \
--enable-pop
make
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
chmod g-s $RPM_BUILD_ROOT/%{_bindir}/inc
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/*
%dir %{_sysconfdir}/nmh
%config(noreplace) %{_sysconfdir}/nmh/*
%dir %{_libdir}/nmh
%{_libdir}/nmh/*
%{_mandir}/man[851]/*
%doc docs/COMPLETION-* docs/DIFFERENCES docs/FAQ docs/MAIL.FILTERING VERSION
%doc docs/TODO docs/README* COPYRIGHT
%changelog
* Thu Apr 14 2005 Josh Bressers <bressers at redhat.com> 0:1.1-5
- Make the spec file much more sane.
* Wed Apr 13 2005 Josh Bressers <bressers at redhat.com> 0:1.1-3
- Initial build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nmh/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 15 Apr 2005 01:39:49 -0000 1.1
+++ .cvsignore 15 Apr 2005 01:40:34 -0000 1.2
@@ -0,0 +1 @@
+nmh-1.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nmh/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 15 Apr 2005 01:39:49 -0000 1.1
+++ sources 15 Apr 2005 01:40:34 -0000 1.2
@@ -0,0 +1 @@
+060647c9c60514a2a86f7f194c830096 nmh-1.1.tar.gz
More information about the fedora-extras-commits
mailing list