rpms/mailx/devel mailx-8.1.1-dir.patch, NONE, 1.1 mailx.spec, 1.23, 1.24

[fedora-cvs-commits at redhat.com]

Author: varekova

Update of /cvs/dist/rpms/mailx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10938

Modified Files:
	mailx.spec 
Added Files:
	mailx-8.1.1-dir.patch 
Log Message:
- incorporate the package review feedback (226118)


mailx-8.1.1-dir.patch:
 Makefile    |    2 +-
 mail.1      |    4 ++--
 pathnames.h |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE mailx-8.1.1-dir.patch ---
--- mailx-8.1.1/mail.1.dir	2007-02-23 15:07:27.000000000 +0100
+++ mailx-8.1.1/mail.1	2007-02-23 15:17:31.000000000 +0100
@@ -998,7 +998,7 @@
 .Ev MBOX
 environment variables.
 .Sh FILES
-.Bl -tag -width /usr/lib/mail.*help -compact
+.Bl -tag -width /usr/share/mailx/mail.*help -compact
 .It Pa /var/spool/mail/*
 Post office.
 .It ~/mbox
@@ -1008,7 +1008,7 @@
 user running this copy of mail.
 .It Pa /tmp/R*
 Temporary files.
-.It Pa /usr/lib/mail.*help
+.It Pa /usr/share/mailx/mail.*help
 Help files.
 .It Pa /etc/mail.rc
 System initialization file.
--- mailx-8.1.1/Makefile.dir	2007-02-23 15:07:27.000000000 +0100
+++ mailx-8.1.1/Makefile	2007-02-23 15:15:34.000000000 +0100
@@ -4,7 +4,7 @@
 prefix =	/usr
 bindir =	$(prefix)/bin
 mandir =	$(prefix)/man
-datadir =	$(prefix)/lib
+datadir =	$(prefix)/share/mailx
 
 PROG=	mail
 CC=gcc
--- mailx-8.1.1/pathnames.h.dir	2007-02-23 15:07:27.000000000 +0100
+++ mailx-8.1.1/pathnames.h	2007-02-23 15:18:02.000000000 +0100
@@ -39,8 +39,8 @@
 
 #include <paths.h>
 /* mail installed files */
-#define _PATH_HELP	"/usr/lib/mail.help"
-#define _PATH_TILDE	"/usr/lib/mail.tildehelp"
+#define _PATH_HELP	"/usr/share/mailx/mail.help"
+#define _PATH_TILDE	"/usr/share/mailx/mail.tildehelp"
 #define _PATH_MASTER_RC	"/etc/mail.rc"
 
 /* mail runtime files */


Index: mailx.spec
===================================================================
RCS file: /cvs/dist/rpms/mailx/devel/mailx.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mailx.spec	12 Jul 2006 07:17:28 -0000	1.23
+++ mailx.spec	23 Feb 2007 14:39:21 -0000	1.24
@@ -1,12 +1,10 @@
-%define	_datadir	%{_prefix}/lib
-
-Summary: The /bin/mail program for sending e-mail messages.
+Summary: The /bin/mail program for sending e-mail messages
 Name: mailx
 Version: 8.1.1
-Release: 44.2.2
+Release: 45%{?dist}
 License: BSD
 Group: Applications/Internet
-Source: ftp://ftp.debian.org/pub/debian/hamm/source/mail/mailx-8.1.1.tar.gz
+Source: ftp://ftp.debian.org/debian/pool/main/m/mailx/mailx-%{version}.tar.gz
 Source1: flock.c
 Patch0: mailx-8.1.1.debian.patch
 Patch1: mailx-8.1.1.security.patch
@@ -33,7 +31,8 @@
 Patch22: mailx-8.1.1-reproblem.patch
 Patch23: mailx-8.1.1-mbproblem.patch
 Patch24: mailx-8.1.1-unread.patch
-BuildRoot: %{_tmppath}/%{name}-root
+Patch25: mailx-8.1.1-dir.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 %description
 The mailx package installs the /bin/mail program, which is used to
@@ -72,6 +71,7 @@
 %patch22 -p1 -b .reproblem
 %patch23 -p1 -b .mbproblem
 %patch24 -p1 -b .unread
+%patch25 -p1 -b .dir
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -80,7 +80,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}/{bin,etc}
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/mailx
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
 
 make DESTDIR=${RPM_BUILD_ROOT} bindir=%{_bindir} mandir=%{_mandir} install
@@ -96,16 +96,20 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc debian/copyright
 %attr(755,root,mail)	/bin/mail
 %{_bindir}/Mail
-%{_datadir}/mail.help
-%{_datadir}/mail.tildehelp
+%{_datadir}/mailx/mail.help
+%{_datadir}/mailx/mail.tildehelp
 %config(noreplace) /etc/mail.rc
 %{_mandir}/man1/mail.1*
 %{_mandir}/man1/Mail.1*
 
 %changelog
+* Fri Feb 23 2007 Ivana Varekova <varekova at redhat.com> - 8.1.1-45
+- incorporate the package review feedback (226118)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.1.1-44.2.2
 - rebuild