packages: mailx/mailx.spec - install all symlinks in proper places

[baggins]

Author: baggins                      Date: Wed Apr 14 11:28:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install all symlinks in proper places

---- Files affected:
packages/mailx:
   mailx.spec (1.54 -> 1.55) 

---- Diffs:

================================================================
Index: packages/mailx/mailx.spec
diff -u packages/mailx/mailx.spec:1.54 packages/mailx/mailx.spec:1.55
--- packages/mailx/mailx.spec:1.54	Wed Apr 14 13:17:25 2010
+++ packages/mailx/mailx.spec	Wed Apr 14 13:28:22 2010
@@ -61,17 +61,18 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	MAILRC=/etc/mail.rc \
 	UCBINSTALL=/usr/bin/install \
-	PREFIX=%{_prefix}
-
-install mailx $RPM_BUILD_ROOT/bin/mail
+	PREFIX=%{_prefix} \
+	BINDIR=/bin
 
 install nail.rc $RPM_BUILD_ROOT/etc/skel/.mailrc
-ln -s mail.rc $RPM_BUILD_ROOT/etc/nail.rc
 
+ln -sf mailx $RPM_BUILD_ROOT/bin/mail
 ln -sf ../../bin/mail $RPM_BUILD_ROOT%{_bindir}/Mail
+ln -sf ../../bin/mail $RPM_BUILD_ROOT%{_bindir}/nail
 
-echo .so mailx.1 > $RPM_BUILD_ROOT%{_mandir}/man1/mail.1
 echo .so mailx.1 > $RPM_BUILD_ROOT%{_mandir}/man1/Mail.1
+echo .so mailx.1 > $RPM_BUILD_ROOT%{_mandir}/man1/mail.1
+echo .so mailx.1 > $RPM_BUILD_ROOT%{_mandir}/man1/nail.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,20 +80,13 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
-%config(noreplace) %verify(not md5 mtime size) /etc/nail.rc
-%attr(755,root,root) %{_bindir}/mailx
-%{_mandir}/man1/n*
-%{_mandir}/man1/mailx*
-
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
 %config(noreplace) %verify(not md5 mtime size) /etc/mail.rc
 
 /etc/skel/.mailrc
 
-%attr(755,root,root) /bin/mail
-%attr(755,root,root) %{_bindir}/Mail
-%{_mandir}/man1/[Mm]ail.*
+%attr(755,root,root) /bin/mail*
+%attr(755,root,root) %{_bindir}/[Mn]ail
+%{_mandir}/man1/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -100,6 +94,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2010/04/14 11:28:22  baggins
+- install all symlinks in proper places
+
 Revision 1.54  2010/04/14 11:17:25  baggins
 - use less as default pager
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mailx/mailx.spec?r1=1.54&r2=1.55&f=u