[packages/icedtea7: 74/103] - use rpmbuild(macros) virtual, not direct package name

jajcus jajcus at pld-linux.org
Fri Apr 19 13:14:02 CEST 2013


commit 82c4da0e95581e5703345ca58f273a4009c950f9
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Jul 28 09:55:15 2010 +0000

    - use rpmbuild(macros) virtual, not direct package name
    
    Changed files:
        icedtea6.spec -> 1.66

 icedtea6.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index e9cc2f4..c96d240 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -147,10 +147,10 @@ Provides:	j2sdk = %{_jdkversion}
 Provides:	jdk = %{_jdkversion}
 Obsoletes:	blackdown-java-sdk
 Obsoletes:	ibm-java
-Obsoletes:	java5-sun
 Obsoletes:	java-blackdown
 Obsoletes:	java-gcj-compat-devel
 Obsoletes:	java-sun
+Obsoletes:	java5-sun
 Obsoletes:	jdk
 Obsoletes:	kaffe
 
@@ -198,7 +198,6 @@ Provides:	java(jndi) = %{version}
 Provides:	java(jsse) = %{version}
 Provides:	java1.4
 Provides:	jre = %{_jdkversion}
-Obsoletes:	java5-sun-jre
 Obsoletes:	java(jaas)
 Obsoletes:	java(jaf)
 Obsoletes:	java(jaxp)
@@ -211,6 +210,7 @@ Obsoletes:	java(jndi)
 Obsoletes:	java(jsse)
 Obsoletes:	java-gcj-compat
 Obsoletes:	java-sun-jre
+Obsoletes:	java5-sun-jre
 Obsoletes:	jre
 
 %description jre
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf



More information about the pld-cvs-commit mailing list