[Jpackage-commits] dist/jetty6/JPP-6 jetty6.spec,1.13,1.14

David Walluck david at ryu.zarb.org
Sat Feb 28 01:41:23 CET 2009


Update of /home/projects/jpackage/cvs/dist/jetty6/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv32516

Modified Files:
	jetty6.spec 
Log Message:
- fix %%define in comment
- don't %%ghost javadoc


Index: jetty6.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jetty6/JPP-6/jetty6.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** jetty6.spec	9 Feb 2009 07:36:42 -0000	1.13
--- jetty6.spec	28 Feb 2009 00:41:21 -0000	1.14
***************
*** 45,50 ****
  %define libdir %{_javadir}/jetty6
  %define logdir %{_localstatedir}/log/jetty6
! #%define tempdir %{_localstatedir}/tmp/jetty6
! #%define workdir %{_localstatedir}/cache/jetty6
  
  
--- 45,50 ----
  %define libdir %{_javadir}/jetty6
  %define logdir %{_localstatedir}/log/jetty6
! #%%define tempdir %{_localstatedir}/tmp/jetty6
! #%%define workdir %{_localstatedir}/cache/jetty6
  
  
***************
*** 52,56 ****
  Name:           jetty6
  Version:        6.1.7
! Release:        5%{dist}
  Epoch:          0
  Summary:        The Jetty Webserver and Servlet Container
--- 52,56 ----
  Name:           jetty6
  Version:        6.1.7
! Release:        6%{dist}
  Epoch:          0
  Summary:        The Jetty Webserver and Servlet Container
***************
*** 795,799 ****
  install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  
--- 795,799 ----
  install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  
***************
*** 1100,1105 ****
  %files javadoc
  %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  %doc *.txt
  %doc LICENSES/LICENSE.txt
--- 1100,1105 ----
  %files javadoc
  %defattr(-,root,root,-)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  %doc *.txt
  %doc LICENSES/LICENSE.txt
***************
*** 1108,1111 ****
--- 1108,1115 ----
  
  %changelog
+ * Fri Feb 27 2009 David Walluck <dwalluck at redhat.com> 0:6.1.7-6
+ - fix %%define in comment
+ - don't %%ghost javadoc
+ 
  * Mon Feb 09 2009 Ralph Apel <r.apel at r-apel.de> - 0:6.1.7-5.jpp5
  - BR newest qdox again




More information about the JPackage-commits mailing list