packages (CONFLUENCE_3_1): confluence/confluence.spec - merged HEAD

Thu Jul 22 13:26:21 CEST 2010

Author: pawelz                       Date: Thu Jul 22 11:26:21 2010 GMT
Module: packages                      Tag: CONFLUENCE_3_1
---- Log message:
- merged HEAD

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

---- Diffs:

================================================================
Index: packages/confluence/confluence.spec
diff -u packages/confluence/confluence.spec:1.14 packages/confluence/confluence.spec:1.14.2.1

--- packages/confluence/confluence.spec:1.14	Wed Mar 24 14:12:51 2010
+++ packages/confluence/confluence.spec	Thu Jul 22 13:26:16 2010
@@ -3,6 +3,29 @@
 # - ask atlassian for permission to redistribute it.
 # - install more language packs from
 #   http://confluence.atlassian.com/display/DISC/Language+Pack+Translations
+# - some workaround for pull-down menu problem (see README.PLD)
+
+# NOTE:
+# Do not remove NoSource tags. Make sure DistFiles won't fetch Confluence sources.
+#
+# Todd Revolt from Atlassian told that:
+#   * We are free to integrate Atlassian products into PLD. So we can write
+#     installer scripts, create nosrc packages etc.
+#   * We are not permitted to redistribute their products. That mean during
+#     installation each user has to download Confluence from atlassian web
+#     page.
+#
+# See Atlassian_EULA_3.0.pdf for more details.
+
+# RELEASE INFO:
+# This version of confluence was released 08 Dec 2008
+
+%if 0
+# Download sources manually:
+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
+%endif
 
 # Conditional build
 %bcond_with	customized	# use patch for confluence-%{version}.jar
@@ -23,33 +46,35 @@
 Source2:	%{name}-init.properties
 Source3:	%{name}-log4j.properties
 Source4:	%{name}-README.PLD
-# http://confluence.atlassian.com/download/attachments/173229/confluence-pl_PL-plugin-1.0.jar
-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
+# NoSource6-md5:	9e87088024e3c5ee2e63a72a3e99a6cb
+NoSource:	6
 URL:		http://www.atlassian.com/software/confluence/
 %{?with_customized:BuildRequires:	jar}
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.546
 Requires:	jpackage-utils
-Requires:	tomcat
+Requires:	tomcat >= 6.0.26-8
 Suggests:	graphviz
 BuildArch:	noarch
 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.
@@ -58,9 +83,10 @@
 Polskie tłumaczenie Confluence.
 
 %prep
-%setup -q -n confluence-%{version}
+%setup -q
 
 cp %{SOURCE4} README.PLD
+cp %{SOURCE6} .
 
 %if %{with customized}
 mkdir work
@@ -88,16 +114,13 @@
 ln -sf %{_sysconfdir}/%{name}/tomcat-context.xml $RPM_BUILD_ROOT%{_tomcatconfdir}/%{name}.xml
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/confluence-init.properties
+ln -sf %{_sysconfdir}/%{name}/confluence-init.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/confluence-init.properties
+
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/log4j.properties
+ln -sf %{_sysconfdir}/%{name}/log4j.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
 
 install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/lib/confluence-pl_PL-plugin-1.0.jar
 
-ln -s %{_sysconfdir}/%{name}/tomcat-context.xml $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/%{name}.xml
-
-ln -sf %{_sysconfdir}/%{name}/log4j.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
-ln -sf %{_sysconfdir}/%{name}/confluence-init.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/confluence-init.properties
-ln -sf %{_sysconfdir}/%{name}/log4j.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
-
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j-diagnostic.properties $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/log4j-diagnostic.properties
 ln -s %{_sysconfdir}/%{name}/log4j-diagnostic.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j-diagnostic
 
@@ -133,7 +156,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README.PLD licenses
+%doc README.PLD licenses Atlassian_EULA_3.0.pdf
 %dir %attr(750,root,servlet) %{_sysconfdir}/confluence
 %config(noreplace) %verify(not md5 mtime size) %attr(640,root,servlet) %{_sysconfdir}/%{name}/log4j.properties
 %config(noreplace) %verify(not md5 mtime size) %attr(640,root,servlet) %{_sysconfdir}/%{name}/log4j-diagnostic.properties
@@ -156,6 +179,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"`)
@@ -164,6 +188,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14.2.1  2010/07/22 11:26:16  pawelz
+- merged HEAD
+
 Revision 1.14  2010/03/24 13:12:51  pawelz
 - use all these new cool tomcat-related rpm macros
 - BR: rpmbuild(macros) >= 1.546
================================================================

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

