diff --git a/xerces-j2.changes b/xerces-j2.changes index c92205b..20f9f1a 100644 --- a/xerces-j2.changes +++ b/xerces-j2.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Jun 6 15:48:05 UTC 2014 - tchvatal@suse.com + +- 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. + ------------------------------------------------------------------- Mon Sep 9 11:06:27 UTC 2013 - tchvatal@suse.com diff --git a/xerces-j2.spec b/xerces-j2.spec index 96b593c..4392212 100644 --- a/xerces-j2.spec +++ b/xerces-j2.spec @@ -16,12 +16,10 @@ # -Name: xerces-j2 -%define name xerces-j2 -%define version 2.11.0 %define cvs_version 2_11_0 %define release 3jpp %define section free +Name: xerces-j2 Version: 2.11.0 Release: 0 Summary: Java XML parser @@ -34,8 +32,6 @@ Source2: %{name}-version.sh Source3: %{name}-version.1 Source4: %{name}-constants.sh Source5: %{name}-constants.1 -Provides: jaxp_parser_impl -PreReq: update-alternatives /bin/ln # 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. @@ -44,8 +40,11 @@ BuildRequires: java-1_5_0-gcj-compat-devel #!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 @@ -94,8 +93,6 @@ Implementation page. This package contains demonstration and sample files for Xerces2. - - %package scripts Summary: Additional utility scripts for xerces-j2 Group: Development/Libraries/Java @@ -124,16 +121,15 @@ Implementation page. 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 +%description update-alternativesxml-resolver xml-commons is focused on common code and guidelines for xml projects. The first focus will be to organize and have common packaging for the various externally-defined standards code relating to XML - things like @@ -141,16 +137,15 @@ the DOM, SAX, and JAXP interfaces. 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 +%description xml-apis xml-commons is focused on common code and guidelines for xml projects. Its first focus will be to organize and have common packaging for the various externally-defined standards code relating to XML - things like @@ -162,12 +157,10 @@ subprojects. This package contains the APIs subproject of xml-commons. - - %prep %setup -q -n xerces-%{cvs_version} %setup -q -T -a 1 -D -n xerces-%{cvs_version} -%setup -T -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 @@ -186,62 +179,62 @@ sh build.sh jars %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 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}-version -cp -p %{SOURCE4} $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 + %{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 @@ -270,6 +263,6 @@ ln -s %{_sysconfdir}/alternatives \ %files scripts %defattr(0755,root,root,0755) %{_bindir}/* -/usr/share/man/man1/* +%{_mandir}/man1/* %changelog