[Jpackage-commits] dist/sun-fi/devel .cvsignore, 1.2, 1.3 FastInfoset-1.2.2.pom, 1.1, NONE FastInfoset-1.2.7.pom, NONE, 1.1 FastInfosetUtilities-1.2.7.pom, NONE, 1.1 sources, 1.2, 1.3 sun-fi-1.2.2-build-without-nb.patch, 1.1, NONE sun-fi-component-info.xml, NONE, 1.1 sun-fi.spec, 1.1, 1.2

jpackage-guest jpackage-guest at ryu.zarb.org
Fri Jul 17 10:38:50 CEST 2009


Update of /home/projects/jpackage/cvs/dist/sun-fi/devel
In directory ryu.zarb.org:/tmp/cvs-serv29802/devel

Modified Files:
	.cvsignore sources sun-fi.spec 
Added Files:
	FastInfoset-1.2.7.pom FastInfosetUtilities-1.2.7.pom 
	sun-fi-component-info.xml 
Removed Files:
	FastInfoset-1.2.2.pom sun-fi-1.2.2-build-without-nb.patch 
Log Message:
Import 1.2.7

Index: sun-fi.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/sun-fi/devel/sun-fi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sun-fi.spec	28 May 2008 19:52:03 -0000	1.1
--- sun-fi.spec	17 Jul 2009 08:38:48 -0000	1.2
***************
*** 29,70 ****
  #
  
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
  %define section free
- %define ucname  FastInfoset
  
  Name:           sun-fi
! Version:        1.2.2
! Release:        1jpp
  Epoch:          0
  Summary:        Fast Infoset
! License:        Apache Software License 2.0
! Url:            https://fi.dev.java.net/
! Source0:        sun-fi-1.2.2.tar.gz
! # cvs -d :pserver:guest at cvs.dev.java.net:/cvs export -r jaxws211-fcs -d sun-fi-1.2.2 fi/FastInfoset
! Source1:        FastInfoset-1.2.2.pom
! Patch0:         sun-fi-1.2.2-build-without-nb.patch
  
  Group:          Development/Libraries/Java
! Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
! Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
  BuildRequires:  junit
! BuildRequires:  stax_1_0_api
! Requires:  java >= 0:1.5.0
! Requires:  stax_1_0_api
! %if ! %{gcj_support}
! BuildArch:      noarch
! %endif
! BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
  %if %{gcj_support}
! BuildRequires:    gnu-crypto
! BuildRequires:    java-gcj-compat-devel
! Requires(post):   java-gcj-compat
! Requires(postun): java-gcj-compat
  %endif
  
  %description
--- 29,93 ----
  #
  
+ # FIXME: (dwalluck): requires jpp17 bootstrap maven-wagon, maven-doxia, naven2
+ 
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
+ %define with_repolib %{?_with_repolib:1}%{!?_with_repolib:0}
+ %define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0}
+ 
+ %define _with_repolib 1
+ %define repodir %{_javadir}/repository.jboss.com/sun-fi/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define section free
  
  Name:           sun-fi
! Version:        1.2.7
! Release:	    1%{?dist}
  Epoch:          0
  Summary:        Fast Infoset
! License:        ASL 2.0
! URL:            https://fi.dev.java.net/
  
+ # wget https://fi.dev.java.net/files/documents/2634/136954/FastInfosetPackage_src_1.2.7.zip
+ # unzip FastInfosetPackage_src_1.2.7.zip
+ # mv FastInfosetUtilities/ FastInfoset
+ # mv FastInfoset sun-fi-1.2.7
+ # tar zcvf sun-fi-1.2.7.tar.gz sun-fi-1.2.7/
+ 
+ Source0:        sun-fi-1.2.7.tar.gz
+ Source1:        FastInfoset-1.2.7.pom
+ Source2:        FastInfosetUtilities-1.2.7.pom
+ Source3:        sun-fi-component-info.xml
+ #don't need this patch since 1.2.7
+ #Patch0:         sun-fi-1.2.2-build-without-nb.patch
  Group:          Development/Libraries/Java
! Provides:       FastInfoset = %{epoch}:%{version}-%{release}
! Provides:       FastInfosetUtilities = %{epoch}:%{version}-%{release}
! Requires:       java >= 0:1.5.0
! #Requires:       stax_1_0_api
! Requires:	geronimo-stax-1.0-api
! Requires:       stax-ex
! Requires:       sun-xmlstreambuffer
! Requires:       sun-xsom
! BuildRequires:  jpackage-utils >= 0:1.7.3
! BuildRequires:  java-devel >= 0:1.5.0
! BuildRequires:  javatools-package-rename-task
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
  BuildRequires:  junit
! BuildRequires:  relaxngDatatype
! #BuildRequires:  stax_1_0_api
! BuildRequires:	geronimo-stax-1.0-api
! BuildRequires:  stax-ex
! BuildRequires:  sun-xmlstreambuffer
! BuildRequires:  sun-xsom
  %if %{gcj_support}
! BuildRequires:  java-gcj-compat-devel
! %else
! BuildArch:      noarch
  %endif
+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 83,131 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
  %{summary}.
  
  %prep
! %setup -q 
  # remove all binary libs
! for j in $(find . -name "*.jar"); do
!     mv $j $j.no
! done
! %patch0 -b .java2
  
  %build
! export JAVA_HOME=%{_jvmdir}/java-1.5.0
! ln -sf $(build-classpath junit) lib/junit.jar
! ln -sf $(build-classpath stax_1_0_api) lib/jsr173_api.jar
  
  # Run to create java2 sources (need java5)
! # ant -f j2se-integration.xml
  ant -f build-without-nb.xml dist test doc
  
  %install
  rm -rf $RPM_BUILD_ROOT
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  install -m 644 dist/FastInfoset.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! %add_to_maven_depmap com.sun.xml.fastinfoset FastInfoset %{version} JPP %{name}
  
! (cd $RPM_BUILD_ROOT%{_javadir} 
! for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
  # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  install -pm 644 %{SOURCE1} \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %if %{gcj_support}
- export CLASSPATH=$(build-classpath gnu-crypto)
  %{_bindir}/aot-compile-rpm
  %endif
--- 106,214 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description javadoc
  %{summary}.
  
+ %if %{with_repolib}
+ %package repolib
+ Summary:         Artifacts to be uploaded to a repository library
+ Group:           Development/Libraries/Java
+ 
+ %description repolib
+ Artifacts to be uploaded to a repository library.
+ This package is not meant to be installed but so its contents
+ can be extracted through rpm2cpio.
+ %endif
+ 
  %prep
! %setup -q
! 
! sed -i 's|<javac source="1.4" target="1.4"|<javac source="1.5" target="1.5"|g' j2se-integration.xml 
! 
  # remove all binary libs
! find . -type f -name "*.jar" | xargs -t rm
! #%patch0 -p0
  
  %build
! export CLASSPATH=
! export OPT_JAR_LIST="junit ant/ant-junit"
! 
! ln -s $(build-classpath junit) lib/junit.jar
! #ln -s $(build-classpath stax_1_0_api) lib/jsr173_api.jar
! ln -s $(build-classpath geronimo-stax-1.0-api) lib/jsr173_api.jar
! ln -s $(build-classpath javatools-package-rename-task) tools/lib/package-rename-task.jar
  
  # Run to create java2 sources (need java5)
! ant -f j2se-integration.xml
  ant -f build-without-nb.xml dist test doc
  
+ export CLASSPATH=`pwd`/dist/FastInfoset.jar
+ pushd FastInfosetUtilities
+ #ln -s $(build-classpath stax_1_0_api) lib/jsr173_api.jar
+ ln -s $(build-classpath geronimo-stax-1.0-api) lib/jsr173_api.jar
+ ln -s $(build-classpath relaxngDatatype) lib/relaxngDatatype.jar
+ ln -s $(build-classpath stax-ex) lib/stax-ex.jar
+ ln -s $(build-classpath sun-xmlstreambuffer) lib/streambuffer.jar
+ ln -s $(build-classpath sun-xsom/xsom) lib/xsom.jar
+ 
+ ant -Ddefault.javac.source=1.5 -Ddefault.javac.target=1.5 -Djavac.compilerargs="-source 1.5" -f build-without-nb.xml dist doc
+ popd
+ 
  %install
  rm -rf $RPM_BUILD_ROOT
+ 
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  install -m 644 dist/FastInfoset.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/FastInfoset-%{version}.jar
  
! pushd FastInfosetUtilities
! install -m 644 dist/FastInfosetUtilities.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-utilities-%{version}.jar
! ln -s %{name}-utilities-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/FastInfosetUtilities-%{version}.jar
! popd
! 
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
  
  # poms
+ %add_to_maven_depmap com.sun.xml.fastinfoset FastInfoset %{version} JPP %{name}
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  install -pm 644 %{SOURCE1} \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
  
+ %add_to_maven_depmap com.sun.xml.fastinfoset FastInfosetUtilities %{version} JPP %{name}-utilities
+ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+ install -pm 644 %{SOURCE2} \
+     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-utilities.pom
+ 
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/FastInfoset-%{version}
! ln -s FastInfoset-%{version} $RPM_BUILD_ROOT%{_javadocdir}/FastInfoset
! 
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-utilities-%{version}
! pushd FastInfosetUtilities
! cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-utilities-%{version}
! popd
! ln -s %{name}-utilities-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-utilities
! ln -s %{name}-utilities-%{version} $RPM_BUILD_ROOT%{_javadocdir}/FastInfosetUtilities-%{version}
! ln -s FastInfosetUtilities-%{version} $RPM_BUILD_ROOT%{_javadocdir}/FastInfosetUtilities
! 
! %if %{with_repolib}
!         install -d -m 755 $RPM_BUILD_ROOT%{repodir}
!         install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
!         install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{repodir}/component-info.xml
!         tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
!         sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
!         sed -i "s/@VERSION@/%{version}-brew/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
!         install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
!         install -p -m 644 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc}
!         install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
!         cp -p $RPM_BUILD_ROOT%{_javadir}/FastInfoset.jar $RPM_BUILD_ROOT%{repodirlib}/FastInfoset.jar
!         cp -p $RPM_BUILD_ROOT%{_javadir}/FastInfosetUtilities.jar $RPM_BUILD_ROOT%{repodirlib}/FastInfosetUtilities.jar
! %endif
  
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
  %endif
***************
*** 134,147 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-     rm -f %{_javadocdir}/%{name}
- fi
- 
- 
  %post
  %update_maven_depmap
--- 217,220 ----
***************
*** 164,183 ****
  %files
  %defattr(0644,root,root,0755)
- %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
  %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}
  %if %{gcj_support}
! %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
  
- 
  %files javadoc
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
! %ghost %{_javadocdir}/%{name}
  
  %changelog
  * Wed Apr 09 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.2.2-1jpp
  - 1.2.2 build for java5
--- 237,289 ----
  %files
  %defattr(0644,root,root,0755)
  %{_javadir}/%{name}-%{version}.jar
+ %{_javadir}/%{name}.jar
+ %{_javadir}/FastInfoset-%{version}.jar
+ %{_javadir}/FastInfoset.jar
+ %{_javadir}/%{name}-utilities-%{version}.jar
+ %{_javadir}/%{name}-utilities.jar
+ %{_javadir}/FastInfosetUtilities-%{version}.jar
+ %{_javadir}/FastInfosetUtilities.jar
  %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
  
  %files javadoc
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
! %{_javadocdir}/%{name}-utilities-%{version}
! %{_javadocdir}/%{name}-utilities
! %{_javadocdir}/FastInfoset-%{version}
! %{_javadocdir}/FastInfoset
! %{_javadocdir}/FastInfosetUtilities-%{version}
! %{_javadocdir}/FastInfosetUtilities
! 
! %if %{with_repolib}
! %files repolib
! %defattr(0644,root,root,0755)
! %{_javadir}/repository.jboss.com
! %endif
  
  %changelog
+ * Thu Jul 16 2009 Yong Yang <yyang at redhat.com> 1.2.7-1
+ - Upgrade to 1.2.7
+ - Comment "Patch0:         sun-fi-1.2.2-build-without-nb.patch"
+ 
+ * Thu Jun 18 2009 Martha Benitez <mbenitez at redhat.com> 1.2.2-3.1
+ - Change jpackage-utils >= 0:1.7.4 to jpackage-utils >= 0:1.7.3
+ - Change stax_1_0_api to geronimo-stax-1.0-api
+ 
+ * Mon Dec 08 2008 Will Tatam <will.tatam at red61.com> 1.2.2-3
+ - Auto rebuild for JPackage 5 in mock
+ 
+ * Tue Aug 19 2008 David Walluck <dwalluck at redhat.com> 0:1.2.2-2
+ - symlink to common names
+ - merge in FastInfosetUtilities
+ - add repolib
+ 
  * Wed Apr 09 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.2.2-1jpp
  - 1.2.2 build for java5
***************
*** 185,187 ****
  * Wed Nov 21 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.1-1jpp
  - First release
- 
--- 291,292 ----

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/sun-fi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	28 May 2008 19:52:02 -0000	1.2
--- .cvsignore	17 Jul 2009 08:38:47 -0000	1.3
***************
*** 1 ****
! sun-fi-1.2.2.tar.gz
--- 1 ----
! sun-fi-1.2.7.tar.gz

--- NEW FILE: FastInfosetUtilities-1.2.7.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.sun.xml.fastinfoset</groupId>
  <artifactId>FastInfosetUtilities</artifactId>
  <version>1.2.7</version>
</project>

--- NEW FILE: FastInfoset-1.2.7.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.sun.xml.fastinfoset</groupId>
  <artifactId>FastInfoset</artifactId>
  <version>1.2.7</version>
</project>

--- FastInfoset-1.2.2.pom DELETED ---

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/sun-fi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	28 May 2008 19:52:02 -0000	1.2
--- sources	17 Jul 2009 08:38:47 -0000	1.3
***************
*** 1 ****
! 816a6c339dd429640c1a52b1d18b9aef  sun-fi-1.2.2.tar.gz
--- 1 ----
! 5902849e46fef9301e02b16ad6a0f266  sun-fi-1.2.7.tar.gz

--- NEW FILE: sun-fi-component-info.xml ---
<project name="sun-fi">

   <component id="sun-fi"
              licenseType="cddl"
              version="@VERSION@"
              tag="@TAG@"
              projectHome="https://fi.dev.java.net"
              description="Open Source implementation of the Fast Infoset (http://asn1.elibel.tm.fr/xml/finf.htm) Standard for Binary XML">

      <artifact id="FastInfoset.jar"/>
      <artifact id="FastInfosetUtilities.jar"/>

      <export>
         <include input="FastInfoset.jar"/>
         <include input="FastInfosetUtilities.jar"/>
      </export>
   </component>


</project>

--- sun-fi-1.2.2-build-without-nb.patch DELETED ---




More information about the JPackage-commits mailing list