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

jpackage jpackage at ryu.zarb.org
Thu Dec 9 09:08:07 CET 2010


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

Modified Files:
	apache-commons-digester.spec 
Log Message:
1.8.1-11.jpp6

Index: apache-commons-digester.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/apache-commons-digester/apache-commons-digester.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** apache-commons-digester.spec	9 Oct 2010 06:41:48 -0000	1.3
--- apache-commons-digester.spec	9 Dec 2010 08:08:05 -0000	1.4
***************
*** 49,53 ****
  Name:           apache-%{short_name}
  Version:        1.8.1
! Release:        10%{?dist}
  Epoch:          0
  Summary:        Apache Commons Digester
--- 49,53 ----
  Name:           apache-%{short_name}
  Version:        1.8.1
! Release:        11%{?dist}
  Epoch:          0
  Summary:        Apache Commons Digester
***************
*** 60,64 ****
  Source3:        %{name}-component-info.xml
  Patch0:         apache-commons-digester-pom.patch
! BuildRequires:  jpackage-utils >= 0:5.0.0
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant >= 0:1.7
--- 60,64 ----
  Source3:        %{name}-component-info.xml
  Patch0:         apache-commons-digester-pom.patch
! BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant >= 0:1.7
***************
*** 86,91 ****
  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-beanutils
--- 86,91 ----
  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-beanutils
***************
*** 199,207 ****
  %endif
  cp -p src/examples/rss/dist/%{short_name}-rss.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-rss-%{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)
  
  %add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
  
  # pom
--- 199,215 ----
  %endif
  cp -p src/examples/rss/dist/%{short_name}-rss.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-rss-%{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
! ln -s %{name}-rss-%{version}.jar %{buildroot}%{_javadir}/%{name}-rss.jar
! ln -s %{name}-rss-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-rss-%{version}.jar
! ln -s %{name}-rss-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-rss.jar
! ln -s %{name}-rss-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-rss-%{version}.jar
! ln -s %{name}-rss-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-rss.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}
  
  # pom
***************
*** 284,287 ****
--- 292,298 ----
  
  %changelog
+ * Thu Dec 09 2010 Ralph Apel <r.apel at r-apel.de> 0:1.8.1-11
+ - Fix compat symlinks for jakarta-commons-digester
+ 
  * Sat Oct 08 2010 Ralph Apel <r.apel at r-apel.de> 0:1.8.1-10
  - Provide compat symlinks for jakarta-commons-digester




More information about the JPackage-commits mailing list