Author: pawelz Date: Fri May 22 16:34:55 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- customized log4j.properties
- mark more files as config
- use %{name} macro in paths
---- Files affected:
packages/confluence:
confluence.spec (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/confluence/confluence.spec
diff -u packages/confluence/confluence.spec:1.1
packages/confluence/confluence.spec:1.2
--- packages/confluence/confluence.spec:1.1 Fri May 22 17:22:55 2009
+++ packages/confluence/confluence.spec Fri May 22 18:34:50 2009
@@ -15,7 +15,8 @@
NoSource: 0
Source1: %{name}-context.xml
Source2: %{name}-init.properties
-Source3: %{name}-README.PLD
+Source3: %{name}-log4j.properties
+Source4: %{name}-README.PLD
URL: http://www.atlassian.com/software/confluence/
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
@@ -36,7 +37,7 @@
%prep
%setup -q
-cp %{SOURCE3} README.PLD
+cp %{SOURCE4} README.PLD
%build
CLASSPATH=$(build-classpath-directory lib/endorsed)
@@ -47,22 +48,33 @@
install -d $RPM_BUILD_ROOT{%{_datadir},/var/log/%{name}}
install -d $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
cp -a tmp/build/war $RPM_BUILD_ROOT%{_datadir}/%{name}
-install %{SOURCE2}
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/confluence-init.properties
# configuration
-install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/confluence,%{_sharedstatedir}/tomcat/conf/Catalina/localhost}
+install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_sharedstatedir}/tomcat/conf/Catalina/localhost}
+
install %{SOURCE1}
$RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/confluence.xml
+install %{SOURCE2}
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/confluence-init.properties
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/log4j.properties
+
+ln -s %{_sharedstatedir}/tomcat/conf/Catalina/localhost/%{name}.xml
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
+
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
+ln -s %{_sysconfdir}/%{name}/log4j.properties
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
-ln -s %{_sharedstatedir}/tomcat/conf/Catalina/localhost/confluence.xml
$RPM_BUILD_ROOT%{_sysconfdir}/confluence/tomcat-context.xml
+rm
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/confluence-init.properties
+ln -s %{_sysconfdir}/%{name}/confluence-init.properties
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/confluence-init.properties
-mv $RPM_BUILD_ROOT%{_datadir}/confluence/WEB-INF/classes/log4j.properties
$RPM_BUILD_ROOT%{_sysconfdir}/confluence/log4j.properties
-ln -s %{_sysconfdir}/confluence/log4j.properties
$RPM_BUILD_ROOT%{_datadir}/confluence/WEB-INF/classes/log4j.properties
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
+ln -s %{_sysconfdir}/%{name}/log4j.properties
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
-mv
$RPM_BUILD_ROOT%{_datadir}/confluence/WEB-INF/classes/confluence-init.properties
$RPM_BUILD_ROOT%{_sysconfdir}/confluence/confluence-init.properties
-ln -s %{_sysconfdir}/confluence/confluence-init.properties
$RPM_BUILD_ROOT%{_datadir}/confluence/WEB-INF/classes/confluence-init.properties
+mv
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j-diagnostic.properties
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/log4j-diagnostic.properties
+ln -s %{_sysconfdir}/%{name}/log4j-diagnostic.properties
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j-diagnostic
-mv $RPM_BUILD_ROOT%{_datadir}/confluence/WEB-INF/classes/atlassian-user.xml
$RPM_BUILD_ROOT%{_sysconfdir}/confluence/atlassian-user.xml
-ln -s %{_sysconfdir}/confluence/atlassian-user.xml
$RPM_BUILD_ROOT%{_datadir}/confluence/WEB-INF/classes/atlassian-user.xml
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/osuser.xml
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/osuser.xml
+ln -s %{_sysconfdir}/%{name}/osuser.xml
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/osuser.xml
+
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/atlassian-user.xml
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/atlassian-user.xml
+ln -s %{_sysconfdir}/%{name}/atlassian-user.xml
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/atlassian-user.xml
%clean
rm -rf $RPM_BUILD_ROOT
@@ -73,14 +85,16 @@
# undeploy this app via tomcat manager.
%{_datadir}/confluence
%dir %{_sysconfdir}/confluence
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/confluence/log4j.properties
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/confluence/confluence-init.properties
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/confluence/atlassian-user.xml
-%{_sysconfdir}/confluence/tomcat-context.xml
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/log4j.properties
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/log4j-diagnostic.properties
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/confluence-init.properties
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/atlassian-user.xml
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/osuser.xml
+%{_sysconfdir}/%{name}/tomcat-context.xml
%config(noreplace) %verify(not md5 mtime size) %attr(2775,root,tomcat)
%{_sharedstatedir}/tomcat/conf/Catalina/localhost/confluence.xml
%attr(2775,root,servlet) %dir %{_sharedstatedir}/confluence
%attr(2775,root,servlet) %dir /var/log/confluence
-%doc README.PLD
+%doc README.PLD licenses
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -88,6 +102,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2009/05/22 16:34:50 pawelz
+- customized log4j.properties
+- mark more files as config
+- use %{name} macro in paths
+
Revision 1.1 2009/05/22 15:22:55 pawelz
- confluence enterprise wiki
- initial PLD release
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/confluence/confluence.spec?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
