[guacamole-client/f20] Update linking patch
by Simone Caronni
commit 5b2f7536e0ef4747b14339c470e1aceb68fe6b68
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Wed Aug 28 17:42:35 2013 +0200
Update linking patch
guacamole-client-0.8.2-allow-linking.patch | 7 -------
guacamole-client-0.8.3-allow-linking.patch | 6 ++++++
2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/guacamole-client-0.8.3-allow-linking.patch b/guacamole-client-0.8.3-allow-linking.patch
new file mode 100644
index 0000000..7b35133
--- /dev/null
+++ b/guacamole-client-0.8.3-allow-linking.patch
@@ -0,0 +1,6 @@
+diff -Naur guacamole-client-0.8.3.old/guacamole/src/main/webapp/META-INF/context.xml guacamole-client-0.8.3/guacamole/src/main/webapp/META-INF/context.xml
+--- guacamole-client-0.8.3.old/guacamole/src/main/webapp/META-INF/context.xml 1970-01-01 01:00:00.000000000 +0100
++++ guacamole-client-0.8.3/guacamole/src/main/webapp/META-INF/context.xml 2013-08-28 17:06:56.569051562 +0200
+@@ -0,0 +1,2 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Context antiJARLocking="true" path="" allowLinking="true"/>
10 years, 9 months
[guacamole-client/f20] Remove upstreamed patch
by Simone Caronni
commit ad8322b42b480975eb4cdce89178480fe2f05173
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Wed Aug 28 17:19:54 2013 +0200
Remove upstreamed patch
guacamole-client-0.8.2-js-assembly.patch | 38 ------------------------------
1 files changed, 0 insertions(+), 38 deletions(-)
10 years, 9 months
[guacamole-client/f18: 4/4] Merge branch 'f19' into f18
by Simone Caronni
commit bffcc7142eae4774b5e696558ec1d24e910baffe
Merge: 6c7f74b c6e29d1
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Wed Aug 28 17:17:40 2013 +0200
Merge branch 'f19' into f18
guacamole-client-0.8.2-allow-linking.patch | 7 -----
guacamole-client-0.8.2-js-assembly.patch | 38 ----------------------------
guacamole-client-0.8.3-allow-linking.patch | 6 ++++
guacamole-client.spec | 12 +++++---
4 files changed, 13 insertions(+), 50 deletions(-)
---
10 years, 9 months
[guacamole-client] Update to 0.8.3
by Simone Caronni
Summary of changes:
df8ad21... Update to 0.8.3 (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 9 months
[guacamole-client/f20] Update to 0.8.3
by Simone Caronni
commit df8ad219221bfdf73d374808f66df8a44000759d
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Wed Aug 28 17:16:00 2013 +0200
Update to 0.8.3
guacamole-client.spec | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/guacamole-client.spec b/guacamole-client.spec
index 31b7c7d..732f4c5 100644
--- a/guacamole-client.spec
+++ b/guacamole-client.spec
@@ -1,14 +1,13 @@
Name: guacamole-client
-Version: 0.8.2
-Release: 4%{?dist}
+Version: 0.8.3
+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://guac-dev.org/pub/dist/source/%{name}-%{version}.tar.gz
-Patch0: %{name}-0.8.2-allow-linking.patch
-Patch1: %{name}-0.8.2-js-assembly.patch
+Patch0: %{name}-0.8.3-allow-linking.patch
BuildArch: noarch
BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin)
@@ -71,7 +70,6 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
-%patch1 -p1
%build
# Skip automatic installation of the war module; XMvn doesn't support war installation yet (rhbz#963838)
@@ -118,6 +116,10 @@ fi
%files -n guacamole-javadoc -f .mfiles-javadoc
%changelog
+* Wed Aug 28 2013 Simone Caronni <negativo17(a)gmail.com> - 0.8.3-1
+- Update to 0.8.3.
+- Drop upstreamed patch.
+
* Mon Aug 26 2013 Simone Caronni <negativo17(a)gmail.com> - 0.8.2-4
- Rework spec file for recent Fedora 20 changes.
- Add proper Obsolete / Provides for javadoc packages.
10 years, 9 months
[guacamole-client/f19] Remove upstreamed patch
by Simone Caronni
commit c6e29d1013d25393347f5884dcbf7e6cc73e5f64
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Wed Aug 28 17:13:03 2013 +0200
Remove upstreamed patch
guacamole-client-0.8.2-js-assembly.patch | 38 ------------------------------
1 files changed, 0 insertions(+), 38 deletions(-)
10 years, 9 months