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

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


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

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

Index: apache-commons-el.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-commons-el/JPP-6/apache-commons-el.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** apache-commons-el.spec	9 Oct 2010 07:07:31 -0000	1.3
--- apache-commons-el.spec	9 Dec 2010 07:46:07 -0000	1.4
***************
*** 55,59 ****
  Name:           apache-commons-el
  Version:        1.0.1
! Release:        0.r936225.3%{?dist}
  Epoch:          0
  Summary:        Apache Commons Extension Language
--- 55,59 ----
  Name:           apache-commons-el
  Version:        1.0.1
! Release:        0.r936225.4%{?dist}
  Epoch:          0
  Summary:        Apache Commons Extension Language
***************
*** 66,70 ****
  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
--- 66,70 ----
  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
***************
*** 92,97 ****
  BuildArch:      noarch
  %endif
! 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-logging
--- 92,97 ----
  BuildArch:      noarch
  %endif
! 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-logging
***************
*** 195,201 ****
  cp -p dist/%{short_name}.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)
  
  # pom
--- 195,203 ----
  cp -p dist/%{short_name}.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
  
  # pom
***************
*** 203,206 ****
--- 205,209 ----
  install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap commons-el commons-el %{version} JPP %{name}
+ %add_to_maven_depmap org.apache.commons commons-el %{version} JPP %{name}
  
  # javadoc
***************
*** 280,283 ****
--- 283,289 ----
  
  %changelog
+ * Thu Dec 09 2010 Ralph Apel <r.apel at r-apel.de> 0:1.0.1-0.r936225.4
+ - Fix compat symlinks for jakarta-commons-el
+ 
  * Sat Oct 09 2010 Ralph Apel <r.apel at r-apel.de> 0:1.0.1-0.r936225.3
  - Provide compat symlinks for jakarta-commons-el




More information about the JPackage-commits mailing list