From 2f5fc430f54bfe660c6713419aa9efb4af625153 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 1/4] Expand conditionals --- bsh.spec | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/bsh.spec b/bsh.spec index 960bf21..9c8a3b6 100644 --- a/bsh.spec +++ b/bsh.spec @@ -29,7 +29,6 @@ # %global reltag b6 -%bcond_without desktop Name: bsh Version: 2.0 @@ -54,10 +53,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 @@ -127,14 +122,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 +141,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 From d9904f7d1dfd17cf0e74e8a403dcbd8c4b2fce44 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:55:38 +0000 Subject: [PATCH 2/4] Remove Obsoletes --- bsh.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/bsh.spec b/bsh.spec index 9c8a3b6..fa07474 100644 --- a/bsh.spec +++ b/bsh.spec @@ -63,8 +63,6 @@ Requires: javapackages-tools Provides: %{name}-utils = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-utils < 0:2.0 -Obsoletes: %{name}-demo < 0:2.0 # bsh uses small subset of modified (shaded) classes from ancient version of # objecweb-asm under asm directory From c2b952d78581c847b823b91dccbc07742276d4e9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 13:02:12 +0000 Subject: [PATCH 3/4] Remove explicit Epoch --- bsh.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bsh.spec b/bsh.spec index fa07474..dc81b17 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,6 @@ Name: bsh Version: 2.0 Release: 13.%{reltag}%{?dist} -Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ # bundled asm is BSD @@ -62,7 +61,7 @@ Requires: jline Requires: javapackages-tools -Provides: %{name}-utils = %{epoch}:%{version}-%{release} +Provides: %{name}-utils = %{version}-%{release} # bsh uses small subset of modified (shaded) classes from ancient version of # objecweb-asm under asm directory From 721a50d28cb08758bd620b042a4b5f2d7eee5809 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:26 +0200 Subject: [PATCH 4/4] Mass rebuild for javapackages-tools 201901 --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index dc81b17..7fb79f4 100644 --- a/bsh.spec +++ b/bsh.spec @@ -32,7 +32,7 @@ Name: bsh Version: 2.0 -Release: 13.%{reltag}%{?dist} +Release: 14.%{reltag}%{?dist} Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ # bundled asm is BSD @@ -150,6 +150,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 2.0-14.b6 +- Mass rebuild for javapackages-tools 201901 + * Fri Aug 03 2018 Michael Simacek - 0:2.0-13.b6 - Remove proprietary files from tarball