diff --git a/.gitignore b/.gitignore index af6cc8c..03eb10f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/icedtea-web-1.4.2.tar.gz +SOURCES/icedtea-web-1.5.2.tar.gz diff --git a/.icedtea-web.metadata b/.icedtea-web.metadata index 65a294f..cab85e8 100644 --- a/.icedtea-web.metadata +++ b/.icedtea-web.metadata @@ -1 +1 @@ -d3a7ce02e9a30d651c2c7ea22f25eea1defd4f4c SOURCES/icedtea-web-1.4.2.tar.gz +45eb9ef057cc5239cd85d7fdfc6394de86ee7e6b SOURCES/icedtea-web-1.5.2.tar.gz diff --git a/SPECS/icedtea-web.spec b/SPECS/icedtea-web.spec index 0cf9a3d..d0a1039 100644 --- a/SPECS/icedtea-web.spec +++ b/SPECS/icedtea-web.spec @@ -1,8 +1,3 @@ - -# We require at the least the first release java-1.6.0-openjdk -# with IcedTea6 1.10 -%define min_openjdk_version 1:1.6.0.0-60 - # Version of java %define javaver 1.7.0 @@ -17,8 +12,8 @@ %define binsuffix .itweb Name: icedtea-web -Version: 1.4.2 -Release: 1%{?dist} +Version: 1.5.2 +Release: 0%{?dist} Summary: Additional Java components for OpenJDK - Java browser plug-in and Web Start implementation Group: Applications/Internet @@ -34,6 +29,10 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: xulrunner-devel BuildRequires: junit4 +# new in 1.5 to have clean up for malformed XMLs +BuildRequires: tagsoup +# rhino is used as JS evaluator in testtime +BuildRequires: rhino # For functionality and the OpenJDK dirs Requires: java-%{javaver}-openjdk @@ -41,6 +40,12 @@ Requires: java-%{javaver}-openjdk # For the mozilla plugin dir Requires: mozilla-filesystem%{?_isa} +# When itw builds against it, it have to be also in runtime +Requires: tagsoup + +# rhino is used as JS evaluator in runtime +Requires: rhino + # Post requires alternatives to install plugin alternative. Requires(post): %{_sbindir}/alternatives @@ -52,7 +57,7 @@ Provides: java-plugin = 1:%{javaver} Provides: javaws = 1:%{javaver} Provides: java-%{javaver}-openjdk-plugin = 1:%{version} -Obsoletes: java-1.6.0-openjdk-plugin <= %{min_openjdk_version} +Obsoletes: java-1.6.0-openjdk-plugin @@ -75,11 +80,10 @@ This package contains Javadocs for the IcedTea-Web project. %prep %setup -q - %build -autoreconf +autoreconf -vfi CXXFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS" \ -./configure \ +%configure \ --with-pkgversion=rhel-%{release}-%{_arch} \ --docdir=%{_datadir}/javadoc/%{name} \ --with-jdk-home=%{javadir} \ @@ -103,6 +107,8 @@ desktop-file-install --vendor ''\ --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop desktop-file-install --vendor ''\ --dir $RPM_BUILD_ROOT%{_datadir}/applications itweb-settings.desktop +desktop-file-install --vendor ''\ + --dir $RPM_BUILD_ROOT%{_datadir}/applications policyeditor.desktop ln -s %{_mandir}/man1/javaws-itweb.1 $RPM_BUILD_ROOT/%{_mandir}/man1/icedtea-web.1 %check @@ -147,6 +153,37 @@ exit 0 %doc COPYING %changelog +* Thu Nov 27 2014 Jiri Vanek 1.5.2-0 +- update to upstream 1.5.2 +- enabled tagsoup +- forced rhino +- Resolves: rhbz#1075793 + +* Fri Oct 17 2014 Jiri Vanek 1.5.1-3 +- removed ExcludeArch: ppc + - openjdk on ppc should be now fixed +- Resolves: rhbz#1075793 + +* Mon Aug 18 2014 Jiri Vanek 1.5.1-2 +- added ExcludeArch: ppc +- Resolves: rhbz#1125557 + +* Mon Aug 18 2014 Jiri Vanek 1.5.1-1 +- fixed obsolates to any jdk6 plugin +- Resolves: rhbz#1077287 + +* Fri Aug 15 2014 Jiri Vanek 1.5.1-0 +- update to upstream 1.5.1 +- removed all patches (all upstreamed) +- Resolves: rhbz#1077287 + +* Mon Apr 07 2014 Jiri Vanek 1.5-2 +- add not yet upstreamed DE localisation of 1.5 + - patch0 DElocalizationforIcedTea-Web1.5-0001.patch +- autoreconf gog -vfi, see RH1077898 +- ./configure changed to %%configure +- Resolves: rhbz#1077287 + * Tue Mar 11 2014 Jiri Vanek 1.4.2-1 - fixing brand in with-pkgversion switch to rhel - Resolves: rhbz#1065518