commit 8050e0645aff339e5cb191bfe26fef5f43e9ccee Author: Simone Caronni negativo17@gmail.com Date: Fri Jan 9 10:59:08 2015 +0100
Update to 0.9.4
guacamole-client.spec | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) --- diff --git a/guacamole-client.spec b/guacamole-client.spec index e5d73d5..b326f8b 100644 --- a/guacamole-client.spec +++ b/guacamole-client.spec @@ -1,20 +1,30 @@ Name: guacamole-client -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.4 +Release: 1%{?dist} Summary: Server-side Java components that form the Guacamole application
License: MPLv1.1 or GPL+ or AGPLv3+ URL: http://guac-dev.org/ Source0: http://downloads.sourceforge.net/guacamole/%%7Bname%7D-%%7Bversion%7D.tar.gz Source1: %{name}-context.xml -Patch0: %{name}-ext.patch BuildArch: noarch
+BuildRequires: mvn(javax.websocket:javax.websocket-api) >= 1.0 +# This should be >= 1.1.2: +BuildRequires: mvn(ch.qos.logback:logback-classic) >= 1.1.1 +BuildRequires: mvn(com.google.inject.extensions:guice-servlet) >= 3.0 +BuildRequires: mvn(com.sun.jersey.contribs:jersey-guice) >= 1.17.1 +BuildRequires: mvn(com.sun.jersey:jersey-server) >= 1.17.1 +BuildRequires: mvn(com.sun.jersey:jersey-json) >= 1.17.1 BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) >= 7.0.37 BuildRequires: mvn(org.apache.tomcat:tomcat-coyote) >= 7.0.37 +# This should be >= 20: +BuildRequires: mvn(org.eclipse.jetty:jetty-parent:pom:) >= 19 BuildRequires: mvn(org.eclipse.jetty:jetty-websocket:8.1.14.v20131031) +BuildRequires: mvn(org.eclipse.jetty.websocket:websocket-api) +BuildRequires: mvn(org.eclipse.jetty.websocket:websocket-servlet) >= 9.0.7 BuildRequires: mvn(org.slf4j:slf4j-jcl) BuildRequires: maven-local BuildRequires: maven-release-plugin @@ -64,10 +74,9 @@ This package contains the API documentation for %{name}.
%prep %setup -q -n %{name}-%{version} -%patch0 -p1 install -p -m644 -D %{SOURCE1} guacamole/src/main/webapp/META-INF/context.xml
-%pom_remove_plugin :minify-maven-plugin guacamole-common-js +%pom_remove_plugin :minify-maven-plugin guacamole-common-js guacamole # Use pom_xpath_remove/inject? sed -i -e 's/8.1.1.v20120215/8.1.14.v20131031/g' guacamole/pom.xml
@@ -103,6 +112,9 @@ ln -sf %{_sysconfdir}/guacamole/guacamole.properties %{buildroot}%{_datadir}/tom %files -n guacamole-javadoc -f .mfiles-javadoc
%changelog +* Fri Jan 09 2015 Simone Caronni negativo17@gmail.com - 0.9.4-1 +- Update to 0.9.4. + * Thu Jan 08 2015 Simone Caronni negativo17@gmail.com - 0.9.3-2 - Remove workaround for maven filtering.