- merged CONFLUENCE_3_2

[packages/confluence.git] / confluence.spec

diff --git a/confluence.spec b/confluence.spec
index 01b3660e7d9c89f43ffb699cf21e45a3147dc786..ceef785eee392e16a3f670841fc3c2d8e9bc009d 100644 (file)
--- a/confluence.spec
+++ b/confluence.spec
@@ -2,7 +2,6 @@
 # - install more language packs from
 #   http://confluence.atlassian.com/display/DISC/Language+Pack+Translations
 # - some workaround for pull-down menu problem (see README.PLD)
-# - convert to "-installer" type package?
 
 # NOTE:
 # Do not remove NoSource tags. Make sure DistFiles won't fetch Confluence sources.
@@ -13,8 +12,18 @@
 #   * We are not permitted to redistribute their products. That mean during
 #     installation each user has to download Confluence from atlassian web
 #     page.
-# BTW: maybe just add wget http://atlassian.com/(...)tar.gz -O /dev/null to
-# %pre?
+#
+# 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
+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
@@ -22,46 +31,46 @@
 %include       /usr/lib/rpm/macros.java
 Summary:       Confluence - Enterprise wiki
 Name:          confluence
-Version:       3.2.1_01
+Version:       3.3
 Release:       1
 License:       Proprietary, not distributable
 Group:         Networking/Daemons/Java/Servlets
-# You can download it from:
-# http://www.atlassian.com/software/confluence/downloads/binary/confluence-%{version}.tar.gz
 Source0:       %{name}-%{version}.tar.gz
-# NoSource0-md5:       9914fb296bf201b2ffd78a62dadcedeb
+# NoSource0-md5:       a51451bd452774d011f1dd7bf94c6d51
 NoSource:      0
 Source1:       %{name}-context.xml
 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.
@@ -70,9 +79,10 @@ Polish rtanslation for Confluence.
 Polskie tłumaczenie Confluence.
 
 %prep
-%setup -q -n confluence-%{version}
+%setup -q
 
 cp %{SOURCE4} README.PLD
+cp %{SOURCE6} .
 
 %if %{with customized}
 mkdir work
@@ -142,7 +152,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -165,4 +175,5 @@ rm -rf $RPM_BUILD_ROOT
 %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