packages: icedtea-web/icedtea-web.spec - R: icedtea6-jre-base, O: icedtea6-...

[jajcus]

Author: jajcus                       Date: Wed Mar 21 11:59:22 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- R: icedtea6-jre-base, O: icedtea6-jre-base-mozilla-plugin
- plugin subpackage dependencies fix

---- Files affected:
packages/icedtea-web:
   icedtea-web.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/icedtea-web/icedtea-web.spec
diff -u packages/icedtea-web/icedtea-web.spec:1.2 packages/icedtea-web/icedtea-web.spec:1.3
--- packages/icedtea-web/icedtea-web.spec:1.2	Wed Mar 21 12:36:09 2012
+++ packages/icedtea-web/icedtea-web.spec	Wed Mar 21 12:59:17 2012
@@ -22,6 +22,8 @@
 BuildRequires:	rpm-javaprov
 BuildRequires:	xulrunner-devel
 BuildRequires:	zlib-devel
+Requires:	icedtea6-jre-base >= 1.9
+Obsoletes:	icedtea6-jre-base-mozilla-plugin
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,7 +43,7 @@
 %{?with_tests:BuildRequires:	java-junit}
 BuildRequires:	java-rhino
 BuildRequires:	jpackage-utils
-Requires:	%{name}-jre-base-mozilla-plugin = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	browser-plugins >= 2.0
 Requires:	browser-plugins(%{_target_base_arch})
 Obsoletes:	browser-plugin-java-icedtea6
@@ -135,6 +137,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2012/03/21 11:59:17  jajcus
+- R: icedtea6-jre-base, O: icedtea6-jre-base-mozilla-plugin
+- plugin subpackage dependencies fix
+
 Revision 1.2  2012/03/21 11:36:09  jajcus
 - removed extra '%prep' which was added by adapter
 - documentation recommends installing the plugin as libjavaplugin.so, let it be so
================================================================

---- CVS-web:
    http://cvs.pld-linux.org//packages/icedtea-web/icedtea-web.spec?r1=1.2&r2=1.3&f=u