[Jpackage-commits] rpms/free/apache-commons-beanutils apache-commons-beanutils.spec, 1.3, 1.4

jpackage jpackage at ryu.zarb.org
Thu Dec 9 11:05:54 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/apache-commons-beanutils
In directory ryu.zarb.org:/tmp/O1p5FJR3dd/rpms/free/apache-commons-beanutils

Modified Files:
	apache-commons-beanutils.spec 
Log Message:
1.8.3-4.jpp6

Index: apache-commons-beanutils.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/apache-commons-beanutils/apache-commons-beanutils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** apache-commons-beanutils.spec	7 Oct 2010 17:39:14 -0000	1.3
--- apache-commons-beanutils.spec	9 Dec 2010 10:05:52 -0000	1.4
***************
*** 49,53 ****
  Name:           apache-commons-beanutils
  Version:        1.8.3
! Release:        3%{?dist}
  Epoch:          0
  Summary:        Apache Commons BeanUtils Package
--- 49,53 ----
  Name:           apache-commons-beanutils
  Version:        1.8.3
! Release:        4%{?dist}
  Epoch:          0
  Summary:        Apache Commons BeanUtils Package
***************
*** 62,66 ****
  Source5:        commons-beanutils-core-1.8.3.pom
  
! BuildRequires:  jpackage-utils >= 0:5.0.0
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant >= 0:1.7
--- 62,66 ----
  Source5:        commons-beanutils-core-1.8.3.pom
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant >= 0:1.7
***************
*** 89,94 ****
  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-collections
--- 89,94 ----
  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-collections
***************
*** 191,201 ****
  install -m 644 dist/%{short_name}-bean-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-bean-collections-%{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)
  
  %add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
  %add_to_maven_depmap %{short_name} %{short_name}-core %{version} JPP %{short_name}-core
  %add_to_maven_depmap %{short_name} %{short_name}-bean-collections %{version} JPP %{short_name}-bean-collections
  
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
--- 191,216 ----
  install -m 644 dist/%{short_name}-bean-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-bean-collections-%{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
! ln -s %{name}-core-%{version}.jar %{buildroot}%{_javadir}/%{name}-core.jar
! ln -s %{name}-core-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-core-%{version}.jar
! ln -s %{name}-core-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-core.jar
! ln -s %{name}-core-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-core-%{version}.jar
! ln -s %{name}-core-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-core.jar
! ln -s %{name}-bean-collections-%{version}.jar %{buildroot}%{_javadir}/%{name}-bean-collections.jar
! ln -s %{name}-bean-collections-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-bean-collections-%{version}.jar
! ln -s %{name}-bean-collections-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-bean-collections.jar
! ln -s %{name}-bean-collections-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-bean-collections-%{version}.jar
! ln -s %{name}-bean-collections-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-bean-collections.jar
  
  %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}-core %{version} JPP %{short_name}-core
+ %add_to_maven_depmap org.apache.commons %{short_name}-core %{version} JPP %{short_name}-core
  %add_to_maven_depmap %{short_name} %{short_name}-bean-collections %{version} JPP %{short_name}-bean-collections
+ %add_to_maven_depmap org.apache.commons %{short_name}-bean-collections %{version} JPP %{short_name}-bean-collections
  
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
***************
*** 299,302 ****
--- 314,320 ----
  
  %changelog
+ * Thu Dec 09 2010 Ralph Apel <r.apel at r-apel.de> 0:1.8.3-4
+ - Fix compat symlinks for obsoleted jakarta-commons-beanutils
+ 
  * Thu Oct 07 2010 Ralph Apel <r.apel at r-apel.de> 0:1.8.3-3
  - Provide compat symlinks for obsoleted jakarta-commons-beanutils




More information about the JPackage-commits mailing list