[guacamole-client/epel7: 11/12] Switch to java-headless requirement (#1068116), remove symlink workaround

[Simone Caronni]

commit 9deab0583ed3bf351b23acf1012206802dca7e5a
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Feb 26 10:05:35 2014 +0100

    Switch to java-headless requirement (#1068116), remove symlink workaround

 guacamole-client.spec |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/guacamole-client.spec b/guacamole-client.spec
index b87fdb1..e82db1d 100644
--- a/guacamole-client.spec
+++ b/guacamole-client.spec
@@ -1,6 +1,6 @@
 Name:           guacamole-client
 Version:        0.8.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Server-side Java components that form the Guacamole application
 
 License:        MPLv1.1 or GPL+ or AGPLv3+
@@ -32,7 +32,7 @@ The centralized server is provided by the "guacamole-server" package.
 %package -n guacamole
 Summary:        Web-based remote desktop application
 Requires:       mvn(org.apache.commons:commons-logging)
-Requires:       java
+Requires:       java-headless
 Requires:       javapackages-tools
 Requires:       mvn(org.slf4j:slf4j-api) >= 1.6.1
 Requires:       mvn(org.slf4j:slf4j-jcl) >= 1.6.1
@@ -95,17 +95,6 @@ cp -p guacamole/doc/example/* %{buildroot}%{_sysconfdir}/guacamole
 sed -i -e 's@/path/to@%{_sysconfdir}/guacamole at g' %{buildroot}%{_sysconfdir}/guacamole/guacamole.properties
 ln -sf %{_sysconfdir}/guacamole/guacamole.properties %{buildroot}%{_datadir}/tomcat/webapps/guacamole/WEB-INF/classes/
 
-%pretrans -n guacamole
-# Workaround for rpm bug; replacing directory with symlink fails.
-# Open since 2008!
-# https://bugzilla.redhat.com/show_bug.cgi?id=975909
-# https://bugzilla.redhat.com/show_bug.cgi?id=447156
-if [ $1 = 0 ]; then
-    [ -h %{_datadir}/tomcat/webapps/guacamole/guacamole-common-js ] && \
-        rm -f %{_datadir}/tomcat/webapps/guacamole/guacamole-common-js
-    exit 0
-fi
-
 %files -n guacamole -f .mfiles
 %doc guacamole/COPYING guacamole-ext/LICENSE guacamole/README
 %{_datadir}/tomcat/webapps/guacamole
@@ -116,6 +105,11 @@ fi
 %files -n guacamole-javadoc -f .mfiles-javadoc
 
 %changelog
+* Wed Feb 26 2014 Simone Caronni <negativo17 at gmail.com> - 0.8.3-5
+- Remove symlink workaround, all Fedora/RHEL supported releases had 0.8.3 for
+  quite some time.
+- Switch to java-headless requirement (#1068116).
+
 * Fri Oct 11 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.3-4
 - Tighten permissions on user-mapping.xml.