diff --git a/.gitignore b/.gitignore index e32b6d1..76075c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/icedtea-web-1.6.2.tar.gz +SOURCES/icedtea-web-1.7.1.tar.gz diff --git a/.icedtea-web.metadata b/.icedtea-web.metadata index 6e47951..55e3c5d 100644 --- a/.icedtea-web.metadata +++ b/.icedtea-web.metadata @@ -1 +1 @@ -54b730855b29533866c8deb78cfe522adb18ff5d SOURCES/icedtea-web-1.6.2.tar.gz +a484daa20cadefe4d4ba2c1e3b28dbb39c986f4b SOURCES/icedtea-web-1.7.1.tar.gz diff --git a/SOURCES/bashCompDirHardcodedAgain.patch b/SOURCES/bashCompDirHardcodedAgain.patch new file mode 100644 index 0000000..bf49284 --- /dev/null +++ b/SOURCES/bashCompDirHardcodedAgain.patch @@ -0,0 +1,28 @@ +diff -r 13cf373ecdba -r c354ddd6de5f Makefile.am +--- a/Makefile.am Thu May 04 16:13:43 2017 +0200 ++++ b/Makefile.am Wed May 10 12:41:53 2017 +0200 +@@ -34,7 +34,7 @@ + export NETX_SRCDIR = $(TOP_SRC_DIR)/netx + export NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources + export ICONS_DEST_DIR=$(DESTDIR)$(datadir)/pixmaps +-export BASH_CMPL_DEST_DIR=$(DESTDIR)@bashcompdir@ ++export BASH_CMPL_DEST_DIR=$(DESTDIR)$(sysconfdir)/bash_completion.d + + export WIN_ALL_DEPS=$(DESTDIR)$(prefix)/win-deps-all + export WIN_RUN_DEPS=$(DESTDIR)$(prefix)/win-deps-runtime +diff -r 13cf373ecdba -r c354ddd6de5f configure.ac +--- a/configure.ac Thu May 04 16:13:43 2017 +0200 ++++ b/configure.ac Wed May 10 12:41:53 2017 +0200 +@@ -157,10 +157,6 @@ + fi + fi + +-PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], , +- bashcompdir="${sysconfdir}/bash_completion.d") +-AC_SUBST(bashcompdir) +- + AC_CONFIG_FILES([jrunscript], [chmod u+x jrunscript]) + AC_CONFIG_FILES([build.properties]) + + + diff --git a/SPECS/icedtea-web.spec b/SPECS/icedtea-web.spec index e860055..db1d355 100644 --- a/SPECS/icedtea-web.spec +++ b/SPECS/icedtea-web.spec @@ -3,6 +3,10 @@ # Alternatives priority %define priority 18000 +# jnlp prorocol gnome registry keys +%define gurlhandler /desktop/gnome/url-handlers +%define jnlphandler %{gurlhandler}/jnlp +%define jnlpshandler %{gurlhandler}/jnlps %define javadir %{_jvmdir}/java-%{javaver}-openjdk %define jredir %{_jvmdir}/jre-%{javaver}-openjdk @@ -13,14 +17,15 @@ %define preffered_java java-%{javaver}-openjdk Name: icedtea-web -Version: 1.6.2 -Release: 4%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: Additional Java components for OpenJDK - Java browser plug-in and Web Start implementation Group: Applications/Internet License: LGPLv2+ and GPLv2 with exceptions URL: http://icedtea.classpath.org/wiki/IcedTea-Web Source0: http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz +Patch0: bashCompDirHardcodedAgain.patch BuildRequires: jpackage-utils BuildRequires: %{preffered_java}-devel @@ -40,16 +45,15 @@ BuildRequires: rhino # For functionality and the OpenJDK dirs Requires: %{preffered_java} Requires: jpackage-utils +Requires: bash-completion #maven fragments Requires(post): jpackage-utils Requires(postun): jpackage-utils # 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 @@ -57,10 +61,14 @@ Requires: rhino Requires(post): %{_sbindir}/alternatives # in version 1.7 and higher for --family switch Requires(post): chkconfig >= 1.7 +# jnlp protocols support +Requires(post): GConf2 # Postun requires alternatives to uninstall tool alternatives. Requires(postun): %{_sbindir}/alternatives # in version 1.7 and higher for --family switch Requires(postun): chkconfig >= 1.7 +# jnlp protocols support +Requires(postun): GConf2 # Standard JPackage plugin provides. Provides: java-plugin = 1:%{javaver} @@ -85,8 +93,19 @@ BuildArch: noarch %description javadoc This package contains Javadocs for the IcedTea-Web project. + +%package devel +Summary: pure sources for debugging IcedTea-Web +Group: devel +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description devel +This package contains ziped sources of the IcedTea-Web project. + %prep %setup -q +%patch0 -p1 %build autoreconf -vfi @@ -107,10 +126,12 @@ make install DESTDIR=$RPM_BUILD_ROOT # icedteaweb-completion is currently not handled by make nor make install mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/ -cp icedteaweb-completion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/ +mv completion/policyeditor.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/ +mv completion/javaws.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/ +mv completion/itweb-settings.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/ # Move javaws man page to a more specific name -mv $RPM_BUILD_ROOT/%{_mandir}/man1/javaws.1 $RPM_BUILD_ROOT/%{_mandir}/man1/javaws-itweb.1 +mv $RPM_BUILD_ROOT/%{_mandir}/man1/javaws.1 $RPM_BUILD_ROOT/%{_mandir}/man1/javaws.itweb.1 # Install desktop files. install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} @@ -141,7 +162,10 @@ cp metadata/%{name}-plugin.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/%{name}-plugin.p #add_maven_depmap %{name}.pom %{name}.jar #add_maven_depmap %{name}-plugin.pom %{name}-plugin.jar +cp netx.build/lib/src.zip $RPM_BUILD_ROOT%{_datadir}/%{name}/netx.src.zip +cp liveconnect/lib/src.zip $RPM_BUILD_ROOT%{_datadir}/%{name}/plugin.src.zip +%find_lang %{name} --all-name --with-man %check make check @@ -149,11 +173,19 @@ appstream-util validate $RPM_BUILD_ROOT/%{_datadir}/appdata/*.xml || : %post alternatives \ - --install %{_libdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \ - %{_libdir}/IcedTeaPlugin.so %{priority} --family %{preffered_java}.%{_arch} \ - --slave %{_bindir}/javaws javaws %{_prefix}/bin/javaws%{binsuffix} \ - --slave %{_mandir}/man1/javaws.1.gz javaws.1.gz \ - %{_mandir}/man1/javaws-itweb.1.gz + --install %{_libdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} %{_libdir}/IcedTeaPlugin.so %{priority} --family %{preffered_java}.%{_arch} \ + --slave %{_bindir}/javaws javaws %{_prefix}/bin/javaws%{binsuffix} \ + --slave %{_bindir}/itweb-settings itweb-settings %{_prefix}/bin/itweb-settings%{binsuffix} \ + --slave %{_bindir}/policyeditor policyeditor %{_prefix}/bin/policyeditor%{binsuffix} \ + --slave %{_bindir}/ControlPanel ControlPanel %{_prefix}/bin/itweb-settings%{binsuffix} \ + --slave %{_mandir}/man1/javaws.1.gz javaws.1.gz %{_mandir}/man1/javaws%{binsuffix}.1.gz \ + --slave %{_mandir}/man1/ControlPanel.1.gz ControlPanel.1.gz %{_mandir}/man1/itweb-settings.1.gz + + +gconftool-2 -s %{jnlphandler}/command '%{_prefix}/bin/javaws%{binsuffix} %s' --type String &> /dev/null || : +gconftool-2 -s %{jnlphandler}/enabled --type Boolean true &> /dev/null || : +gconftool-2 -s %{jnlpshandler}/command '%{_prefix}/bin/javaws%{binsuffix} %s' --type String &> /dev/null || : +gconftool-2 -s %{jnlpshandler}/enabled --type Boolean true &> /dev/null || : %posttrans update-desktop-database &> /dev/null || : @@ -163,23 +195,25 @@ exit 0 update-desktop-database &> /dev/null || : if [ $1 -eq 0 ] then - alternatives --remove %{javaplugin} \ - %{_libdir}/IcedTeaPlugin.so + alternatives --remove %{javaplugin} %{_libdir}/IcedTeaPlugin.so + gconftool-2 -u %{jnlphandler}/command &> /dev/null || : + gconftool-2 -u %{jnlphandler}/enabled &> /dev/null || : + gconftool-2 -u %{jnlpshandler}/command &> /dev/null || : + gconftool-2 -u %{jnlpshandler}/enabled &> /dev/null || : fi exit 0 -# files -f .mfiles -%files +# files -f .mfiles -f %{name}.lang +%files -f %{name}.lang %defattr(-,root,root,-) -%{_sysconfdir}/bash_completion.d/icedteaweb-completion +%{_sysconfdir}/bash_completion.d/* %{_prefix}/bin/* %{_libdir}/IcedTeaPlugin.so %{_datadir}/applications/* -%{_datadir}/%{name} +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/*.jar +%{_datadir}/%{name}/*.png %{_datadir}/man/man1/* -%{_datadir}/man/cs/man1/* -%{_datadir}/man/de/man1/* -%{_datadir}/man/pl/man1/* %{_datadir}/pixmaps/* %{_datadir}/appdata/*.xml # thsoe four shouldnotbe there. Fixme! something went wrong @@ -187,14 +221,42 @@ exit 0 %{_mavenpomdir}/%{name}-plugin.pom %{_javadir}/%{name}.jar %{_javadir}/%{name}-plugin.jar -%doc NEWS README COPYING +%doc NEWS README +%license COPYING %files javadoc %defattr(-,root,root,-) %{_datadir}/javadoc/%{name} -%doc COPYING +%license COPYING + +%files devel +%{_datadir}/%{name}/*.zip +%license COPYING %changelog +* Mon Dec 18 2017 Jiri Vanek 1.7.1-1 +* bump to 1.7.1 +- Resolves: rhbz#1475411 + +* Fri Nov 03 2017 Jiri Vanek 1.7-3 +- javaws specific manpage renmed from -suffix to .suffix +- Resolves: rhbz#1475411 + +* Wed Oct 18 2017 Jiri Vanek 1.7-2 +- gathered various patches from usptream +- Resolves: rhbz#1475411 + +* Wed Oct 18 2017 Jiri Vanek 1.7-1 +- updated to itw 1.7 and sync from fedora +- added forgotten slaves of itweb-settings policyeditor +- Own %%{_datadir}/%%{name} dir +- Mark non-English man pages with %%lang +- Install COPYING as %%license +- last three by Ville Skytta via 1481270 +- for sake of rpms added patch0, bashCompDirHardcodedAgain.patch to hardcode bashcompletion dir +- removed maven macros in favour of manual handling (bug) +- Resolves: rhbz#1475411 + * Thu Jul 14 2016 Jiri Vanek 1.6.2-4 - fixed typo in provides - Resolves: rhbz#1299537