[guacamole-client] Remove minify-maven-plugin. Add missing BR.
Simone Caronni
slaanesh at fedoraproject.org
Sun Apr 20 09:31:27 UTC 2014
commit e7580b8547324875ba24609bc8c8e9f2d46a9352
Author: Simone Caronni <negativo17 at gmail.com>
Date: Sun Apr 20 11:31:14 2014 +0200
Remove minify-maven-plugin. Add missing BR.
guacamole-client.spec | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/guacamole-client.spec b/guacamole-client.spec
index dceab74..11eae42 100644
--- a/guacamole-client.spec
+++ b/guacamole-client.spec
@@ -10,9 +10,11 @@ Source0: http://downloads.sourceforge.net/guacamole/%{name}-%{version}.ta
Patch0: %{name}-0.8.3-allow-linking.patch
BuildArch: noarch
-BuildRequires: mvn(com.samaxes.maven:minify-maven-plugin)
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
+BuildRequires: mvn(org.eclipse.jetty:jetty-websocket:8.1.14.v20131031)
BuildRequires: maven-local
BuildRequires: maven-release-plugin
BuildRequires: mvn(org.apache.maven.plugins:maven-war-plugin)
@@ -71,6 +73,9 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
+%pom_remove_plugin :minify-maven-plugin guacamole-common-js
+# Use pom_xpath_remove/inject?
+sed -i -e 's/8.1.1.v20120215/8.1.14.v20131031/g' guacamole/pom.xml
%build
# Skip automatic installation of the war module; XMvn doesn't support war installation yet (rhbz#963838)
@@ -84,11 +89,12 @@ mkdir -p %{buildroot}%{_datadir}/tomcat/webapps/guacamole/
cp -frvp guacamole/target/guacamole-%{version}/* %{buildroot}%{_datadir}/tomcat/webapps/guacamole/
# Use Fedora packaged jar files
-find %{buildroot}%{_datadir}/tomcat/webapps/guacamole/WEB-INF/lib/*jar -delete
-for jar in commons-logging.jar slf4j/slf4j-api.jar slf4j/slf4j-jcl.jar \
- guacamole-client/guacamole-common.jar guacamole-client/guacamole-ext.jar; do
- ln -sf %{_javadir}/$jar %{buildroot}%{_datadir}/tomcat/webapps/guacamole/WEB-INF/lib/
-done
+xmvn-subst -s %{buildroot}%{_datadir}/tomcat/webapps/guacamole/WEB-INF/lib/
+#find %{buildroot}%{_datadir}/tomcat/webapps/guacamole/WEB-INF/lib/*jar -delete
+#for jar in commons-logging.jar slf4j/slf4j-api.jar slf4j/slf4j-jcl.jar \
+# guacamole-client/guacamole-common.jar guacamole-client/guacamole-ext.jar; do
+# ln -sf %{_javadir}/$jar %{buildroot}%{_datadir}/tomcat/webapps/guacamole/WEB-INF/lib/
+#done
# Configuration file
mkdir -p %{buildroot}%{_sysconfdir}/guacamole
@@ -97,7 +103,7 @@ sed -i -e 's@/path/to@%{_sysconfdir}/guacamole at g' %{buildroot}%{_sysconfdir}/gua
ln -sf %{_sysconfdir}/guacamole/guacamole.properties %{buildroot}%{_datadir}/tomcat/webapps/guacamole/WEB-INF/classes/
%files -n guacamole -f .mfiles
-%doc guacamole/COPYING guacamole-ext/LICENSE guacamole/README
+%doc guacamole/LICENSE
%{_datadir}/tomcat/webapps/guacamole
%dir %{_sysconfdir}/guacamole
%config(noreplace) %attr(640,root,tomcat) %{_sysconfdir}/guacamole/user-mapping.xml
@@ -106,8 +112,10 @@ ln -sf %{_sysconfdir}/guacamole/guacamole.properties %{buildroot}%{_datadir}/tom
%files -n guacamole-javadoc -f .mfiles-javadoc
%changelog
-* Fri Apr 18 2014 Simone Caronni <negativo17 at gmail.com> - 0.9.0-1
+* Sun Apr 20 2014 Simone Caronni <negativo17 at gmail.com> - 0.9.0-1
- Update to 0.9.0.
+- Remove minify-maven-plugin. See
+ https://bugzilla.redhat.com/show_bug.cgi?id=745515
* 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
More information about the scm-commits
mailing list