Author: pawelz Date: Tue May 26 10:08:57 2009 GMT Module: packages Tag: HEAD ---- Log message: - bcond_customized (allow user to build confluence with customized templates) - S: graphviz (needed for plugin graphviz) - TODO: more language packs - rel 0.4
---- Files affected: packages/confluence: confluence.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: packages/confluence/confluence.spec diff -u packages/confluence/confluence.spec:1.6 packages/confluence/confluence.spec:1.7 --- packages/confluence/confluence.spec:1.6 Mon May 25 11:10:29 2009 +++ packages/confluence/confluence.spec Tue May 26 12:08:52 2009 @@ -1,11 +1,17 @@ # $Revision$, $Date$ # TODO: # - ask atlassian for permission to redistribute it. +# - install more language packs from +# http://confluence.atlassian.com/display/DISC/Language+Pack+Translations + +# Conditional build +%bcond_with customized # use patch for confluence-%{version}.jar + %include /usr/lib/rpm/macros.java Summary: Confluence - Enterprise wiki Name: confluence Version: 2.10.3 -Release: 0.3 +Release: 0.4 License: Proprietary, not distributable Group: Networking/Daemons/Java/Servlets # You can download it from: @@ -22,11 +28,13 @@ # NoSource5-md5: b8d219e791a536fd98b1a717747e55bc NoSource: 5 URL: http://www.atlassian.com/software/confluence/ +%{?with_customized:BuildRequires: jar} BuildRequires: jpackage-utils BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 Requires: jpackage-utils Requires: tomcat +Suggests: graphviz BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -54,6 +62,15 @@ cp %{SOURCE4} README.PLD +%if %{with customized} +mkdir work +mkdir -p edit-webapp/WEB-INF/lib +cd work +jar xf ../confluence/WEB-INF/lib/confluence-2.10.3.jar +patch -p1 < $RPM_SOURCE_DIR/confluence-customize.patch +jar cf ../edit-webapp/WEB-INF/lib/confluence-2.10.3.jar * +%endif + %build CLASSPATH=$(build-classpath-directory lib/endorsed) %ant @@ -143,6 +160,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +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) +- TODO: more language packs +- rel 0.4 + Revision 1.6 2009/05/25 09:10:29 pawelz - lang-pl subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/confluence/confluence.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
