- install license file, update license note

- make list of files to download easier to copy-paste

Changed files:
    confluence.spec -> 1.19

diff --git a/confluence.spec b/confluence.spec
index 01b3660e7d9c89f43ffb699cf21e45a3147dc786..aba8cb322cc4e23fb78134309209ecaea8c07b68 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,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
@@ -26,8 +32,6 @@ Version:      3.2.1_01
 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
@@ -35,10 +39,12 @@ 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
 # 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
@@ -73,6 +79,7 @@ Polskie tłumaczenie Confluence.
 %setup -q -n confluence-%{version}
 
 cp %{SOURCE4} README.PLD
+cp %{SOURCE6} .
 
 %if %{with customized}
 mkdir work
@@ -142,7 +149,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