rpms/nail/devel nail.spec,1.11,1.12

[Dmitry Butskoy (buc)]

Author: buc

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

Modified Files:
	nail.spec 
Log Message:



Index: nail.spec
===================================================================
RCS file: /cvs/extras/rpms/nail/devel/nail.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nail.spec	21 Mar 2006 16:06:59 -0000	1.11
+++ nail.spec	22 Mar 2006 12:27:25 -0000	1.12
@@ -4,7 +4,7 @@
 Summary: Enhanced implementation of the mailx command
 Name: nail
 Version: 12.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: 	Applications/Internet
 License: BSD
 URL: http://nail.sourceforge.net
@@ -41,22 +41,21 @@
 
 %if %{rename}
 #  Use old name "nail" to avoid conflicts with the Core mailx package
-sed -i '/Heirloom/ {
-	p
-	n
-}
-s/mailx/nail/g
+sed -i '/Heirloom/ n
+	s/mailx/nail/g
 ' %{name}.rc
 
+sed -i '/Heirloom/ n
+	s/mailx/nail/g
+	s/Mailx/Nail/g
+' mailx.1
+
+sed -i '/Heirloom/ n
+	s/mailx/nail/g
+	s/MAILX /NAIL /g
+	s/Mailx/Nail/g
+' mailx.1.html
 mv mailx.1.html %{name}.html
-sed -i '/Heirloom/ {
-	p
-	n
-}
-s/mailx/nail/g
-s/MAILX/NAIL/g
-s/Mailx/Nail/g
-' %{name}.html
 %endif
 
 
@@ -107,6 +106,10 @@
 
 
 %changelog
+* Wed Mar 22 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.0-2
+- complete "mailx to nail" changes in the manual and config files
+- drop _smp_mflags: it caused make to work incorrectly.
+
 * Tue Mar 21 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.0-1
 - upgrade to 12.0
 - change new upstream name "mailx" to the old name "nail" to avoid