[Jpackage-commits] dist/apache-commons-pool/JPP-6 apache-commons-pool.spec, 1.3, 1.4

jpackage jpackage at ryu.zarb.org
Wed Dec 8 23:26:00 CET 2010


Update of /home/projects/jpackage/cvs/dist/apache-commons-pool/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv25415

Modified Files:
	apache-commons-pool.spec 
Log Message:
Fix jakarta compat symlinks

Index: apache-commons-pool.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-commons-pool/JPP-6/apache-commons-pool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** apache-commons-pool.spec	10 Oct 2010 08:44:07 -0000	1.3
--- apache-commons-pool.spec	8 Dec 2010 22:25:58 -0000	1.4
***************
*** 55,59 ****
  Name:           apache-commons-pool
  Version:        1.5.3
! Release:        5%{?dist}
  Epoch:          0
  Summary:        Apache Commons Pool Package
--- 55,59 ----
  Name:           apache-commons-pool
  Version:        1.5.3
! Release:        6%{?dist}
  Epoch:          0
  Summary:        Apache Commons Pool Package
***************
*** 220,226 ****
  install -m 644 pool-tomcat5/%{short_name}-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar
  
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|apache-|jakarta-|g"`; done)
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
--- 220,235 ----
  install -m 644 pool-tomcat5/%{short_name}-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar
  
! 
! ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
! ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
! ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}.jar
! ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-%{version}.jar
! ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}.jar
! ln -s %{name}-tomcat5-%{version}.jar %{buildroot}%{_javadir}/%{name}-tomcat5.jar
! ln -s %{name}-tomcat5-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-tomcat5-%{version}.jar
! ln -s %{name}-tomcat5-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-tomcat5.jar
! ln -s %{name}-tomcat5-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-tomcat5-%{version}.jar
! ln -s %{name}-tomcat5-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-tomcat5.jar
! 
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
***************
*** 344,347 ****
--- 353,359 ----
  
  %changelog
+ * Wed Dec 08 2010 Ralph Apel <r.apel at r-apel.de> 0:1.5.3-6
+ - Fix compat symlinks for jakarta-commons-pool
+ 
  * Sun Oct 10 2010 Ralph Apel <r.apel at r-apel.de> 0:1.5.3-5
  - Provide compat symlinks for jakarta-commons-pool




More information about the JPackage-commits mailing list