packages: crowd/crowd.spec - skip dirty hack. It breaks crowd. It just won'...

[pawelz]

Author: pawelz                       Date: Sat May 29 15:38:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- skip dirty hack. It breaks crowd. It just won't work with confluence until
  Atlassian provides real solution.

---- Files affected:
packages/crowd:
   crowd.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/crowd/crowd.spec
diff -u packages/crowd/crowd.spec:1.4 packages/crowd/crowd.spec:1.5
--- packages/crowd/crowd.spec:1.4	Sat May 29 15:25:47 2010
+++ packages/crowd/crowd.spec	Sat May 29 17:38:12 2010
@@ -9,12 +9,16 @@
 #     installation each user has to download Crowd from atlassian web page.
 #
 # See Atlassian_EULA_3.0.pdf for more details.
+#
+# Don't install it on same tomcat with confluence. It will break confluence.
+# See http://confluence.atlassian.com/pages/viewpage.action?pageId=208962752
+# for details. This workaround wn't work, because feilx' version required by
+# confluence is to recent for crowd.
 
 %if 0
 # Download sources manually:
 wget -c http://downloads.atlassian.com/software/crowd/downloads/atlassian-crowd-2.0.4-war.zip
 wget -c http://www.atlassian.com/about/licensing/Atlassian_EULA_3.0.pdf
-wget -c http://repository.atlassian.com/org.apache.felix/jars/org.apache.felix.main-2.0.5.jar
 %endif
 
 %include	/usr/lib/rpm/macros.java
@@ -22,7 +26,7 @@
 Summary:	SSO server
 Name:		crowd
 Version:	2.0.4
-Release:	0.1
+Release:	1
 License:	Proprietary, not distributable
 Group:		Networking/Daemons/Java/Servlets
 Source0:	atlassian-%{name}-%{version}-war.zip
@@ -33,9 +37,6 @@
 NoSource:	1
 Source2:	tomcat-context.xml
 Source3:	%{name}-init.properties
-Source4:	org.apache.felix.main-2.0.5.jar
-# NoSource4-md5:	edfbdb9fd59aeb21022391e2934f75c0
-NoSource:	4
 URL:		http://www.atlassian.com/software/crowd/default.jsp
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
@@ -59,10 +60,6 @@
 
 cp %{SOURCE1} .
 
-# http://confluence.atlassian.com/pages/viewpage.action?pageId=208962752
-find -name 'org.apache.felix.main*.jar' | xargs rm
-cp %{SOURCE4} WEB-INF/lib
-
 # TODO set paths for logs
 # sed -i 's,^\(log4j\.appender\.[a-z]*\.File\)=\(.*\)$,\1=/var/log/crowd/\2,' webapp/WEB-INF/classes/log4j.properties
 
@@ -106,6 +103,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/05/29 15:38:12  pawelz
+- skip dirty hack. It breaks crowd. It just won't work with confluence until
+  Atlassian provides real solution.
+
 Revision 1.4  2010/05/29 13:25:47  pawelz
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crowd/crowd.spec?r1=1.4&r2=1.5&f=u