packages: confluence/confluence.spec - install license file, update license...

[pawelz]

Author: pawelz                       Date: Sat May 29 00:07:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install license file, update license note
- make list of files to download easier to copy-paste

---- Files affected:
packages/confluence:
   confluence.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/confluence/confluence.spec
diff -u packages/confluence/confluence.spec:1.18 packages/confluence/confluence.spec:1.19
--- packages/confluence/confluence.spec:1.18	Thu May 20 20:26:50 2010
+++ packages/confluence/confluence.spec	Sat May 29 02:07:05 2010
@@ -3,7 +3,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.
@@ -14,8 +13,15 @@
 #   * 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.
+
+%if 0
+# Download sources manually:
+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
+%endif
 
 # Conditional build
 %bcond_with	customized	# use patch for confluence-%{version}.jar
@@ -27,8 +33,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
 NoSource:	0
@@ -36,10 +40,12 @@
 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
 # 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
@@ -74,6 +80,7 @@
 %setup -q -n confluence-%{version}
 
 cp %{SOURCE4} README.PLD
+cp %{SOURCE6} .
 
 %if %{with customized}
 mkdir work
@@ -143,7 +150,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
@@ -174,6 +181,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2010/05/29 00:07:05  pawelz
+- install license file, update license note
+- make list of files to download easier to copy-paste
+
 Revision 1.18  2010/05/20 18:26:50  pawelz
 - TODO: convert to "-installer" type package?
 - NOTE about distributability
================================================================

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