SPECS: java-blackdown.spec, java-sun-jre.spec - updated heimdal co...

[baggins]

Author: baggins                      Date: Sat Mar 31 21:50:55 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated heimdal comment

---- Files affected:
SPECS:
   java-blackdown.spec (1.40 -> 1.41) , java-sun-jre.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/java-blackdown.spec
diff -u SPECS/java-blackdown.spec:1.40 SPECS/java-blackdown.spec:1.41
--- SPECS/java-blackdown.spec:1.40	Tue Feb 13 09:06:36 2007
+++ SPECS/java-blackdown.spec	Sat Mar 31 23:50:50 2007
@@ -282,7 +282,7 @@
 
 cp -rf jre/{bin,lib} $RPM_BUILD_ROOT%{jredir}
 
-# conflict with heimdal
+# conflict with heimdal/krb5
 for i in kinit klist ; do
 	ln -sf %{jredir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/j$i
 done
@@ -589,6 +589,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2007/03/31 21:50:50  baggins
+- updated heimdal comment
+
 Revision 1.40  2007/02/13 08:06:36  glen
 - tabs in preamble
 

================================================================
Index: SPECS/java-sun-jre.spec
diff -u SPECS/java-sun-jre.spec:1.20 SPECS/java-sun-jre.spec:1.21
--- SPECS/java-sun-jre.spec:1.20	Tue Feb 13 13:07:49 2007
+++ SPECS/java-sun-jre.spec	Sat Mar 31 23:50:50 2007
@@ -191,7 +191,7 @@
 
 cp -rf {bin,lib} $RPM_BUILD_ROOT%{jredir}
 
-# conflict with heimdal
+# conflict with heimdal/krb5
 for i in kinit klist ; do
 	ln -sf %{jredir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/j$i
 	mv -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}.1 $RPM_BUILD_ROOT%{_mandir}/man1/j${i}.1
@@ -412,6 +412,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2007/03/31 21:50:50  baggins
+- updated heimdal comment
+
 Revision 1.20  2007/02/13 12:07:49  pascalek
 - updated to 1.4.2_13
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/java-blackdown.spec?r1=1.40&r2=1.41&f=u
    http://cvs.pld-linux.org/SPECS/java-sun-jre.spec?r1=1.20&r2=1.21&f=u