Author: pawelz Date: Wed Mar 24 16:50:10 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 3.2 - minor refactoring of %install section
---- Files affected: packages/confluence: confluence.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: packages/confluence/confluence.spec diff -u packages/confluence/confluence.spec:1.14 packages/confluence/confluence.spec:1.15 --- packages/confluence/confluence.spec:1.14 Wed Mar 24 14:12:51 2010 +++ packages/confluence/confluence.spec Wed Mar 24 17:50:05 2010 @@ -10,14 +10,14 @@ %include /usr/lib/rpm/macros.java Summary: Confluence - Enterprise wiki Name: confluence -Version: 3.1 +Version: 3.2 Release: 1 License: Proprietary, not distributable Group: Networking/Daemons/Java/Servlets # You can download it from: # http://www.atlassian.com/software/confluence/downloads/binary/confluence-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz -# NoSource0-md5: 29b7e2e0c00f10ea18998797a3c91190 +# NoSource0-md5: ac3ff24ae9770353db48faa38ca15be0 NoSource: 0 Source1: %{name}-context.xml Source2: %{name}-init.properties @@ -88,16 +88,13 @@ ln -sf %{_sysconfdir}/%{name}/tomcat-context.xml $RPM_BUILD_ROOT%{_tomcatconfdir}/%{name}.xml install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/confluence-init.properties +ln -sf %{_sysconfdir}/%{name}/confluence-init.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/confluence-init.properties + install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/log4j.properties +ln -sf %{_sysconfdir}/%{name}/log4j.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/lib/confluence-pl_PL-plugin-1.0.jar -ln -s %{_sysconfdir}/%{name}/tomcat-context.xml $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/%{name}.xml - -ln -sf %{_sysconfdir}/%{name}/log4j.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties -ln -sf %{_sysconfdir}/%{name}/confluence-init.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/confluence-init.properties -ln -sf %{_sysconfdir}/%{name}/log4j.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.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 @@ -164,6 +161,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2010/03/24 16:50:05 pawelz +- up to 3.2 +- minor refactoring of %install section + Revision 1.14 2010/03/24 13:12:51 pawelz - use all these new cool tomcat-related rpm macros - BR: rpmbuild(macros) >= 1.546 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/confluence/confluence.spec?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
