Author: pawelz Date: Tue Sep 7 14:47:15 2010 GMT Module: packages Tag: HEAD ---- Log message: - use webxml.patch instead of installing own version of web.xml.
---- Files affected: packages/hudson: hudson.spec (1.31 -> 1.32) ---- Diffs: ================================================================ Index: packages/hudson/hudson.spec diff -u packages/hudson/hudson.spec:1.31 packages/hudson/hudson.spec:1.32 --- packages/hudson/hudson.spec:1.31 Tue Aug 31 15:59:05 2010 +++ packages/hudson/hudson.spec Tue Sep 7 16:47:10 2010 @@ -13,8 +13,8 @@ # Check for new releases and URLs here: https://hudson.dev.java.net/servlets/ProjectRSS?type=news Source0: http://hudson-ci.org/download/war/%{version}/%{name}.war#/%{name}-%{version}.war # Source0-md5: bad0b1d81919618677f84e462373f2dc -Source1: %{name}-web.xml -Source2: %{name}-context.xml +Source1: %{name}-context.xml +Patch0: %{name}-webxml.patch URL: https://hudson.dev.java.net/ BuildRequires: jpackage-utils BuildRequires: rpm-javaprov @@ -48,11 +48,13 @@ rm *.class rm winstone.jar +%patch0 -p1 + %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_datadir}/%{name},%{_sharedstatedir}/%{name},%{_tomcatconfdir}} -cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.xml -cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml +mv WEB-INF/web.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.xml +cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml ln -sf %{_sysconfdir}/%{name}/tomcat-context.xml $RPM_BUILD_ROOT%{_tomcatconfdir}/%{name}.xml cp -a . $RPM_BUILD_ROOT%{_datadir}/%{name} ln -sf %{_sysconfdir}/%{name}/web.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/web.xml @@ -77,6 +79,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.32 2010/09/07 14:47:10 pawelz +- use webxml.patch instead of installing own version of web.xml. + Revision 1.31 2010/08/31 13:59:05 pawelz - up to 1.374 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hudson/hudson.spec?r1=1.31&r2=1.32&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
