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

jpackage jpackage at ryu.zarb.org
Thu Dec 9 09:35:16 CET 2010


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

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

Index: apache-commons-collections.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-commons-collections/JPP-6/apache-commons-collections.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** apache-commons-collections.spec	7 Oct 2010 21:42:23 -0000	1.3
--- apache-commons-collections.spec	9 Dec 2010 08:35:13 -0000	1.4
***************
*** 54,58 ****
  Name:           apache-%{short_name}
  Version:        3.2.1
! Release:        4%{?dist}
  Epoch:          0
  Summary:        Apache Commons Collections Package
--- 54,58 ----
  Name:           apache-%{short_name}
  Version:        3.2.1
! Release:        5%{?dist}
  Epoch:          0
  Summary:        Apache Commons Collections Package
***************
*** 67,71 ****
  Patch0:         %{name}-javadoc-nonet.patch
  
! BuildRequires:  jpackage-utils >= 0:5.0.0
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant >= 0:1.7
--- 67,71 ----
  Patch0:         %{name}-javadoc-nonet.patch
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant >= 0:1.7
***************
*** 91,96 ****
  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
  BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
--- 91,96 ----
  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
  BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
***************
*** 259,267 ****
  
  %add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
  %add_to_maven_depmap %{short_name} %{short_name}-testframework %{version} JPP %{short_name}-testframework
  
- (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
--- 259,282 ----
  
  %add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
+ %add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
  %add_to_maven_depmap %{short_name} %{short_name}-testframework %{version} JPP %{short_name}-testframework
+ %add_to_maven_depmap org.apache.commons %{short_name}-testframework %{version} JPP %{short_name}-testframework
+ 
+ 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}-testframework-%{version}.jar %{buildroot}%{_javadir}/%{name}-testframework.jar
+ ln -s %{name}-testframework-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-testframework-%{version}.jar
+ ln -s %{name}-testframework-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-testframework.jar
+ ln -s %{name}-testframework-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-testframework-%{version}.jar
+ ln -s %{name}-testframework-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-testframework.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
  
  
  # pom
***************
*** 432,435 ****
--- 447,453 ----
  
  %changelog
+ * Thu Dec 09 2010 Ralph Apel <r.apel at r-apel.de> 0:3.2.1-5
+ - Fix compat symlinks for jakarta-commons-collections
+ 
  * Thu Oct 07 2010 Ralph Apel <r.apel at r-apel.de> 0:3.2.1-4
  - Provide compat symlinks for jakarta-commons-collections




More information about the JPackage-commits mailing list