packages: confluence/confluence.spec - up to 3.0.2

[pawelz]

Author: pawelz                       Date: Mon Nov  9 07:24:05 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.0.2

---- Files affected:
packages/confluence:
   confluence.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/confluence/confluence.spec
diff -u packages/confluence/confluence.spec:1.9 packages/confluence/confluence.spec:1.10
--- packages/confluence/confluence.spec:1.9	Mon Jun  8 11:30:56 2009
+++ packages/confluence/confluence.spec	Mon Nov  9 08:23:55 2009
@@ -7,21 +7,17 @@
 # Conditional build
 %bcond_with	customized	# use patch for confluence-%{version}.jar
 
-%define		ver	3.0.0
-%define		subver	01
-%define		pkgver	%{ver}_%{subver}
-
 %include	/usr/lib/rpm/macros.java
 Summary:	Confluence - Enterprise wiki
 Name:		confluence
-Version:	%{ver}.%{subver}
+Version:	3.0.2
 Release:	0.1
 License:	Proprietary, not distributable
 Group:		Networking/Daemons/Java/Servlets
 # You can download it from:
-# http://www.atlassian.com/software/confluence/downloads/binary/confluence-%{pkgver}.tar.gz
-Source0:	%{name}-%{pkgver}.tar.gz
-# NoSource0-md5:	34de311ef91764c3cb8833f503fe8497
+# http://www.atlassian.com/software/confluence/downloads/binary/confluence-%{version}.tar.gz
+Source0:	%{name}-%{version}.tar.gz
+# NoSource0-md5:	954b71929bbd44a970cd2013f2b7c19a
 NoSource:	0
 Source1:	%{name}-context.xml
 Source2:	%{name}-init.properties
@@ -62,7 +58,7 @@
 Polskie tłumaczenie Confluence.
 
 %prep
-%setup -q -n confluence-%{pkgver}
+%setup -q -n confluence-%{version}
 
 cp %{SOURCE4} README.PLD
 
@@ -70,9 +66,9 @@
 mkdir work
 mkdir -p edit-webapp/WEB-INF/lib
 cd work
-jar xf ../confluence/WEB-INF/lib/confluence-%{pkgver}.jar
+jar xf ../confluence/WEB-INF/lib/confluence-%{version}.jar
 patch -p1 < $RPM_SOURCE_DIR/confluence-customize.patch
-jar cf ../edit-webapp/WEB-INF/lib/confluence-%{pkgver}.jar *
+jar cf ../edit-webapp/WEB-INF/lib/confluence-%{version}.jar *
 %endif
 
 %build
@@ -164,6 +160,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2009/11/09 07:23:55  pawelz
+- up to 3.0.2
+
 Revision 1.9  2009/06/08 09:30:56  pawelz
 - tomcat-context.xml is config file
 - confluence config files may contain passwords (to *SQL, LDAP etc),
================================================================

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