Author: pawelz Date: Mon Jul 19 14:15:45 2010 GMT Module: packages Tag: CONFLUENCE_3_2 ---- Log message: - added patch for http://jira.atlassian.com/browse/CONF-18704 - rel 3
---- Files affected: packages/confluence: confluence.spec (1.20.2.1 -> 1.20.2.2) ---- Diffs: ================================================================ Index: packages/confluence/confluence.spec diff -u packages/confluence/confluence.spec:1.20.2.1 packages/confluence/confluence.spec:1.20.2.2 --- packages/confluence/confluence.spec:1.20.2.1 Mon Jul 12 16:54:06 2010 +++ packages/confluence/confluence.spec Mon Jul 19 16:15:40 2010 @@ -24,6 +24,7 @@ wget -c http://www.atlassian.com/software/confluence/downloads/binary/confluence-3.2.1_01.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 @@ -33,7 +34,7 @@ Summary: Confluence - Enterprise wiki Name: confluence Version: 3.2.1_01 -Release: 2 +Release: 3 License: Proprietary, not distributable Group: Networking/Daemons/Java/Servlets Source0: %{name}-%{version}.tar.gz @@ -49,6 +50,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 @@ -84,6 +89,7 @@ cp %{SOURCE4} README.PLD cp %{SOURCE6} . +cp %{SOURCE7} confluence/WEB-INF/lib %if %{with customized} mkdir work @@ -185,6 +191,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.20.2.2 2010/07/19 14:15:40 pawelz +- added patch for http://jira.atlassian.com/browse/CONF-18704 +- rel 3 + Revision 1.20.2.1 2010/07/12 14:54:06 pawelz - release date info - adapterized ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/confluence/confluence.spec?r1=1.20.2.1&r2=1.20.2.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
