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.
Show replies by date