Author: pawelz Date: Mon Jul 12 14:56:26 2010 GMT Module: packages Tag: HEAD ---- Log message: - merged CONFLUENCE_3_2
---- Files affected: packages/confluence: confluence.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: packages/confluence/confluence.spec diff -u packages/confluence/confluence.spec:1.21 packages/confluence/confluence.spec:1.22 --- packages/confluence/confluence.spec:1.21 Thu Jul 8 16:41:24 2010 +++ packages/confluence/confluence.spec Mon Jul 12 16:56:21 2010 @@ -16,6 +16,9 @@ # # See Atlassian_EULA_3.0.pdf for more details. +# RELEASE INFO: +# This version of confluence was released 06 Jul 2010 + %if 0 # Download sources manually: wget -c http://www.atlassian.com/software/confluence/downloads/binary/confluence-3.3.tar.gz @@ -40,7 +43,7 @@ Source2: %{name}-init.properties Source3: %{name}-log4j.properties Source4: %{name}-README.PLD -Source5: confluence-pl_PL-plugin-1.0.jar +Source5: %{name}-pl_PL-plugin-1.0.jar # NoSource5-md5: b8d219e791a536fd98b1a717747e55bc NoSource: 5 Source6: Atlassian_EULA_3.0.pdf @@ -58,17 +61,17 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -Confluence is a simple, powerful wiki that lets you create and share pages, -documents and rich content with your team. +Confluence is a simple, powerful wiki that lets you create and share +pages, documents and rich content with your team. -If you're looking for a better way to collaborate or a replacement for an -open-source wiki, Confluence has the essential enterprise features for your -organisation. +If you're looking for a better way to collaborate or a replacement for +an open-source wiki, Confluence has the essential enterprise features +for your organisation. %package lang-pl -Summary: Polish translation for Confluence -Summary(pl.UTF-8): Polskie tłumaczenie Confluence -Group: I18n +Summary: Polish translation for Confluence +Summary(pl.UTF-8): Polskie tłumaczenie Confluence +Group: I18n %description lang-pl Polish rtanslation for Confluence. @@ -77,7 +80,7 @@ Polskie tłumaczenie Confluence. %prep -%setup -q -n confluence-%{version} +%setup -q cp %{SOURCE4} README.PLD cp %{SOURCE6} . @@ -173,6 +176,7 @@ %attr(2775,root,servlet) %dir /var/log/confluence %files lang-pl +%defattr(644,root,root,755) %{_datadir}/confluence/WEB-INF/lib/confluence-pl_PL-plugin-1.0.jar %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -181,6 +185,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.22 2010/07/12 14:56:21 pawelz +- merged CONFLUENCE_3_2 + +Revision 1.20.2.1 2010/07/12 14:54:06 pawelz +- release date info +- adapterized + Revision 1.21 2010/07/08 14:41:24 pawelz - up to 3.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/confluence/confluence.spec?r1=1.21&r2=1.22&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
