[Jpackage-commits] rpms/free/glassfish-jaxb glassfish-jaxb.spec, 1.9, 1.10 jaxb-api-2.1.pom, 1.1, NONE

jpackage jpackage at ryu.zarb.org
Mon Jul 13 18:18:15 CEST 2009


Update of /home/projects/jpackage/cvs/rpms/free/glassfish-jaxb
In directory ryu.zarb.org:/tmp/xCsqOFPsp1/rpms/free/glassfish-jaxb

Modified Files:
	glassfish-jaxb.spec 
Removed Files:
	jaxb-api-2.1.pom 
Log Message:
2.1.9-4.jpp6

Index: glassfish-jaxb.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/glassfish-jaxb/glassfish-jaxb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** glassfish-jaxb.spec	6 Jul 2009 16:00:03 -0000	1.9
--- glassfish-jaxb.spec	13 Jul 2009 16:18:13 -0000	1.10
***************
*** 41,49 ****
  
  %define section free
! %define jaxbver  2.1.9
  
  Name:           glassfish-jaxb
  Version:        2.1.9
! Release:        3%{?dist}
  Epoch:          0
  Summary:        Java API for XML Web Services API
--- 41,50 ----
  
  %define section free
! %define apiver 2.1
! %define jaxbver %{apiver}.9
  
  Name:           glassfish-jaxb
  Version:        2.1.9
! Release:        4%{?dist}
  Epoch:          0
  Summary:        Java API for XML Web Services API
***************
*** 53,57 ****
  # cvs -Q -d:pserver:guest at cvs.dev.java.net:/cvs export -r jaxb-2_1_9 -d glassfish-jaxb-2.1.9 jaxb2-sources/jaxb-ri && tar cjf glassfish-jaxb-2.1.9-src.tar.bz2 glassfish-jaxb-2.1.9
  Source0:        glassfish-jaxb-2.1.9-src.tar.bz2
- Source1:        http://repo1.maven.org/maven2/javax/xml/jaxb-api/2.1/jaxb-api-2.1.pom
  Source2:        %{name}-component-info.xml
  Source3:        com-sun-xml-bind-component-info.xml
--- 54,57 ----
***************
*** 59,67 ****
  Provides:       jaxb_api = 0:%{jaxbver}
  Provides:       jaxb_2_1_api = 0:%{version}-%{release}
- Obsoletes:      %{name}-javadoc > %{epoch}:%{version}-%{release}
  %if 0
  Requires:       jaf = 1.1
  Requires:       stax_1_0_api
  %endif
  BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  jpackage-utils >= 0:1.7.3
--- 59,68 ----
  Provides:       jaxb_api = 0:%{jaxbver}
  Provides:       jaxb_2_1_api = 0:%{version}-%{release}
  %if 0
  Requires:       jaf = 1.1
  Requires:       stax_1_0_api
  %endif
+ Requires(post): jpackage-utils
+ Requires(postun): jpackage-utils
  BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  jpackage-utils >= 0:1.7.3
***************
*** 89,93 ****
  %endif
  
- %if 0
  %package javadoc
  Summary:        Javadoc for %{name}
--- 90,93 ----
***************
*** 97,101 ****
  %description javadoc
  %{summary}.
- %endif
  
  %prep
--- 97,100 ----
***************
*** 105,108 ****
--- 104,111 ----
  %patch0 -p1
  
+ %{__perl} -p -i -e 's/\@API_VERSION\@/%{apiver}/;' tools/poms/jaxb-api.pom
+ %{__perl} -p -i -e 's/\@VERSION\@/%{version}/;' -e 's/\@API_VERSION\@/%{apiver}/;' tools/poms/jaxb-impl.pom
+ %{__perl} -p -i -e 's/\@VERSION\@/%{version}/g;' tools/poms/jaxb-xjc.pom
+ 
  mv CDDL+GPLv2.txt CDDL+GPLv2.txt.orig
  %{_bindir}/iconv -f iso8859-1 -t utf8 -o CDDL+GPLv2.txt CDDL+GPLv2.txt.orig
***************
*** 112,115 ****
--- 115,120 ----
  export OPT_JAR_LIST=:
  %{ant} -Dbuild.sysclasspath=first dist
+ export CLASSPATH=${CLASSPATH}:apgen/build/classes:runtime/build/classes:runtime-deprecated/build/classes:runtime-fi/build/classes:runtime-staxex/build/classes:tools/jing-rnc-driver/build/classes:tools/pretty-printer/build/classes:tools/taglets/build/classes:tools/xmllint/build/classes:xjc/build/classes
+ %{ant} -Dbuild.sysclasspath=first architecture-document
  
  %install
***************
*** 123,129 ****
  /bin/touch $RPM_BUILD_ROOT%{_javadir}/jaxb_2_1_api.jar
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -m 644 dist/lib/jaxb-api.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -m 644 dist/lib/jaxb-impl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -m 644 dist/lib/jaxb-xjc.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
  
  # Commenting the bellow to fix 4.3 build
--- 128,134 ----
  /bin/touch $RPM_BUILD_ROOT%{_javadir}/jaxb_2_1_api.jar
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -p -m 644 dist/lib/jaxb-api.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -p -m 644 dist/lib/jaxb-impl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -p -m 644 dist/lib/jaxb-xjc.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
  
  # Commenting the bellow to fix 4.3 build
***************
*** 145,158 ****
  %endif
  
- %if 0
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
- %endif
  
  # poms
! %add_to_maven_depmap javax.xml jaxb-api %{version} JPP/%{name} jaxb-api
! %{__install} -D -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.jaxb-api.pom
  
  %if %with repolib
--- 150,166 ----
  %endif
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} || :
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  # poms
! %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! %add_to_maven_depmap javax.xml.bind jaxb-api %{version} JPP/%{name} jaxb-api
! %{__install} -p -m 644 tools/poms/jaxb-api.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.jaxb-api.pom
! %add_to_maven_depmap com.sun.xml.bind jaxb-impl %{version} JPP/%{name} jaxb-impl
! %{__install} -p -m 644 tools/poms/jaxb-impl.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.jaxb-impl.pom
! %add_to_maven_depmap com.sun.xml.bind jaxb-xjc %{version} JPP/%{name} jaxb-xjc
! %{__install} -p -m 644 tools/poms/jaxb-xjc.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.jaxb-xjc.pom
  
  %if %with repolib
***************
*** 165,169 ****
  %{__install} -d -m 755 %{buildroot}%{repodirsrc}
  %{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
- %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
  %{__cp} -p dist/lib/jaxb-* %{buildroot}%{repodirlib}/
  %{__cp} -p dist/lib/jsr173_1.0_api.jar %{buildroot}%{repodirlib}/
--- 173,176 ----
***************
*** 179,183 ****
  %{__install} -d -m 755 %{buildroot}%{repodirsrc}
  %{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
- %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
  %{__cp} -p dist/lib/jaxb-xjc.jar %{buildroot}%{repodirlib}/jaxb-xjc.jar
  %endif
--- 186,189 ----
***************
*** 187,193 ****
  
  %post
- %if 0
  %update_maven_depmap
- %endif
  %{_sbindir}/update-alternatives --install %{_javadir}/jaxb_2_1_api.jar jaxb_2_1_api %{_javadir}/%{name}/jaxb-api.jar 20100
  %{_sbindir}/update-alternatives --install %{_javadir}/jaxb_api.jar jaxb_api %{_javadir}/%{name}/jaxb-api.jar 20100
--- 193,197 ----
***************
*** 199,206 ****
  fi
  
- %if 0
  %postun
  %update_maven_depmap
- %endif
  
  %files
--- 203,208 ----
***************
*** 211,222 ****
  %ghost %{_javadir}/jaxb-api.jar
  %{_datadir}/maven2/poms/JPP.%{name}.jaxb-api.pom
  %{_mavendepmapfragdir}/%{name}
  
- %if 0
  %files javadoc
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
- %endif
  
  %if %with repolib
--- 213,224 ----
  %ghost %{_javadir}/jaxb-api.jar
  %{_datadir}/maven2/poms/JPP.%{name}.jaxb-api.pom
+ %{_datadir}/maven2/poms/JPP.%{name}.jaxb-impl.pom
+ %{_datadir}/maven2/poms/JPP.%{name}.jaxb-xjc.pom
  %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
  %if %with repolib
***************
*** 227,230 ****
--- 229,235 ----
  
  %changelog
+ * Mon Jul 13 2009 David Walluck <dwalluck at redhat.com> 0:2.1.9-4
+ - install maven poms
+ 
  * Mon Jul 06 2009 David Walluck <dwalluck at redhat.com> 0:2.1.9-3
  - add com-sun-xml-bind repolib

--- jaxb-api-2.1.pom DELETED ---




More information about the JPackage-commits mailing list