Author: pawelz Date: Thu Jun 4 17:54:43 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.0.0_01
- not tested!!!
- 2.10.3 saved on CONFLUENCE_2 branch
---- Files affected:
packages/confluence:
confluence.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: packages/confluence/confluence.spec
diff -u packages/confluence/confluence.spec:1.7
packages/confluence/confluence.spec:1.8
--- packages/confluence/confluence.spec:1.7 Tue May 26 12:08:52 2009
+++ packages/confluence/confluence.spec Thu Jun 4 19:54:38 2009
@@ -7,17 +7,21 @@
# 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: 2.10.3
-Release: 0.4
+Version: %{ver}.%{subver}
+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-2.10.3.tar.gz
-Source0: %{name}-%{version}.tar.gz
-# NoSource0-md5: 40e613c4be7cbc91613ef143275564d8
+#
http://www.atlassian.com/software/confluence/downloads/binary/confluence-%{pkgver}.tar.gz
+Source0: %{name}-%{pkgver}.tar.gz
+# NoSource0-md5: 34de311ef91764c3cb8833f503fe8497
NoSource: 0
Source1: %{name}-context.xml
Source2: %{name}-init.properties
@@ -58,7 +62,7 @@
Polskie tłumaczenie Confluence.
%prep
-%setup -q
+%setup -q -n confluence-%{pkgver}
cp %{SOURCE4} README.PLD
@@ -66,9 +70,9 @@
mkdir work
mkdir -p edit-webapp/WEB-INF/lib
cd work
-jar xf ../confluence/WEB-INF/lib/confluence-2.10.3.jar
+jar xf ../confluence/WEB-INF/lib/confluence-%{pkgver}.jar
patch -p1 < $RPM_SOURCE_DIR/confluence-customize.patch
-jar cf ../edit-webapp/WEB-INF/lib/confluence-2.10.3.jar *
+jar cf ../edit-webapp/WEB-INF/lib/confluence-%{pkgver}.jar *
%endif
%build
@@ -160,6 +164,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2009/06/04 17:54:38 pawelz
+- up to 3.0.0_01
+- not tested!!!
+- 2.10.3 saved on CONFLUENCE_2 branch
+
Revision 1.7 2009/05/26 10:08:52 pawelz
- bcond_customized (allow user to build confluence with customized templates)
- S: graphviz (needed for plugin graphviz)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/confluence/confluence.spec?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
