From 2f5fc430f54bfe660c6713419aa9efb4af625153 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Nov 29 2018 12:42:46 +0000
Subject: Expand conditionals


---

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