[Jpackage-commits] dist/crimson/JPP-6 crimson-1.1.3.pom, NONE, 1.1 crimson.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Fri Jul 31 00:36:27 CEST 2009


Update of /home/projects/jpackage/cvs/dist/crimson/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv24620

Modified Files:
	crimson.spec 
Added Files:
	crimson-1.1.3.pom 
Log Message:
- build for JPP-6
- add maven support


--- NEW FILE: crimson-1.1.3.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>crimson</groupId>
  <artifactId>crimson</artifactId>
  <version>1.1.3</version>
</project>
Index: crimson.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/crimson/JPP-6/crimson.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** crimson.spec	30 Jul 2009 21:02:06 -0000	1.1
--- crimson.spec	30 Jul 2009 22:36:25 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2007, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 34,69 ****
  %define section free
  
! Name: crimson
! Epoch: 0
! Version: 1.1.3
! Release: 17jpp
! Summary: Java XML parser
! 
! Group: Text Processing/Markup/XML
! Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
! Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
! License: Apache Software License
! URL: http://xml.apache.org/%{name}
! Source0: http://xml.apache.org/dist/%{name}/%{name}-%{version}-src.tar.gz
! Patch0: %{name}-noapis.patch
! BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
! Provides: jaxp_parser_impl
! %if ! %{gcj_support}
! BuildArch: noarch
! %endif
! 
! BuildRequires: ant
! BuildRequires: jpackage-utils >= 0:1.6
! BuildRequires: xml-commons-apis
! Requires: xml-commons-apis
! Requires(post): /usr/sbin/update-alternatives
! Requires(preun): /usr/sbin/update-alternatives
! Requires: jpackage-utils >= 0:1.6
  %if %{gcj_support}
- BuildRequires: gnu-crypto
  BuildRequires: java-gcj-compat-devel
! Requires(post): java-gcj-compat
! Requires(postun): java-gcj-compat
  %endif
  
  %description
--- 34,64 ----
  %define section free
  
! Name:           crimson
! Version:        1.1.3
! Release:        18%{?dist}
! Epoch:          0
! Summary:        Java XML parser
! Group:          Text Processing/Markup/XML
! License:        ASL 1.1
! URL:            http://xml.apache.org/crimson/
! Source0:        http://xml.apache.org/dist/%{name}/%{name}-%{version}-src.tar.gz
! Source1:        http://mirrors.ibiblio.org/pub/mirrors/maven2/crimson/crimson/1.1.3/crimson-1.1.3.pom
! Patch0:         %{name}-noapis.patch
! Provides:       jaxp_parser_impl
! Requires:       xml-commons-jaxp-1.1-apis
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! Requires(post): %{_sbindir}/update-alternatives
! Requires(preun): %{_sbindir}/update-alternatives
! Requires:       jpackage-utils
! BuildRequires:  ant
! BuildRequires:  jpackage-utils >= 0:1.6
! BuildRequires:  xml-commons-jaxp-1.1-apis
  %if %{gcj_support}
  BuildRequires: java-gcj-compat-devel
! %else
! BuildArch: noarch
  %endif
+ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 83,87 ****
  
  %package manual
! Summary: Manual for %{name}
  Group: Text Processing/Markup/XML
  
--- 78,82 ----
  
  %package manual
! Summary:        Manual for %{name}
  Group: Text Processing/Markup/XML
  
***************
*** 90,98 ****
  
  %package javadoc
! Summary: Javadoc for %{name}
! Group: Development/Documentation
! Requires(post): /bin/ln
! Requires(post): /bin/rm
! Requires(postun): /bin/rm
  
  %description javadoc
--- 85,90 ----
  
  %package javadoc
! Summary:        Javadoc for %{name}
! Group:          Development/Documentation
  
  %description javadoc
***************
*** 100,106 ****
  
  %package demo
! Summary: Demo for %{name}
! Group: Text Processing/Markup/XML
! Requires: %{name} = %{epoch}:%{version}-%{release}
  
  %description demo
--- 92,98 ----
  
  %package demo
! Summary:        Demo for %{name}
! Group:          Text Processing/Markup/XML
! Requires:       %{name} = %{epoch}:%{version}-%{release}
  
  %description demo
***************
*** 114,118 ****
  
  %build
! CLASSPATH="$(find-jar xml-commons-apis)" ant jar javadoc
  
  # -----------------------------------------------------------------------------
--- 106,112 ----
  
  %build
! export OPT_JAR_LIST=:
! CLASSPATH=$(build-classpath xml-commons-jaxp-1.2-apis)
! %{ant} -Djava.endorsed.dirs=%{_javadir} jar javadoc
  
  # -----------------------------------------------------------------------------
***************
*** 137,141 ****
      ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version}
  %{__ln_s} %{name}-%{version} \
!     ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} # ghost symlink
  
  # demo
--- 131,135 ----
      ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version}
  %{__ln_s} %{name}-%{version} \
!     ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
  
  # demo
***************
*** 147,153 ****
      ${RPM_BUILD_ROOT}%{_javadir}/jaxp_parser_impl.jar
  
  %if %{gcj_support}
!     export CLASSPATH="$(build-classpath gnu-crypto)"
!     %{_bindir}/aot-compile-rpm
  %endif
  
--- 141,150 ----
      ${RPM_BUILD_ROOT}%{_javadir}/jaxp_parser_impl.jar
  
+ # maven
+ %add_to_maven_depmap crimson crimson %{version} JPP %{name}
+ %{__install} -D -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+ 
  %if %{gcj_support}
! %{_bindir}/aot-compile-rpm
  %endif
  
***************
*** 158,162 ****
  
  %post
! update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
      jaxp_parser_impl %{_javadir}/%{name}.jar 20
  %if %{gcj_support}
--- 155,159 ----
  
  %post
! %{_sbindir}/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
      jaxp_parser_impl %{_javadir}/%{name}.jar 20
  %if %{gcj_support}
***************
*** 165,176 ****
  fi
  %endif
  
  %preun
  if [ "$1" -eq 0 ]; then
!     update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar
  fi
  
- %if %{gcj_support}
  %postun
  if [ -x %{_bindir}/rebuild-gcj-db ]; then
      %{_bindir}/rebuild-gcj-db
--- 162,175 ----
  fi
  %endif
+ %update_maven_depmap
  
  %preun
  if [ "$1" -eq 0 ]; then
!     %{_sbindir}/update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar
  fi
  
  %postun
+ %update_maven_depmap
+ %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]; then
      %{_bindir}/rebuild-gcj-db
***************
*** 178,197 ****
  %endif
  
- %post javadoc
- %{__rm} -f %{_javadocdir}/%{name}
- %{__ln_s} %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" -eq 0 ]; then
-     %{__rm} -f %{_javadocdir}/%{name}
- fi
- 
  %files
  %defattr(0644,root,root,0755)
  %doc ChangeLog README.txt
! %{_javadir}/%{name}*.jar
  %ghost %{_javadir}/jaxp_parser_impl.jar
  %if %{gcj_support}
! %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
--- 177,190 ----
  %endif
  
  %files
  %defattr(0644,root,root,0755)
  %doc ChangeLog README.txt
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
  %ghost %{_javadir}/jaxp_parser_impl.jar
+ %{_datadir}/maven2/poms/JPP-%{name}.pom
+ %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
***************
*** 204,208 ****
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
! %ghost %{_javadocdir}/%{name}
  
  %files demo
--- 197,201 ----
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %files demo
***************
*** 211,214 ****
--- 204,211 ----
  
  %changelog
+ * Thu Jul 30 2009 David Walluck <dwalluck at redhat.com> 0:1.1.3-18
+ - build for JPP-6
+ - add maven support
+ 
  * Wed May 30 2007 Jason Corley <jason.corley at gmail.com> - 0:1.1.3-17jpp
  - syntactic cleanup




More information about the JPackage-commits mailing list