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

jpackage jpackage at ryu.zarb.org
Thu Dec 9 09:13:02 CET 2010


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

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

Index: apache-commons-dbcp.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-commons-dbcp/JPP-6/apache-commons-dbcp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** apache-commons-dbcp.spec	8 Oct 2010 07:37:04 -0000	1.3
--- apache-commons-dbcp.spec	9 Dec 2010 08:12:59 -0000	1.4
***************
*** 55,59 ****
  Name:           apache-commons-dbcp
  Version:        1.3.0
! Release:        0.r830852.4%{?dist}
  Epoch:          0
  Summary:        Apache Commons DataBase Pooling Package
--- 55,59 ----
  Name:           apache-commons-dbcp
  Version:        1.3.0
! Release:        0.r830852.5%{?dist}
  Epoch:          0
  Summary:        Apache Commons DataBase Pooling Package
***************
*** 69,73 ****
  Patch0:         apache-commons-dbcp-pom.patch
  
! BuildRequires:  jpackage-utils >= 0:5.0.0
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant >= 0:1.7
--- 69,73 ----
  Patch0:         apache-commons-dbcp-pom.patch
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant >= 0:1.7
***************
*** 99,104 ****
  Requires(post):  /usr/sbin/update-alternatives
  Requires(preun):  /usr/sbin/update-alternatives
! Requires(post):    jpackage-utils >= 0:5.0.0
! Requires(postun):  jpackage-utils >= 0:5.0.0
  Requires:       java >= 0:1.6.0
  Requires:       apache-commons-collections
--- 99,104 ----
  Requires(post):  /usr/sbin/update-alternatives
  Requires(preun):  /usr/sbin/update-alternatives
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  Requires:       java >= 0:1.6.0
  Requires:       apache-commons-collections
***************
*** 258,264 ****
  install -m 644 dbcp-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
--- 258,272 ----
  install -m 644 dbcp-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
***************
*** 291,294 ****
--- 299,303 ----
  cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-apache-commons-dbcp.pom
  %add_to_maven_depmap commons-dbcp commons-dbcp %{version} JPP apache-commons-dbcp
+ %add_to_maven_depmap org.apache.commons commons-dbcp %{version} JPP apache-commons-dbcp
  
  %if %{gcj_support}
***************
*** 399,402 ****
--- 408,414 ----
  
  %changelog
+ * Thu Dec 09 2010 Ralph Apel <r.apel at r-apel.de> - 0:1.3.0-0.r830852.5
+ - Fix compat symlinks for jakarta-commons-dbcp
+ 
  * Fri Oct 08 2010 Ralph Apel <r.apel at r-apel.de> - 0:1.3.0-0.r830852.4
  - Provide compat symlinks for jakarta-commons-dbcp




More information about the JPackage-commits mailing list