X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=confluence.spec;h=04b736fc2726307d2eff6abdbef00b871d8bd78e;hb=f15aa27058c74d43a201bf87f034a480f9532321;hp=01b3660e7d9c89f43ffb699cf21e45a3147dc786;hpb=9d3f794f415aa4987a0062d84a75deff20c840d6;p=packages%2Fconfluence.git

diff --git a/confluence.spec b/confluence.spec
index 01b3660..04b736f 100644
--- 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 on the 4th January 2011
+
+%if 0
+# Download sources manually:
+wget -c http://www.atlassian.com/software/confluence/downloads/binary/confluence-3.4.6.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.4.6
 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:	062714800d8312cdd2aad7d305204654
 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
@@ -160,9 +170,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/confluence
 %exclude %{_datadir}/confluence/WEB-INF/lib/confluence-pl_PL-plugin-1.0.jar
 
-%{_tomcatconfdir}/%{name}.xml
+%config(missingok) %{_tomcatconfdir}/%{name}.xml
 %attr(2775,root,servlet) %dir %{_sharedstatedir}/confluence
 %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