plugin: remove requirement for java-openjdk-runtime = 7 [release 1.6-2mamba;Sun Jul 26 2015]

icedtea-web.spec

@@ -1,10 +1,7 @@
 %define        origin            openjdk
 %define        buildver          0
-%define        MAJOR             6
+%define        javaver           7
-%define        major             1.%{MAJOR}
+%define        jppname           java-%{javaver}-%{origin}
-%define        minor             0
-%define        javaver           %{major}.%{minor}
-%define        jppname           java-%{javaver}-%{origin}-%{javaver}.%{buildver}
 %define        sdkdir            %{jppname}
 %define        jredir            %{jppname}/jre
 %define        jrelnk            jre-%{javaver}-%{origin}
@@ -14,8 +11,8 @@
 %define        archbuild         i386
 
 Name:          icedtea-web
-Version:       1.5.2
+Version:       1.6
-Release:       1mamba
+Release:       2mamba
 Summary:       IcedTea Web Start implementation
 Group:         System/Libraries/Java
 Vendor:        openmamba
@@ -28,8 +25,8 @@ BuildRequires: desktop-file-utils
 BuildRequires: eclipse-ecj
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: java-openjdk
+BuildRequires: java-openjdk7
-BuildRequires: java-openjdk-runtime
+BuildRequires: java-openjdk7-runtime
 BuildRequires: libatk-devel
 BuildRequires: libcairo-devel
 BuildRequires: libfontconfig-devel
@@ -46,7 +43,7 @@ BuildRequires: libz-devel
 ## AUTOBUILDREQ-END
 BuildRequires: xulrunner-devel
 #BuildRequires: zsh
-Requires:      java-openjdk = %{javaver}
+Requires:      java-openjdk7-runtime
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -56,7 +53,7 @@ The IcedTea-Web project provides a Free Software web browser plugin for running
 Summary:       IcedTea Java browser plugin
 Group:         Applications/Networking
 Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
-Requires:      java-openjdk-runtime = %{javaver}
+Requires:      java-openjdk7-runtime
 #Requires:      %{_libdir}/mozilla/plugins
 Obsoletes:     java-openjdk-plugin
 Provides:      java-plugins = %{javaver}
@@ -100,9 +97,6 @@ make -j1 DESTDIR=%{buildroot} install
 #  ln -sf %{jredir} %{jrelnk}
 #popd
 
-mkdir -p %{buildroot}%{_mandir}/man1
-install ./netx/javaws.1 %{buildroot}%{_mandir}/man1/javaws.1
-
 install -d -m 755 %{buildroot}%{_libdir}/mozilla/plugins
 
 install -D -m0644 javaws.desktop %{buildroot}%{_datadir}/applications/javaws.desktop
@@ -117,7 +111,7 @@ install -d -m 755 %{buildroot}%{jrebindir}
   ln -sf ../../bin/javaws %{buildroot}%{jrebindir}/javaws
 )
 
-ln -sf %{_jvmdir}/java-%{javaver}-openjdk-%{javaver}.0/lib/IcedTeaPlugin.so \
+ln -sf %{_jvmdir}/java-%{javaver}-openjdk/lib/IcedTeaPlugin.so \
    %{buildroot}%{_libdir}/mozilla/plugins/IcedTeaPlugin.so 
 
 %clean
@@ -225,14 +219,19 @@ fi
 #%{_jvmdir}/%{jredir}/lib/about.jnlp
 #%{_jvmdir}/%{jredir}/lib/netx.jar
 #%{_jvmdir}/%{jredir}/lib/plugin.jar
-%{_jvmdir}/java-%{javaver}-openjdk-%{javaver}.0/bin/policyeditor
+%{_jvmdir}/java-%{javaver}-openjdk/bin/policyeditor
 %{_datadir}/applications/itweb-settings.desktop
 %{_datadir}/applications/javaws.desktop
 #%{_datadir}/icons/hicolor/*x*/apps/javaws.png
 %{_datadir}/pixmaps/javaws.png
+%{_mandir}/man1/icedtea-web-plugin.1.gz
+%{_mandir}/man1/icedtea-web.1.gz
 %{_mandir}/man1/itweb-settings.1*
 %{_mandir}/man1/javaws.1*
 %{_mandir}/man1/policyeditor.1*
+%lang(cs) %{_mandir}/cs/man1/*.1*
+%lang(de) %{_mandir}/de/man1/*.1*
+%lang(pl) %{_mandir}/pl/man1/*.1*
 %doc AUTHORS COPYING
 #%doc ChangeLog NEWS README plugin/docs
 
@@ -240,13 +239,19 @@ fi
 %defattr(-,root,root)
 %dir %{_libdir}/mozilla/plugins
 %{_libdir}/mozilla/plugins/IcedTeaPlugin.so 
-%{_jvmdir}/java-%{javaver}-openjdk-%{javaver}.0/lib/IcedTeaPlugin.so
+%{_jvmdir}/java-%{javaver}-openjdk/lib/IcedTeaPlugin.so
 
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/icedtea-web
 
 %changelog
+* Sun Jul 26 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6-2mamba
+- plugin: remove requirement for java-openjdk-runtime = 7
+
+* Tue May 19 2015 Automatic Build System <autodist@mambasoft.it> 1.6-1mamba
+- automatic version update by autodist
+
 * Thu Nov 27 2014 Automatic Build System <autodist@mambasoft.it> 1.5.2-1mamba
 - automatic version update by autodist