[guacamole/f19] Java packaging guidelines updates
Simone Caronni
slaanesh at fedoraproject.org
Tue Mar 26 19:14:21 UTC 2013
commit 2cdf7163f475e9cd4880e0ee0192cfefeb6031b6
Author: Simone Caronni <negativo17 at gmail.com>
Date: Tue Mar 26 20:13:58 2013 +0100
Java packaging guidelines updates
guacamole.spec | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
---
diff --git a/guacamole.spec b/guacamole.spec
index 154fbd2..0ba42f0 100644
--- a/guacamole.spec
+++ b/guacamole.spec
@@ -1,9 +1,8 @@
Name: guacamole
Version: 0.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The main Guacamole web application
License: AGPLv3+
-Group: Development/Libraries
URL: http://guac-dev.org/
Source0: http://downloads.sourceforge.net/guacamole/%{name}-%{version}.tar.gz
# Remove javascript as according to packaging guidelines these must be present
@@ -13,36 +12,18 @@ Patch0: %{name}-0.6.2-js.patch
Patch1: %{name}-0.6.2-allow-linking.patch
BuildArch: noarch
-# https://fedoraproject.org/wiki/Packaging:Java#maven_3
BuildRequires: guacamole-common >= 0.8.0
BuildRequires: guacamole-ext >= 0.8.0
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: maven-clean-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-dependency-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-local
-BuildRequires: maven-release-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-war-plugin
+BuildRequires: servlet3
Requires: guacamole-common >= 0.8.0
Requires: guacamole-common-js >= 0.7.1
Requires: guacamole-ext >= 0.8.0
Requires: java
-Requires: jpackage-utils
Requires: log4j
Requires: slf4j
Requires: tomcat
Requires: tomcat-native
-%if 0%{?fedora} || 0%{?rhel} > 6
-BuildRequires: servlet3
-%else
-BuildRequires: servlet25
-%endif
%description
This package contains the main HTML5 web application for the Guacamole stack
@@ -59,7 +40,6 @@ The centralized server is provided by the "guacd" package and its associated
%package javadoc
Summary: API documentation for %{name}
Group: Documentation
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
@@ -70,7 +50,7 @@ This package contains the API documentation for %{name}.
%patch1 -p1
%build
-#https://fedoraproject.org/wiki/User:Akurtakov/JavaPackagingDraftUpdate#Patching_Maven_pom.xml_files
+# https://fedoraproject.org/wiki/Packaging:Java#Patching_Maven_pom.xml_files
%pom_remove_dep net.sourceforge.guacamole:guacamole-common-js
mvn-rpmbuild package javadoc:aggregate
@@ -84,8 +64,8 @@ cp -frp target/%{name}-%{version}/* %{buildroot}%{_sharedstatedir}/tomcat/webapp
# Use Fedora packaged jar files & java scripts
rm -f %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/*.jar
-ln -sf %{_javadir}/%{name}/guacamole-ext.jar %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/
-ln -sf %{_javadir}/%{name}/guacamole-common.jar %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/
+ln -sf %{_javadir}/guacamole-ext/guacamole-ext.jar %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/
+ln -sf %{_javadir}/guacamole-common/guacamole-common.jar %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/
ln -sf %{_javadir}/slf4j/api.jar %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/
ln -sf %{_javadir}/slf4j/jcl-over-slf4j.jar %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/
ln -sf %{_datadir}/guacamole-common-js %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/
@@ -111,8 +91,10 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%doc COPYING
%{_javadocdir}/%{name}
-
%changelog
+* Tue Mar 26 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.0-3
+- Updated spec file for Java guidelines.
+
* Mon Mar 25 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.0-2
- Source rebuilt upstream due to bug: http://guac-dev.org/trac/ticket/298
More information about the scm-commits
mailing list