[Jpackage-commits] dist/apache-commons-codec/JPP-6 apache-commons-codec.spec, 1.4, 1.5

jpackage jpackage at ryu.zarb.org
Thu Dec 9 09:53:52 CET 2010


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

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

Index: apache-commons-codec.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-commons-codec/JPP-6/apache-commons-codec.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** apache-commons-codec.spec	7 Oct 2010 21:08:19 -0000	1.4
--- apache-commons-codec.spec	9 Dec 2010 08:53:50 -0000	1.5
***************
*** 55,59 ****
  Name:           apache-commons-codec
  Version:        1.4
! Release:        4%{?dist}
  Summary:        Apache Commons Codec Package
  License:        Apache Software License 2.0
--- 55,59 ----
  Name:           apache-commons-codec
  Version:        1.4
! Release:        5%{?dist}
  Summary:        Apache Commons Codec Package
  License:        Apache Software License 2.0
***************
*** 65,69 ****
  Source2:        %{name}-jpp-depmap.xml
  Source3:        %{name}-component-info.xml
! BuildRequires:  jpackage-utils >= 0:5.0.0
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant >= 0:1.7
--- 65,69 ----
  Source2:        %{name}-jpp-depmap.xml
  Source3:        %{name}-component-info.xml
! BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant >= 0:1.7
***************
*** 85,88 ****
--- 85,91 ----
  BuildRequires:  maven2-plugin-resources
  %endif
+ Requires(post): jpackage-utils >= 0:1.7.5
+ Requires(postun): jpackage-utils >= 0:1.7.5
+ 
  %if ! %{gcj_support}
  BuildArch:      noarch
***************
*** 187,193 ****
  cp -p dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %endif
! (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
--- 190,198 ----
  cp -p dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %endif
! 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
***************
*** 195,198 ****
--- 200,204 ----
  cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-apache-commons-codec.pom
  %add_to_maven_depmap commons-codec commons-codec %{version} JPP apache-commons-codec
+ %add_to_maven_depmap org.apache.commons commons-codec %{version} JPP apache-commons-codec
  
  # javadoc
***************
*** 268,271 ****
--- 274,280 ----
  
  %changelog
+ * Thu Dec 09 2010 Ralph Apel <r.apel at r-apel.de> 0:1.4-5
+ - Fix compat symlinks for jakarta-commons-codec
+ 
  * Thu Oct 07 2010 Ralph Apel <r.apel at r-apel.de> 0:1.4-4
  - Provide compat symlinks for jakarta-commons-codec




More information about the JPackage-commits mailing list