[Jpackage-commits] dist/apache-commons-cli/JPP-6 apache-commons-cli.spec, 1.5, 1.6

jpackage jpackage at ryu.zarb.org
Thu Dec 9 10:10:28 CET 2010


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

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

Index: apache-commons-cli.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-commons-cli/JPP-6/apache-commons-cli.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** apache-commons-cli.spec	7 Oct 2010 19:29:22 -0000	1.5
--- apache-commons-cli.spec	9 Dec 2010 09:10:26 -0000	1.6
***************
*** 55,59 ****
  Name:           apache-commons-cli
  Version:        1.2
! Release:        5%{?dist}
  Epoch:          0
  Summary:        Apache Commons CLI, a Command Line Interface for Java
--- 55,59 ----
  Name:           apache-commons-cli
  Version:        1.2
! Release:        6%{?dist}
  Epoch:          0
  Summary:        Apache Commons CLI, a Command Line Interface for Java
***************
*** 194,200 ****
  mkdir -p $RPM_BUILD_ROOT%{_javadir}
  cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{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)
  
  # Install pom file
--- 194,202 ----
  mkdir -p $RPM_BUILD_ROOT%{_javadir}
  cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{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
  
  # Install pom file
***************
*** 202,205 ****
--- 204,208 ----
  cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-apache-commons-cli.pom
  %add_to_maven_depmap commons-cli commons-cli %{version} JPP apache-commons-cli
+ %add_to_maven_depmap org.apache.commons commons-cli %{version} JPP apache-commons-cli
  
  # javadoc
***************
*** 251,254 ****
--- 254,260 ----
  
  %changelog
+ * Thu Dec 09 2010 Ralph Apel <r.apel at r-apel.de> - 0:1.2-6
+ - Fix compat symlinks for jakarta-commons-cli
+ 
  * Thu Oct 07 2010 Ralph Apel <r.apel at r-apel.de> - 0:1.2-5
  - Provide compat symlinks for jakarta-commons-cli




More information about the JPackage-commits mailing list