Hello community, here is the log from the commit of package xerces-j2 for openSUSE:Factory checked in at 2014-06-30 22:50:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xerces-j2 (Old) and /work/SRC/openSUSE:Factory/.xerces-j2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xerces-j2" Changes: -------- --- /work/SRC/openSUSE:Factory/xerces-j2/xerces-j2.changes 2014-06-25 06:57:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xerces-j2.new/xerces-j2.changes 2014-06-30 22:50:30.000000000 +0200 @@ -2 +2 @@ -Wed Jun 11 13:06:12 UTC 2014 - [email protected] +Fri Jun 6 15:48:05 UTC 2014 - [email protected] @@ -4 +4,19 @@ -- Drop unused patches: +- Version bump to 2.11.0: + * This release expands on Xerces' experimental support for XML + Schema 1.1 by providing implementations for the simplified + complex type restriction rules (also known as subsumption), + xs:override and a few other XML Schema 1.1 features. This + release also introduces experimental support for XML Schema + Component Designators (SCD). It fixes several bugs which were + present in Xerces-J 2.10.0 and also includes a few other minor + enhancements. + * As of this release, Xerces and Xalan now share a common + serialization codebase. The DOM Level 3 serialization support + which was in Xerces was migrated into the Xalan serializer and + Xerces' native serializer was deprecated. In this release we + also upgraded the xml-commons resolver to v1.2 (which provides + support for OASIS XML Catalogs v1.1), introduced a few minor + features and fixed several bugs. +- Obsoleted patches no longer needed: + * xerces-j2-parsing.patch + * xerces-j2-2.8.1_new_unsupported_dom_methods.patch @@ -6,0 +25 @@ + * java150_build.patch Old: ---- Xerces-J-src.2.8.1.tar.bz2 Xerces-J-tools.2.8.1.tar.bz2 java150_build.patch xerces-j2-2.8.1_new_unsupported_dom_methods.patch xerces-j2-parsing.patch New: ---- Xerces-J-src.2.11.0.tar.gz Xerces-J-tools.2.11.0.tar.gz xerces-j2-constants.1 xerces-j2-version.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xerces-j2.spec ++++++ --- /var/tmp/diff_new_pack.OMCmZs/_old 2014-06-30 22:50:31.000000000 +0200 +++ /var/tmp/diff_new_pack.OMCmZs/_new 2014-06-30 22:50:31.000000000 +0200 @@ -16,29 +16,22 @@ # -Name: xerces-j2 -%define name xerces-j2 -%define version 2.8.1 -%define cvs_version 2_8_1 +%define cvs_version 2_11_0 %define release 3jpp %define section free -Version: 2.8.1 +Name: xerces-j2 +Version: 2.11.0 Release: 0 Summary: Java XML parser License: Apache-2.0 Group: Development/Libraries/Java Url: http://xml.apache.org/xerces2-j/ -Source0: Xerces-J-src.%{version}.tar.bz2 -Source1: %{name}-version.sh -Source2: %{name}-constants.sh -Source3: Xerces-J-tools.%{version}.tar.bz2 -Patch1: java150_build.patch -Patch2: %{name}-%{version}_new_unsupported_dom_methods.patch -#PATCH-FIX-UPSTREAM bnc#530717 -#http://svn.apache.org/viewvc?view=rev&revision=787352 -Patch3: xerces-j2-parsing.patch -Provides: jaxp_parser_impl -PreReq: update-alternatives /bin/ln +Source0: http://www.eu.apache.org/dist/xerces/j/source/Xerces-J-src.%{version}.tar.gz +Source1: http://www.eu.apache.org/dist/xerces/j/source/Xerces-J-tools.%{version}.tar.gz +Source2: %{name}-version.sh +Source3: %{name}-version.1 +Source4: %{name}-constants.sh +Source5: %{name}-constants.1 # some build requirements removed to enable jpackage bootstrap. this is # the first package built, and we use the libraries in the tools subdir # for it. @@ -47,8 +40,11 @@ #!BuildIgnore: antlr antlr-java BuildRequires: javapackages-tools BuildRequires: unzip -BuildArch: noarch +Requires(post): update-alternatives +Requires(pre): update-alternatives +Provides: jaxp_parser_impl BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Welcome to the future! Xerces2 is the next generation of high @@ -97,8 +93,6 @@ This package contains demonstration and sample files for Xerces2. - - %package scripts Summary: Additional utility scripts for xerces-j2 Group: Development/Libraries/Java @@ -127,14 +121,13 @@ This package contains additional utility scripts for Xerces2. - - %package xml-resolver Summary: Resolver subproject of xml-commons Group: Development/Libraries/Java Requires: javapackages-tools +Requires(post): update-alternatives +Requires(pre): update-alternatives Provides: xml-commons-resolver -PreReq: update-alternatives %description xml-resolver xml-commons is focused on common code and guidelines for xml projects. @@ -144,14 +137,13 @@ This package contains the resolver subproject of xml-commons. - - %package xml-apis Summary: APIs subproject of xml-commons Group: Development/Libraries/Java Requires: javapackages-tools +Requires(post): update-alternatives +Requires(pre): update-alternatives Provides: xml-commons-apis -PreReq: update-alternatives %description xml-apis xml-commons is focused on common code and guidelines for xml projects. @@ -165,15 +157,15 @@ This package contains the APIs subproject of xml-commons. - - %prep %setup -q -n xerces-%{cvs_version} -%setup -q -T -a 3 -D -n xerces-%{cvs_version} -%setup -T -D -n xerces-%{cvs_version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -b .parsing +%setup -q -T -a 1 -D -n xerces-%{cvs_version} +%setup -q -T -D -n xerces-%{cvs_version} + +echo 'javac.target=1.5' > build.properties +echo 'javac.source=1.5' >> build.properties + +sed -i 's/\r//' LICENSE README NOTICE build.sh %build ## this uses the ant.jar provided by the xerces packages. Tough luck, @@ -183,71 +175,71 @@ export GC_MAXIMUM_HEAP_SIZE="134217728" export CLASSPATH=$CLASSPATH:`build-classpath antlr-bootstrap` sh build.sh jars - #ant tests test %install # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -p build/xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -cp -p build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}-xml-resolver.jar -cp -p build/xml-apis.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}-xml-apis.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +mkdir -p %{buildroot}%{_javadir} +cp -p build/xercesImpl.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +cp -p build/resolver.jar %{buildroot}%{_javadir}/%{name}-%{version}-xml-resolver.jar +cp -p build/xml-apis.jar %{buildroot}%{_javadir}/%{name}-%{version}-xml-apis.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # scripts -mkdir -p $RPM_BUILD_ROOT%{_bindir} -cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-version -cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}-constants +mkdir -p %{buildroot}%{_bindir} +cp -p %{SOURCE2} %{buildroot}%{_bindir}/%{name}-version +cp -p %{SOURCE4} %{buildroot}%{_bindir}/%{name}-constants +# mans +install -d -m 755 %{buildroot}%{_mandir}/man1 +install -p -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1 +install -p -m 644 %{SOURCE5} %{buildroot}%{_mandir}/man1 # demo -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} +mkdir -p %{buildroot}%{_datadir}/%{name} cp -p build/xercesSamples.jar \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-samples.jar -cp -pr data $RPM_BUILD_ROOT%{_datadir}/%{name} + %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar +cp -pr data %{buildroot}%{_datadir}/%{name} # jaxp_parser_impl ghost symlink ln -s %{_sysconfdir}/alternatives \ - $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar + %{buildroot}%{_javadir}/jaxp_parser_impl.jar # xml-apis ghost symlink ln -s %{_sysconfdir}/alternatives \ - $RPM_BUILD_ROOT%{_javadir}/xml-commons-apis.jar + %{buildroot}%{_javadir}/xml-commons-apis.jar # xml-resolver ghost symlink ln -s %{_sysconfdir}/alternatives \ - $RPM_BUILD_ROOT%{_javadir}/xml-commons-resolver.jar - -%clean -rm -rf $RPM_BUILD_ROOT + %{buildroot}%{_javadir}/xml-commons-resolver.jar %post -/usr/sbin/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar jaxp_parser_impl %{_javadir}/%{name}.jar 23 -/usr/sbin/update-alternatives --auto jaxp_parser_impl +%{_sbindir}/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar jaxp_parser_impl %{_javadir}/%{name}.jar 23 +%{_sbindir}/update-alternatives --auto jaxp_parser_impl %post xml-apis -/usr/sbin/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/%{name}-xml-apis.jar 1 -/usr/sbin/update-alternatives --auto xml-commons-apis +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/%{name}-xml-apis.jar 1 +%{_sbindir}/update-alternatives --auto xml-commons-apis %post xml-resolver -/usr/sbin/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/%{name}-xml-resolver.jar 1 -/usr/sbin/update-alternatives --auto xml-commons-resolver +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/%{name}-xml-resolver.jar 1 +%{_sbindir}/update-alternatives --auto xml-commons-resolver %preun { [ $1 = 0 ] || exit 0 - /usr/sbin/update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar + %{_sbindir}/update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar } >/dev/null 2>&1 || : %preun xml-apis { [ $1 = 0 ] || exit 0 - /usr/sbin/update-alternatives --remove xml-commons-apis %{_javadir}/%{name}-xml-apis.jar + %{_sbindir}/update-alternatives --remove xml-commons-apis %{_javadir}/%{name}-xml-apis.jar } >/dev/null 2>&1 || : %preun xml-resolver { [ $1 = 0 ] || exit 0 - /usr/sbin/update-alternatives --remove xml-commons-resolver %{_javadir}/%{name}-xml-commons-resolver.jar + %{_sbindir}/update-alternatives --remove xml-commons-resolver %{_javadir}/%{name}-xml-commons-resolver.jar } >/dev/null 2>&1 || : %files %defattr(0644,root,root,0755) -%doc LICENSE README ISSUES STATUS TODO +%doc LICENSE README %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar %ghost %{_javadir}/jaxp_parser_impl.jar @@ -271,5 +263,6 @@ %files scripts %defattr(0755,root,root,0755) %{_bindir}/* +%{_mandir}/man1/* %changelog ++++++ xerces-j2-constants.1 ++++++ .TH XERCES-J2-CONSTANTS 1 "08 April 2013" "xerces-2.11.0" "User commands" .SH NAME xerces-j2-constants \- display constants used by Xerces2 Java Parser .SH SYNOPSIS .BR xerces-j2-constants .SH DESCRIPTION Xerces-J2-Constants dumps common constants used by Xerces2 Java Parser to standard output. ++++++ xerces-j2-version.1 ++++++ .TH XERCES-J2-VERSION 1 "08 April 2013" "xerces-2.11.0" "User commands" .SH NAME xerces-j2-version \- display version of Xerces2 Java Parser .SH SYNOPSIS .BR xerces-j2-version .SH DESCRIPTION Xerces-J2-Version prints version of Xerces2 Java Parser to standard output. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
