packages (CONFLUENCE_3_1): confluence/confluence.spec - patch for http://ji...

[pawelz]

Author: pawelz                       Date: Thu Jul 22 14:20:00 2010 GMT
Module: packages                      Tag: CONFLUENCE_3_1
---- Log message:
- patch for http://jira.atlassian.com/browse/CONF-18704 backported from
  CONFLUENCE_3_2 branch

---- Files affected:
packages/confluence:
   confluence.spec (1.14.2.1 -> 1.14.2.2) 

---- Diffs:

================================================================
Index: packages/confluence/confluence.spec
diff -u packages/confluence/confluence.spec:1.14.2.1 packages/confluence/confluence.spec:1.14.2.2
--- packages/confluence/confluence.spec:1.14.2.1	Thu Jul 22 13:26:16 2010
+++ packages/confluence/confluence.spec	Thu Jul 22 16:19:55 2010
@@ -25,6 +25,7 @@
 wget -c http://www.atlassian.com/software/confluence/downloads/binary/confluence-3.1.tar.gz
 wget -c http://confluence.atlassian.com/download/attachments/173229/confluence-pl_PL-plugin-1.0.jar
 wget -c http://www.atlassian.com/about/licensing/Atlassian_EULA_3.0.pdf
+wget -c http://jira.atlassian.com/secure/attachment/38779/confluence-flyingpdf-plugin-1.8.jar
 %endif
 
 # Conditional build
@@ -34,7 +35,7 @@
 Summary:	Confluence - Enterprise wiki
 Name:		confluence
 Version:	3.1
-Release:	1
+Release:	2
 License:	Proprietary, not distributable
 Group:		Networking/Daemons/Java/Servlets
 # You can download it from:
@@ -52,6 +53,10 @@
 Source6:	Atlassian_EULA_3.0.pdf
 # NoSource6-md5:	9e87088024e3c5ee2e63a72a3e99a6cb
 NoSource:	6
+# http://jira.atlassian.com/browse/CONF-18704
+Source7:	confluence-flyingpdf-plugin-1.8.jar
+# NoSource7-md5:	410480cc0323bad045788442bd8a819a
+NoSource:	7
 URL:		http://www.atlassian.com/software/confluence/
 %{?with_customized:BuildRequires:	jar}
 BuildRequires:	jpackage-utils
@@ -87,6 +92,7 @@
 
 cp %{SOURCE4} README.PLD
 cp %{SOURCE6} .
+cp %{SOURCE7} confluence/WEB-INF/lib
 
 %if %{with customized}
 mkdir work
@@ -188,6 +194,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14.2.2  2010/07/22 14:19:55  pawelz
+- patch for http://jira.atlassian.com/browse/CONF-18704 backported from
+  CONFLUENCE_3_2 branch
+
 Revision 1.14.2.1  2010/07/22 11:26:16  pawelz
 - merged HEAD
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/confluence/confluence.spec?r1=1.14.2.1&r2=1.14.2.2&f=u