[Jpackage-commits] rpms/free/saxon saxon-6.5.5.pom, NONE, 1.1 saxon-aelfred-6.5.5.pom, NONE, 1.1 saxon-jdom-6.5.5.pom, NONE, 1.1 saxon.spec, 1.9, 1.10

jpackage jpackage at ryu.zarb.org
Sat Dec 18 18:35:38 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/saxon
In directory ryu.zarb.org:/tmp/gf1tthVtZO/rpms/free/saxon

Modified Files:
	saxon.spec 
Added Files:
	saxon-6.5.5.pom saxon-aelfred-6.5.5.pom saxon-jdom-6.5.5.pom 
Log Message:
6.5.5-3.jpp6

Index: saxon.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/saxon/saxon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** saxon.spec	22 Jun 2008 13:16:57 -0000	1.9
--- saxon.spec	18 Dec 2010 17:35:36 -0000	1.10
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 34,38 ****
  Name:           saxon
  Version:        6.5.5
! Release:        1%{?dist}
  Epoch:          0
  License:        MPL
--- 34,38 ----
  Name:           saxon
  Version:        6.5.5
! Release:        3%{?dist}
  Epoch:          0
  License:        MPL
***************
*** 43,59 ****
  Source2:        %{name}.build.script
  Source3:        %{name}.1
! BuildRequires:  jpackage-utils >= 0:1.6
! BuildRequires:  xml-commons-apis
! BuildRequires:  jdom >= 0:1.0
  BuildRequires:  ant
! Requires:       xml-commons-apis
! Requires:       jpackage-utils >= 0:1.6
! Requires:       jdom >= 0:1.0
  
! Requires:       jaxp_parser_impl
  Requires:       /usr/sbin/update-alternatives
  Provides:       jaxp_transform_impl
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %description
--- 43,64 ----
  Source2:        %{name}.build.script
  Source3:        %{name}.1
! Source4:        %{name}-%{version}.pom
! Source5:        %{name}-aelfred-%{version}.pom
! Source6:        %{name}-jdom-%{version}.pom
! 
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  jdom >= 0:1.1
  BuildRequires:  ant
! Requires:       jpackage-utils >= 0:1.7.5
! Requires:       jdom >= 0:1.1
  
! Requires:       java >= 0:1.6.0
  Requires:       /usr/sbin/update-alternatives
  Provides:       jaxp_transform_impl
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ Requires(post):    jpackage-utils >= 0:1.7.3
+ Requires(postun):  jpackage-utils >= 0:1.7.3
  
  %description
***************
*** 78,82 ****
  Summary:        Java XML parser
  Group:          Text Processing/Markup/XML
- Requires:       xml-commons-apis
  
  %description    aelfred
--- 83,86 ----
***************
*** 88,92 ****
  
  %description    manual
! Manual for %{name}.
  
  %package        javadoc
--- 92,96 ----
  
  %description    manual
! %{summary}.
  
  %package        javadoc
***************
*** 94,103 ****
  Group:          Documentation
  BuildRequires:  java-javadoc
! BuildRequires:  jdom-javadoc >= 0:1.0
  Requires:       java-javadoc
! Requires:       jdom-javadoc >= 0:1.0
  
  %description    javadoc
! Javadoc for %{name}.
  
  %package        demo
--- 98,107 ----
  Group:          Documentation
  BuildRequires:  java-javadoc
! BuildRequires:  jdom-javadoc 
  Requires:       java-javadoc
! Requires:       jdom-javadoc
  
  %description    javadoc
! %{summary}.
  
  %package        demo
***************
*** 107,111 ****
  
  %description    demo
! Demonstrations and samples for %{name}.
  
  %package        jdom
--- 111,115 ----
  
  %description    demo
! %{summary}.
  
  %package        jdom
***************
*** 113,129 ****
  Group:          Text Processing/Markup/XML
  Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       jdom >= 0:1.0
  
  %description    jdom
! JDOM support for %{name}.
  
  %package        scripts
  Summary:        Utility scripts for %{name}
  Group:          Text Processing/Markup/XML
! Requires:       jpackage-utils >= 0:1.6
  Requires:       %{name} = %{epoch}:%{version}-%{release}
  
  %description    scripts
! Utility scripts for %{name}.
  
  
--- 117,133 ----
  Group:          Text Processing/Markup/XML
  Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       jdom >= 0:1.1
  
  %description    jdom
! %{summary}.
  
  %package        scripts
  Summary:        Utility scripts for %{name}
  Group:          Text Processing/Markup/XML
! Requires:       jpackage-utils >= 0:1.7.5
  Requires:       %{name} = %{epoch}:%{version}-%{release}
  
  %description    scripts
! %{summary}.
  
  
***************
*** 137,141 ****
  
  %build
! export CLASSPATH=%(build-classpath xml-commons-apis jdom)
  ant \
    -Dj2se.javadoc=%{_javadocdir}/java \
--- 141,145 ----
  
  %build
! export CLASSPATH=%(build-classpath jdom)
  ant \
    -Dj2se.javadoc=%{_javadocdir}/java \
***************
*** 158,161 ****
--- 162,177 ----
      ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
  
+ # poms
+ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+ install -m 644 %{SOURCE4} \
+          $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+ %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+ install -m 644 %{SOURCE5} \
+          $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-aelfred.pom
+ %add_to_maven_depmap %{name} %{name}-aelfred %{version} JPP %{name}
+ install -m 644 %{SOURCE6} \
+          $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-jdom.pom
+ %add_to_maven_depmap %{name} %{name}-jdom %{version} JPP %{name}
+ 
  # javadoc
  mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
***************
*** 188,194 ****
--- 204,214 ----
  
  %post
+ %update_maven_depmap
  update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
    jaxp_transform_impl %{_javadir}/%{name}.jar 25
  
+ %postun
+ %update_maven_depmap
+ 
  %preun
  {
***************
*** 202,205 ****
--- 222,227 ----
  %{_javadir}/%{name}-%{version}.jar
  %ghost %{_javadir}/jaxp_transform_impl.jar
+ %{_datadir}/maven2/poms/*
+ %{_mavendepmapfragdir}/*
  
  %files aelfred
***************
*** 229,232 ****
--- 251,261 ----
  
  %changelog
+ * Wed Dec 15 2010 Ralph Apel <r.apel at r-apel.de> - 0:6.5.5-3
+ - Rebuild for JPP 6.0
+ - xml-commons-apis (B)R dropped
+ - jaxp_parser_impl (B)R dropped
+ - (B)R jdom >= 0:1.1
+ - Add poms and depmap frags
+ 
  * Sun Jun 22 2008 Fernando Nasser <fnasser at redhat.com> - 0:6.5.5-2
  - Rebuild for JP 5.0

--- NEW FILE: saxon-jdom-6.5.5.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>saxon</groupId>
<artifactId>saxon-jdom</artifactId>
<version>6.5.5</version>
<dependencies>
<dependency>
  <groupId>org.jdom</groupId>
  <artifactId>jdom</artifactId>
  <version>1.1</version>
</dependency>
</dependencies>
</project>

--- NEW FILE: saxon-aelfred-6.5.5.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>saxon</groupId>
<artifactId>saxon-aelfred</artifactId>
<version>6.5.5</version>
</project>

--- NEW FILE: saxon-6.5.5.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>saxon</groupId>
<artifactId>saxon</artifactId>
<version>6.5.5</version>
</project>




More information about the JPackage-commits mailing list