[guacamole-client] Update 0.9.4 sources
by Simone Caronni
commit 9a2641b0a91381bf423cb4f4a62259d43672acd4
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Fri Jan 9 11:01:00 2015 +0100
Update 0.9.4 sources
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 71df9d0..59eb297 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/guacamole-client-0.9.1.tar.gz
/guacamole-client-0.9.2.tar.gz
/guacamole-client-0.9.3.tar.gz
+/guacamole-client-0.9.4.tar.gz
diff --git a/sources b/sources
index 93a969c..74ba226 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b91c09ba5f235b07eb3681d47c8264b1 guacamole-client-0.9.3.tar.gz
+b38cb2a13535653437d0952d0d7c4c2e guacamole-client-0.9.4.tar.gz
9 years, 5 months
[guacamole-client] Update to 0.9.4
by Simone Caronni
commit 8050e0645aff339e5cb191bfe26fef5f43e9ccee
Author: Simone Caronni <negativo17(a)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/%{name}-%{version}.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(a)gmail.com> - 0.9.4-1
+- Update to 0.9.4.
+
* Thu Jan 08 2015 Simone Caronni <negativo17(a)gmail.com> - 0.9.3-2
- Remove workaround for maven filtering.
9 years, 5 months
[solr] update to 4.10.3
by gil
commit ab78d52d79e11df93bb97dc1e776efca0a4c92fb
Author: gil <puntogil(a)libero.it>
Date: Thu Jan 8 14:13:15 2015 +0100
update to 4.10.3
solr.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/solr.spec b/solr.spec
index 3e3e1cd..71cefe6 100644
--- a/solr.spec
+++ b/solr.spec
@@ -57,7 +57,12 @@ BuildRequires: mvn(org.apache.zookeeper:zookeeper)
BuildRequires: mvn(org.carrot2:morfologik-polish)
BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl)
-%if %{with jetty8}
+%if %{without jetty8}
+BuildRequires: mvn(org.eclipse.jetty:jetty-server)
+BuildRequires: mvn(org.eclipse.jetty:jetty-servlet)
+BuildRequires: mvn(org.eclipse.jetty:jetty-util)
+BuildRequires: mvn(org.eclipse.jetty:jetty-webapp)
+%else
BuildRequires: mvn(org.eclipse.jetty:jetty-continuation:8.1.14.v20131031)
BuildRequires: mvn(org.eclipse.jetty:jetty-deploy:8.1.14.v20131031)
BuildRequires: mvn(org.eclipse.jetty:jetty-http:8.1.14.v20131031)
9 years, 5 months
[solr] update to 4.10.3
by gil
commit 7ac424e7e6e65913fb7b2714fcb1ca6955636627
Author: gil <puntogil(a)libero.it>
Date: Thu Jan 8 14:06:53 2015 +0100
update to 4.10.3
solr.spec | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/solr.spec b/solr.spec
index 3028a5f..3e3e1cd 100644
--- a/solr.spec
+++ b/solr.spec
@@ -56,17 +56,19 @@ BuildRequires: mvn(org.apache.velocity:velocity-tools)
BuildRequires: mvn(org.apache.zookeeper:zookeeper)
BuildRequires: mvn(org.carrot2:morfologik-polish)
BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl)
-%if %{without jetty8}
-BuildRequires: mvn(org.eclipse.jetty:jetty-server)
-BuildRequires: mvn(org.eclipse.jetty:jetty-servlet)
-BuildRequires: mvn(org.eclipse.jetty:jetty-util)
-BuildRequires: mvn(org.eclipse.jetty:jetty-webapp)
-%else
-# 8.1.14.v20131031
-BuildRequires: mvn(org.eclipse.jetty:jetty-server:8.1.14)
-BuildRequires: mvn(org.eclipse.jetty:jetty-servlet:8.1.14)
-BuildRequires: mvn(org.eclipse.jetty:jetty-util:8.1.14)
-BuildRequires: mvn(org.eclipse.jetty:jetty-webapp:8.1.14)
+
+%if %{with jetty8}
+BuildRequires: mvn(org.eclipse.jetty:jetty-continuation:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-deploy:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-http:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-io:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-jmx:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-security:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-server:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-servlet:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-util:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-webapp:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-xml:8.1.14.v20131031)
Requires: jetty8
%endif
BuildRequires: mvn(org.noggit:noggit)
@@ -353,8 +355,19 @@ done
%pom_disable_module lucene
rm -r lucene
-# Disable Jetty8 support ... for now
+
+%if %{without jetty8}
+# Disable Jetty8 support
+%pom_remove_dep org.eclipse.jetty: solr/core
rm -r solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+%else
+# Add jetty compat version RHBZ#1057670
+%pom_xpath_set "pom:properties/pom:jetty.version" 8.1.14.v20131031
+for m in solr/core solr/test-framework; do
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId = 'org.eclipse.jetty']" \
+ '<version>${jetty.version}</version>' ${m}
+done
+%endif
# fix log4j version
sed -i "s|<version>1.2.16</version>|<version>1.2.17</version>|" pom.xml
9 years, 5 months
[lucene] BR apache-parent.
by Alexander Kurtakov
commit cdba1bf21b528e342c5c069d8c911efa75657191
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Jan 8 12:52:53 2015 +0200
BR apache-parent.
lucene.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/lucene.spec b/lucene.spec
index 9bf76dd..d9f18d4 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -70,6 +70,7 @@ BuildRequires: xerces-j2
BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(org.antlr:antlr-runtime)
BuildRequires: maven-local
+BuildRequires: apache-parent
# test-framework deps
BuildRequires: junit
9 years, 5 months
[guacamole-client] Remove workaround for maven filtering
by Simone Caronni
commit e8fbca68dd92f0ee3f7b59ce62c042debbbd7c96
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Thu Jan 8 10:50:09 2015 +0100
Remove workaround for maven filtering
guacamole-client.spec | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/guacamole-client.spec b/guacamole-client.spec
index e99b797..e5d73d5 100644
--- a/guacamole-client.spec
+++ b/guacamole-client.spec
@@ -1,6 +1,6 @@
Name: guacamole-client
Version: 0.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Server-side Java components that form the Guacamole application
License: MPLv1.1 or GPL+ or AGPLv3+
@@ -71,13 +71,6 @@ install -p -m644 -D %{SOURCE1} guacamole/src/main/webapp/META-INF/context.xml
# Use pom_xpath_remove/inject?
sed -i -e 's/8.1.1.v20120215/8.1.14.v20131031/g' guacamole/pom.xml
-# Disable filtering of bundled binaries, which causes
-# maven-filtering to fail with IOException (see MSHARED-325).
-%pom_xpath_inject "pom:plugin[pom:artifactId='maven-war-plugin']/pom:configuration" "
- <nonFilteredFileExtensions>
- <nonFilteredFileExtension>cur</nonFilteredFileExtension>
- </nonFilteredFileExtensions>" guacamole
-
%build
# Skip automatic installation of war and tar.gz modules; XMvn doesn't support war installation yet (rhbz#963838)
%mvn_package "::{war,tar.gz}:" __noinstall
@@ -110,6 +103,9 @@ ln -sf %{_sysconfdir}/guacamole/guacamole.properties %{buildroot}%{_datadir}/tom
%files -n guacamole-javadoc -f .mfiles-javadoc
%changelog
+* Thu Jan 08 2015 Simone Caronni <negativo17(a)gmail.com> - 0.9.3-2
+- Remove workaround for maven filtering.
+
* Mon Oct 06 2014 Simone Caronni <negativo17(a)gmail.com> - 0.9.3-1
- Update to 0.9.3.
9 years, 5 months
[batik/f21] Split css in subpackage.
by Alexander Kurtakov
Summary of changes:
b5950bc... Split css in subpackage. (*)
(*) This commit already existed in another branch; no separate mail sent
9 years, 5 months