Mass rebuild for javapackages-tools 201901

bsh.spec

@@ -29,12 +29,10 @@
 #
 
 %global reltag b6
-%bcond_without  desktop
 
 Name:           bsh
 Version:        2.0
-Release:        13.%{reltag}%{?dist}
-Epoch:          0
+Release:        14.%{reltag}%{?dist}
 Summary:        Lightweight Scripting for Java
 URL:            http://www.beanshell.org/
 # bundled asm is BSD
@@ -54,10 +52,6 @@ BuildRequires:  bsf
 BuildRequires:  junit
 BuildRequires:  javacc
 BuildRequires:  glassfish-servlet-api
-%if %{with desktop}
-BuildRequires:  ImageMagick
-BuildRequires:  desktop-file-utils
-%endif
 
 Requires:       java-headless
 Requires:       bsf
@@ -67,9 +61,7 @@ Requires:       jline
 Requires:       javapackages-tools
 
 
-Provides:       %{name}-utils = %{epoch}:%{version}-%{release}
-Obsoletes:      %{name}-utils < 0:2.0
-Obsoletes:      %{name}-demo < 0:2.0
+Provides:       %{name}-utils = %{version}-%{release}
 
 # bsh uses small subset of modified (shaded) classes from ancient version of
 # objecweb-asm under asm directory
@@ -127,14 +119,6 @@ ant test dist
 
 %mvn_install -J javadoc
 
-%if %{with desktop}
-# menu entry
-desktop-file-install --mode=644 \
-  --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
-install -d -m 755 %{buildroot}%{_datadir}/pixmaps
-convert src/bsh/util/lib/icon.gif \
-  %{buildroot}%{_datadir}/pixmaps/bsh.png
-%endif
 
 install -d -m 755 %{buildroot}%{_datadir}/%{name}
 install -d -m 755 %{buildroot}%{_datadir}/%{name}/webapps
@@ -154,10 +138,6 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
 %license LICENSE NOTICE
 %doc README.md src/Changes.html src/CodeMap.html docs/faq/faq.html
 %attr(0755,root,root) %{_bindir}/%{name}*
-%if %{with desktop}
-%{_datadir}/applications/%{name}-desktop.desktop
-%{_datadir}/pixmaps/%{name}.png
-%endif
 %{_datadir}/%{name}
 
 %files manual
@@ -170,6 +150,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
 %license LICENSE NOTICE
 
 %changelog
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-14.b6
+- Mass rebuild for javapackages-tools 201901
+
 * Fri Aug 03 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0-13.b6
 - Remove proprietary files from tarball