rpms/mailx/devel mailx.spec,1.31,1.32

[Dmitry Butskoy (buc)]

Author: buc

Update of /cvs/extras/rpms/mailx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26186

Modified Files:
	mailx.spec 
Log Message:
Place mailx as /bin/mailx for better LSB (redhat-lsb will remove the symlink)
Base things on /bin/mailx now.




Index: mailx.spec
===================================================================
RCS file: /cvs/extras/rpms/mailx/devel/mailx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mailx.spec	26 Jun 2008 16:10:21 -0000	1.31
+++ mailx.spec	29 Jul 2008 16:52:45 -0000	1.32
@@ -4,7 +4,7 @@
 Summary: Enhanced implementation of the mailx command
 Name: mailx
 Version: 12.3
-Release: 0%{?dist}
+Release: 1%{?dist}
 Group: 	Applications/Internet
 License: BSD with advertising
 URL: http://heirloom.sourceforge.net/mailx.html
@@ -58,7 +58,7 @@
 %endif
 
 echo	PREFIX=%{_prefix} \
-	BINDIR=%{_bindir} \
+	BINDIR=/bin \
 	MANDIR=%{_mandir} \
 	SYSCONFDIR=%{_sysconfdir} \
 	MAILRC=%{mailrc} \
@@ -77,23 +77,20 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT STRIP=: `cat makeflags` install
 
-#  we need /bin/mail as basic path...
-install -d $RPM_BUILD_ROOT/bin
-pushd $RPM_BUILD_ROOT
+ln -s mailx $RPM_BUILD_ROOT/bin/mail
 
-mv ./%{_bindir}/%{name} ./bin/mail
+install -d $RPM_BUILD_ROOT%{_bindir}
 pref=`echo %{_bindir} | sed 's,/[^/]*,../,g'`
-ln -s ${pref}bin/mail ./%{_bindir}/Mail
-ln -s ${pref}bin/mail ./%{_bindir}/nail
-ln -s ${pref}bin/mail ./%{_bindir}/%{name}
-
-pushd ./%{_mandir}/man1
-mv %{name}.1 mail.1
-ln -s mail.1 Mail.1
-ln -s mail.1 nail.1
-ln -s mail.1 %{name}.1
+
+pushd $RPM_BUILD_ROOT%{_bindir}
+ln -s ${pref}bin/mailx Mail
+ln -s ${pref}bin/mailx nail
 popd
 
+pushd $RPM_BUILD_ROOT%{_mandir}/man1
+ln -s mailx.1 mail.1
+ln -s mailx.1 Mail.1
+ln -s mailx.1 nail.1
 popd
 
 
@@ -133,6 +130,10 @@
 
 
 %changelog
+* Tue Jul 29 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.3-1
+- Place mailx to /bin/mailx, to avoid extra symlink in redhat-lsb package
+- /bin/mailx is now a base binary, another symlinked to it.
+
 * Thu Jun 26 2008 Dmitry Butskoy <Dmitry at Butskoy.name>
 - add missed BR for krb5-devel
 - activate IPv6 support