rpms/amanda/F-9 amanda.spec,1.50,1.51

[Daniel Novotny]

Author: dnovotny

Update of /cvs/pkgs/rpms/amanda/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17072

Modified Files:
	amanda.spec 
Log Message:

only "localhost" and "localdomain"
  username changes in .amandahosts



Index: amanda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amanda/F-9/amanda.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- amanda.spec	15 Oct 2008 13:53:29 -0000	1.50
+++ amanda.spec	4 Nov 2008 14:12:12 -0000	1.51
@@ -11,7 +11,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.5.2p1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -184,9 +184,14 @@
 %post
 /sbin/ldconfig
 # when upgrading and .amandahosts contains obsolete user name, update it
+# in localhost and localhost.localdomain entries
 [ $1 -eq 2 ] &&
-grep -E '^[^[:blank:]]+[[:blank:]]+amanda([[:blank:]].*)?$' /var/lib/amanda/.amandahosts &>/dev/null &&
-	sed -i.usernameupdate -r -e 's/^([^[:blank:]]+[[:blank:]]+)amanda([[:blank:]].*)?$/\1%amanda_user\2/' /var/lib/amanda/.amandahosts || :
+grep -E '^localhost[[:blank:]]+amanda([[:blank:]].*)?$' /var/lib/amanda/.amandahosts &>/dev/null &&
+	sed -i.usernameupdate -r -e 's/^(localhost[[:blank:]]+)amanda([[:blank:]].*)?$/\1%amanda_user\2/' /var/lib/amanda/.amandahosts || :
+
+[ $1 -eq 2 ] &&
+grep -E '^localhost\.localdomain[[:blank:]]+amanda([[:blank:]].*)?$' /var/lib/amanda/.amandahosts &>/dev/null &&
+	sed -i.usernameupdate -r -e 's/^(localhost\.localdomain[[:blank:]]+)amanda([[:blank:]].*)?$/\1%amanda_user\2/' /var/lib/amanda/.amandahosts || :
 
 %post client
 /sbin/ldconfig
@@ -366,6 +371,10 @@
 %{_libdir}/libamandad.so
 
 %changelog
+* Tue Nov 04 2008 Daniel Novotny <dnovotny at redhat.com> 2.5.2.p1-13
+- %%post script changed, only "localhost" and "localdomain"
+  username changes in .amandahosts
+
 * Wed Oct 15 2008 Daniel Novotny <dnovotny at redhat.com> 2.5.2.p1-12
 - --with-tcpportrange removed again (people getting AVC denies, #462681)
   #448071 re-solved with amanda.conf patch