November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit xml-commons for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package xml-commons for openSUSE:Factory checked in at Mon Nov 15 17:41:55 CET 2010. -------- --- xml-commons/xml-commons-apis-bootstrap.changes 2010-09-02 14:47:00.000000000 +0200 +++ xml-commons/xml-commons-apis-bootstrap.changes 2010-11-02 16:31:43.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 2 15:28:42 UTC 2010 - mvyskocil(a)suse.cz + +- merge with xml-commons-1.3.04-5.jpp5.src.rpm + * include xml-commons-resolver + +------------------------------------------------------------------- --- xml-commons/xml-commons.changes 2010-09-02 14:47:01.000000000 +0200 +++ xml-commons/xml-commons.changes 2010-11-08 10:42:33.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Nov 2 15:27:37 UTC 2010 - mvyskocil(a)suse.cz + +- merge spec file with xml-commons-1.3.04-5.jpp5.src.rpm + * add external-1.2.04 and 1.3.04 + * include the resolver + * new subpackages - which[10-11], resolver[10-12], + jaxp-1.[1-3]-apis + * old xml-commons-apis is now provided by xml-commons-jaxp-1.3-apis + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- README.PACKAGER.xml-commons-external xml-commons-externals.tar.bz2 xml-commons-jdk5-build.patch xml-commons.build.patch xml-commons.manifest.patch xml-commons.which.script New: ---- xml-apis-1.3.04.pom xml-apis-ext-1.3.04.pom xml-commons-component-info.xml xml-commons-enum.patch xml-commons-external-1.2.04.tar.bz2 xml-commons-external-1.3-build_xml.patch xml-commons-external-1.3.04.tar.bz2 xml-commons-resolver-1.1-build_xml.patch xml-commons-resolver-1.1.b1.tar.bz2 xml-commons-resolver-CatalogManager.properties xml-commons-resolver-crosslink.patch xml-commons-resolver10-resolver.1 xml-commons-resolver10-resolver.sh xml-commons-resolver10-xparse.1 xml-commons-resolver10-xparse.sh xml-commons-resolver10-xread.1 xml-commons-resolver10-xread.sh xml-commons-resolver11-resolver.1 xml-commons-resolver11-resolver.sh xml-commons-resolver11-xparse.1 xml-commons-resolver11-xparse.sh xml-commons-resolver11-xread.1 xml-commons-resolver11-xread.sh xml-commons-resolver12-resolver.1 xml-commons-resolver12-resolver.sh xml-commons-resolver12-xparse.1 xml-commons-resolver12-xparse.sh xml-commons-resolver12-xread.1 xml-commons-resolver12-xread.sh xml-commons.which10.script xml-commons.which11.script ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xml-commons-apis-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.b8Miap/_old 2010-11-15 17:28:49.000000000 +0100 +++ /var/tmp/diff_new_pack.b8Miap/_new 2010-11-15 17:28:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xml-commons-apis-bootstrap (Version 1.3) +# spec file for package xml-commons-apis-bootstrap (Version 1.3.04) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,87 +17,88 @@ # norootforbuild - -Name: xml-commons-apis-bootstrap -#!BuildIgnore: antlr antlr-java -BuildRequires: antlr-bootstrap fastjar gcc-gij gcc-java java-1_4_2-gcj-compat java-1_4_2-gcj-compat-devel unzip zip -%if %{?!suse_version:1}0 -%if %{?!mandriva_release:1}0 -BuildRequires: chkconfig which -%endif -%else -BuildRequires: update-alternatives -%endif -%if %{undefined _jvmdir} -%define _jvmdir %{_libdir}/jvm -%endif -%if %{undefined _jvmjardir} -%define _jvmjardir %{_libdir}/jvm-exports -%endif %define xml_commons_version 1.0.b2 %define real_name xml-commons %define apis_jar %{real_name}-apis-bootstrap %define which_jar %{real_name}-which-bootstrap +%define resolver_jar %{real_name}-resolver-bootstrap + +Name: xml-commons-apis-bootstrap +Version: 1.3.04 +Release: 1 Summary: Common code for XML projects - bootstrapping package -Version: 1.3 -Release: 268 -# ... externals have to be checked out with svn ... see README.PACKAGER.xml-commons-external -Url: http://xml.apache.org/commons/ -License: ASLv.. Group: Development/Libraries/Java -AutoReqProv: on -Source0: %{real_name}-%{xml_commons_version}.tar.bz2 -Source1: %{real_name}-externals.tar.bz2 -# files for the source package -Source42: README.PACKAGER.xml-commons-external -# to be consistent with xml-commons.spec -Patch2: xml-commons-jdk5-build.patch +License: ASL 2.0 +Url: http://xml.apache.org/commons/ +# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-1_0_b2/ +Source0: xml-commons-1.0.b2.tar.bz2 +# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_2_0… +Source1: xml-commons-external-1.2.04.tar.bz2 +# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_0… +Source2: xml-commons-external-1.3.04.tar.bz2 +# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-resolver-1_1_b… +Source3: xml-commons-resolver-1.1.b1.tar.bz2 +Patch0: %{real_name}-external-1.3-build_xml.patch +Patch1: %{real_name}-resolver-crosslink.patch +Patch2: %{real_name}-resolver-1.1-build_xml.patch +Patch3: %{real_name}-enum.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -#BuildArchitectures: noarch -#ExclusiveArch: %ix86 BuildArch: noarch Provides: xml-apis +#!BuildIgnore: antlr antlr-java +BuildRequires: antlr-bootstrap +BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: update-alternatives +BuildRequires: fastjar %description This is xml-apis from the java-bootrapping-tools package. DO NOT INSTALL ... THIS IS JUST FOR PACKAGING & BOOTSTRAPPING JAVA PURPOSES!! - - %package -n xml-commons-which-bootstrap License: ASLv.. Summary: Which subproject of xml-commons Group: Development/Libraries/Java Url: http://xml.apache.org/commons/ -Version: 1.0.b2 -Release: 268 %description -n xml-commons-which-bootstrap This is xml-which from the java-bootrapping-tools package. DO NOT INSTALL ... THIS IS JUST FOR PACKAGING & BOOTSTRAPPING JAVA PURPOSES!! +%package -n xml-commons-resolver-bootstrap +License: ASLv.. +Summary: Resolver subproject of xml-commons +Group: Development/Libraries/Java +Url: http://xml.apache.org/commons/ + +%description -n xml-commons-resolver-bootstrap +This is xml-resolver from the java-bootrapping-tools package. DO NOT +INSTALL ... THIS IS JUST FOR PACKAGING & BOOTSTRAPPING JAVA PURPOSES!! %prep -#<<< package descriptions end -#>>> %prep -# xml-commons -%setup -n %{real_name}-%{version} -pushd java -# use more up to date external sources -rm -rf external -tar -jxf %{SOURCE1} -#<<< -#>>> %build -popd +# To make patches unchanged +%setup -q -T -c +%setup -q -T -D -a 0 +%setup -q -T -D -a 1 +%setup -q -T -D -a 2 +%setup -q -T -D -a 3 + +%patch1 -b .sav %patch2 -b .sav +%patch3 -b .sav +pushd xml-commons-external-1_3_* +%patch0 -b .sav +popd %build #>>> some useful functions ... used throughout bootstrap packages # variables: +pushd xml-commons-1_0_b2 TARGET_DIR=`pwd` CLASSPATH_ORIG="$CLASSPATH" LIB_GCJ="`ls %{_javadir}/libgcj-*.jar`" + #>>> delete binary file and files not needed function delBinaryFiles() { set +x @@ -109,6 +110,7 @@ set -x } #<<< + #>>> make a string with all jar files found in target folder that can be used for a classpath string # string is saved in JAR_CLASSPATH function mkTargetClasspath() { @@ -121,6 +123,7 @@ set -x } #<<< + #>>> compiles all *.java file in the current directory tree # uses mkTargetClasspath for CLASSPATH variable # uses LIB_GCJ for CLASSPATH @@ -144,6 +147,7 @@ set -x } #<<< + #>>> make jar archive # PARAM#1: name of jar archive (without .jar suffix) # uses $TARGET_DIR to move created jar to @@ -153,32 +157,49 @@ mv ${1}.jar $TARGET_DIR } #<<< + COMPILER_COMMAND="javac -C -ftarget=1.4 -classpath " + #<<< end functions + delBinaryFiles #>>> xml-apis and xml-which # compile external files + cd java/external/src compileFiles mkJar %{apis_jar} delBinaryFiles + # compile the rest cd ../../src/ -# we use the resolver classes from the resolver package and therefore delete all related resolver files: -rm -r org/apache/xml/ -rm manifest.resolver +# move resolver to an another location to create own jar/package +mkdir -p ../../resolver.src/org/apache +mv org/apache/xml/ ../../resolver.src/org/apache +mv manifest.resolver ../../resolver.src compileFiles mkJar %{which_jar} delBinaryFiles + +# compile the resolver +cd ../../resolver.src/ +# move resolver to an another location to create own jar/package +compileFiles +mkJar %{resolver_jar} +delBinaryFiles #<<< xml-commons end #<<< build end -#>>> %install +popd %install +#>>> % install +pushd xml-commons-1_0_b2 mkdir -p $RPM_BUILD_ROOT/%{_javadir} cp %{apis_jar}.jar $RPM_BUILD_ROOT/%{_javadir} cp %{which_jar}.jar $RPM_BUILD_ROOT/%{_javadir} +cp %{resolver_jar}.jar $RPM_BUILD_ROOT/%{_javadir} #<<< install end +popd %clean rm -rf $RPM_BUILD_ROOT @@ -186,13 +207,18 @@ %files %defattr(-,root,root) -#%dir %{_javadir} +%doc xml-commons-1_0_b2/LICENSE.txt %{_javadir}/%{apis_jar}.jar %files -n xml-commons-which-bootstrap %defattr(-,root,root) -#%dir %{_javadir} +%doc xml-commons-1_0_b2/LICENSE.txt %{_javadir}/%{which_jar}.jar + +%files -n xml-commons-resolver-bootstrap +%defattr(-,root,root) +%doc xml-commons-1_0_b2/LICENSE.txt +%{_javadir}/%{resolver_jar}.jar #<<< # vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6: ++++++ xml-commons.spec ++++++ ++++ 1203 lines (skipped) ++++ between xml-commons/xml-commons.spec ++++ and xml-commons/xml-commons.spec ++++++ xml-commons-1.0.b2.tar.bz2 ++++++ ++++ 380395 lines of diff (skipped) ++++++ xml-commons-component-info.xml ++++++ <project name="apache-xerces-component-info">    <component id="apache-xml-commons" licenseType="apache-2.0" version="@VERSION@" projectHome="http://xml.apache.org/commons/" description="Common code for XML projects" scm=":ext:cvs.devel.redhat.com:/cvs/dist/xml-commons" tag="@TAG@">  <artifact id="resolver.jar"/> <artifact id="xml-apis.jar"/> <export> <include input="resolver.jar"/> <include input="xml-apis.jar"/> </export> </component> </project> ++++++ xml-commons-enum.patch ++++++ --- xml-commons-1_0_b2/java/src/org/apache/env/Which.java.orig 2008-04-25 16:26:14.000000000 -0400 +++ xml-commons-1_0_b2/java/src/org/apache/env/Which.java 2008-04-25 16:27:21.000000000 -0400 @@ -289,12 +289,12 @@ public class Which if (null == hash) return; - Enumeration enum = hash.keys(); + Enumeration myEnum = hash.keys(); Vector v = new Vector(); - while (enum.hasMoreElements()) + while (myEnum.hasMoreElements()) { - Object key = enum.nextElement(); + Object key = myEnum.nextElement(); String keyStr = key.toString(); Object item = hash.get(key); @@ -311,12 +311,12 @@ public class Which } } - enum = v.elements(); + myEnum = v.elements(); - while (enum.hasMoreElements()) + while (myEnum.hasMoreElements()) { - String n = (String) enum.nextElement(); - Hashtable h = (Hashtable) enum.nextElement(); + String n = (String) myEnum.nextElement(); + Hashtable h = (Hashtable) myEnum.nextElement(); reportHashtable(h, n, out); } --- xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java.orig 2008-04-25 16:44:12.000000000 -0400 +++ xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java 2008-04-25 16:45:44.000000000 -0400 @@ -451,9 +451,9 @@ public class Catalog { mapArr.add(null); } - Enumeration enum = readerMap.keys(); - while (enum.hasMoreElements()) { - String mimeType = (String) enum.nextElement(); + Enumeration myEnum = readerMap.keys(); + while (myEnum.hasMoreElements()) { + String mimeType = (String) myEnum.nextElement(); Integer pos = (Integer) readerMap.get(mimeType); mapArr.set(pos.intValue(), mimeType); } @@ -1064,9 +1064,9 @@ public class Catalog { } // Parse all the DELEGATE catalogs - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == DELEGATE_PUBLIC || e.getEntryType() == DELEGATE_SYSTEM || e.getEntryType() == DELEGATE_URI) { @@ -1140,9 +1140,9 @@ public class Catalog { // If there's a DOCTYPE entry in this catalog, use it boolean over = default_override; - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; @@ -1178,9 +1178,9 @@ public class Catalog { Debug.message(3, "resolveDocument"); - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == DOCUMENT) { return e.getEntryArg(1); //FIXME check this } @@ -1253,9 +1253,9 @@ public class Catalog { // If there's a ENTITY entry in this catalog, use it boolean over = default_override; - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; @@ -1339,9 +1339,9 @@ public class Catalog { // If there's a NOTATION entry in this catalog, use it boolean over = default_override; - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; @@ -1498,9 +1498,9 @@ public class Catalog { // If there's a PUBLIC entry in this catalog, use it boolean over = default_override; - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; @@ -1516,10 +1516,10 @@ public class Catalog { // If there's a DELEGATE_PUBLIC entry in this catalog, use it over = default_override; - enum = catalogEntries.elements(); + myEnum = catalogEntries.elements(); Vector delCats = new Vector(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; @@ -1624,9 +1624,9 @@ public class Catalog { String osname = System.getProperty("os.name"); boolean windows = (osname.indexOf("Windows") >= 0); - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == SYSTEM && (e.getEntryArg(0).equals(systemId) || (windows @@ -1636,11 +1636,11 @@ public class Catalog { } // If there's a REWRITE_SYSTEM entry in this catalog, use it - enum = catalogEntries.elements(); + myEnum = catalogEntries.elements(); String startString = null; String prefix = null; - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == REWRITE_SYSTEM) { String p = (String) e.getEntryArg(0); @@ -1662,10 +1662,10 @@ public class Catalog { } // If there's a DELEGATE_SYSTEM entry in this catalog, use it - enum = catalogEntries.elements(); + myEnum = catalogEntries.elements(); Vector delCats = new Vector(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == DELEGATE_SYSTEM) { String p = (String) e.getEntryArg(0); @@ -1759,9 +1759,9 @@ public class Catalog { */ protected String resolveLocalURI(String uri) throws MalformedURLException, IOException { - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == URI && (e.getEntryArg(0).equals(uri))) { return e.getEntryArg(1); @@ -1769,11 +1769,11 @@ public class Catalog { } // If there's a REWRITE_URI entry in this catalog, use it - enum = catalogEntries.elements(); + myEnum = catalogEntries.elements(); String startString = null; String prefix = null; - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == REWRITE_URI) { String p = (String) e.getEntryArg(0); @@ -1795,10 +1795,10 @@ public class Catalog { } // If there's a DELEGATE_URI entry in this catalog, use it - enum = catalogEntries.elements(); + myEnum = catalogEntries.elements(); Vector delCats = new Vector(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == DELEGATE_URI) { String p = (String) e.getEntryArg(0); --- xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java.orig 2008-04-25 16:46:39.000000000 -0400 +++ xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java 2008-04-25 16:47:01.000000000 -0400 @@ -215,9 +215,9 @@ public class Resolver extends Catalog { return resolved; } - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == RESOLVER) { resolved = resolveExternalSystem(uri, e.getEntryArg(0)); if (resolved != null) { @@ -272,9 +272,9 @@ public class Resolver extends Catalog { return resolved; } - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == RESOLVER) { resolved = resolveExternalSystem(systemId, e.getEntryArg(0)); if (resolved != null) { @@ -334,9 +334,9 @@ public class Resolver extends Catalog { return resolved; } - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == RESOLVER) { if (systemId != null) { resolved = resolveExternalSystem(systemId, @@ -575,9 +575,9 @@ public class Resolver extends Catalog { Vector map = new Vector(); String osname = System.getProperty("os.name"); boolean windows = (osname.indexOf("Windows") >= 0); - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == SYSTEM && (e.getEntryArg(0).equals(systemId) || (windows @@ -603,9 +603,9 @@ public class Resolver extends Catalog { Vector map = new Vector(); String osname = System.getProperty("os.name"); boolean windows = (osname.indexOf("Windows") >= 0); - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == SYSTEM && (e.getEntryArg(1).equals(systemId) || (windows --- xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java.orig 2008-04-25 16:59:11.000000000 -0400 +++ xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java 2008-04-25 17:00:06.000000000 -0400 @@ -486,9 +486,9 @@ public class Catalog { mapArr.add(null); } - Enumeration enum = readerMap.keys(); - while (enum.hasMoreElements()) { - String mimeType = (String) enum.nextElement(); + Enumeration myEnum = readerMap.keys(); + while (myEnum.hasMoreElements()) { + String mimeType = (String) myEnum.nextElement(); Integer pos = (Integer) readerMap.get(mimeType); mapArr.set(pos.intValue(), mimeType); } @@ -1152,9 +1152,9 @@ public class Catalog { } // Parse all the DELEGATE catalogs - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == DELEGATE_PUBLIC || e.getEntryType() == DELEGATE_SYSTEM || e.getEntryType() == DELEGATE_URI) { @@ -1228,9 +1228,9 @@ public class Catalog { // If there's a DOCTYPE entry in this catalog, use it boolean over = default_override; - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; @@ -1266,9 +1266,9 @@ public class Catalog { catalogManager.debug.message(3, "resolveDocument"); - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == DOCUMENT) { return e.getEntryArg(1); //FIXME check this } @@ -1341,9 +1341,9 @@ public class Catalog { // If there's a ENTITY entry in this catalog, use it boolean over = default_override; - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; @@ -1427,9 +1427,9 @@ public class Catalog { // If there's a NOTATION entry in this catalog, use it boolean over = default_override; - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; @@ -1586,9 +1586,9 @@ public class Catalog { // If there's a PUBLIC entry in this catalog, use it boolean over = default_override; - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; @@ -1604,10 +1604,10 @@ public class Catalog { // If there's a DELEGATE_PUBLIC entry in this catalog, use it over = default_override; - enum = catalogEntries.elements(); + myEnum = catalogEntries.elements(); Vector delCats = new Vector(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; @@ -1712,9 +1712,9 @@ public class Catalog { String osname = System.getProperty("os.name"); boolean windows = (osname.indexOf("Windows") >= 0); - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == SYSTEM && (e.getEntryArg(0).equals(systemId) || (windows @@ -1724,11 +1724,11 @@ public class Catalog { } // If there's a REWRITE_SYSTEM entry in this catalog, use it - enum = catalogEntries.elements(); + myEnum = catalogEntries.elements(); String startString = null; String prefix = null; - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == REWRITE_SYSTEM) { String p = (String) e.getEntryArg(0); @@ -1750,10 +1750,10 @@ public class Catalog { } // If there's a DELEGATE_SYSTEM entry in this catalog, use it - enum = catalogEntries.elements(); + myEnum = catalogEntries.elements(); Vector delCats = new Vector(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == DELEGATE_SYSTEM) { String p = (String) e.getEntryArg(0); @@ -1846,9 +1846,9 @@ public class Catalog { */ protected String resolveLocalURI(String uri) throws MalformedURLException, IOException { - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == URI && (e.getEntryArg(0).equals(uri))) { return e.getEntryArg(1); @@ -1856,11 +1856,11 @@ public class Catalog { } // If there's a REWRITE_URI entry in this catalog, use it - enum = catalogEntries.elements(); + myEnum = catalogEntries.elements(); String startString = null; String prefix = null; - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == REWRITE_URI) { String p = (String) e.getEntryArg(0); @@ -1882,10 +1882,10 @@ public class Catalog { } // If there's a DELEGATE_URI entry in this catalog, use it - enum = catalogEntries.elements(); + myEnum = catalogEntries.elements(); Vector delCats = new Vector(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == DELEGATE_URI) { String p = (String) e.getEntryArg(0); --- xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java.orig 2008-04-25 17:00:51.000000000 -0400 +++ xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java 2008-04-25 17:01:13.000000000 -0400 @@ -197,9 +197,9 @@ public class Resolver extends Catalog { return resolved; } - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == RESOLVER) { resolved = resolveExternalSystem(uri, e.getEntryArg(0)); if (resolved != null) { @@ -254,9 +254,9 @@ public class Resolver extends Catalog { return resolved; } - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == RESOLVER) { resolved = resolveExternalSystem(systemId, e.getEntryArg(0)); if (resolved != null) { @@ -316,9 +316,9 @@ public class Resolver extends Catalog { return resolved; } - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == RESOLVER) { if (systemId != null) { resolved = resolveExternalSystem(systemId, @@ -557,9 +557,9 @@ public class Resolver extends Catalog { Vector map = new Vector(); String osname = System.getProperty("os.name"); boolean windows = (osname.indexOf("Windows") >= 0); - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == SYSTEM && (e.getEntryArg(0).equals(systemId) || (windows @@ -585,9 +585,9 @@ public class Resolver extends Catalog { Vector map = new Vector(); String osname = System.getProperty("os.name"); boolean windows = (osname.indexOf("Windows") >= 0); - Enumeration enum = catalogEntries.elements(); - while (enum.hasMoreElements()) { - CatalogEntry e = (CatalogEntry) enum.nextElement(); + Enumeration myEnum = catalogEntries.elements(); + while (myEnum.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) myEnum.nextElement(); if (e.getEntryType() == SYSTEM && (e.getEntryArg(1).equals(systemId) || (windows ++++++ xml-commons-external-1.3-build_xml.patch ++++++ --- build.xml.sav 2005-07-14 04:23:37.000000000 +0200 +++ build.xml 2006-03-22 11:16:11.000000000 +0100 @@ -75,7 +75,9 @@ description="Calls all other java build files."> <ant dir="java" antfile="which.xml" target="all" > </ant> - <ant dir="java" antfile="resolver.xml" target="all" > + <ant dir="java" antfile="resolver.xml" target="jar" > + </ant> + <ant dir="java" antfile="resolver.xml" target="javadocs" > </ant> </target> ++++++ xml-commons-resolver-1.1-build_xml.patch ++++++ --- xml-commons-resolver-1_1_b1/build.xml.sav 2003-09-25 20:15:25.000000000 +0200 +++ xml-commons-resolver-1_1_b1/build.xml 2006-03-31 20:30:38.000000000 +0200 @@ -62,11 +62,10 @@ </target> <target name="jars" - depends="external" description="Calls all other java build files."> - <ant dir="java" antfile="which.xml" target="all" > + <ant dir="java" antfile="resolver.xml" target="jar" > </ant> - <ant dir="java" antfile="resolver.xml" target="all" > + <ant dir="java" antfile="resolver.xml" target="javadocs" > </ant> </target> ++++++ xml-commons-resolver-CatalogManager.properties ++++++ # Central CatalogManager.properties for xml-commons-resolver # JPackage Project <http://www.jpackage.org/> ######################################################################## # CatalogManager provides an interface to the catalog properties. # Properties can come from two places: from system properties or # from a CatalogManager.properties file. This class provides a # transparent interface to both, with system properties preferred # over property file values. ####################################################################### # Catalog Files: # The semicolon-delimited list of catalog files. # Example: catalogs=./xcatalog;/share/doctypes/catalog catalogs=/etc/xml/catalog;/etc/sgml/catalog ####################################################################### # Relative Catalogs: # If false, relative catalog URIs are made absolute with respect to the # base URI of the CatalogManager.properties file. This setting only # applies to catalog URIs obtained from the catalogs property in the # CatalogManager.properties file # Example: relative-catalogs = [yes|no] relative-catalogs=no ####################################################################### # Verbosity: # If non-zero, the Catalog classes will print informative and debugging # messages. The higher the number, the more messages. # Example: verbosity = [0..99] verbosity=0 ####################################################################### # Prefer: # Which identifier is preferred, "public" or "system"? # Example: xml.catalog.prefer = [public|system] prefer=public ####################################################################### # Static-catalog: # Should a single catalog be constructed for all parsing, or should a # different catalog be created for each parser? # Example: static-catalog = [yes|no] static-catalog=yes ####################################################################### # Allow-oasis-xml-catalog-pi # If the source document contains "oasis-xml-catalog" processing # instructions, should they be used? # Example: allow-oasis-xml-catalog-pi = [yes|no] allow-oasis-xml-catalog-pi=yes ####################################################################### # catalog-class-name # If you're using the convenience classes # org.apache.xml.resolver.tools.*, this setting allows you to specify # an alternate class name to use for the underlying catalog. # Example: catalog-class-name=org.apache.xml.resolver.Resolver ++++++ xml-commons-resolver-crosslink.patch ++++++ --- xml-commons-1_0_b2/java/resolver.xml.sav 2006-03-24 19:01:42.000000000 +0100 +++ xml-commons-1_0_b2/java/resolver.xml 2006-03-24 19:03:36.000000000 +0100 @@ -51,6 +51,8 @@ <property name="copyright.message" value="Copyright © ${copyright.date} ${company.name}. All Rights Reserved."/> + <property name="j2se.apidoc" value="http://java.sun.com/j2se/1.4.2/docs/api/"/> +  <target name="main" depends="all, check" @@ -124,6 +126,7 @@ <package name="org.apache.xml.resolver.readers"/> <package name="org.apache.xml.resolver.tools"/> <package name="org.apache.xml.resolver.apps"/> + <link href="${j2se.apidoc}"/> </javadoc> </target> --- xml-commons-external-1_3_04/java/resolver.xml.sav 2006-03-24 19:01:27.000000000 +0100 +++ xml-commons-external-1_3_04/java/resolver.xml 2006-03-24 19:04:22.000000000 +0100 @@ -68,6 +68,8 @@ <property name="copyright.message" value="Copyright © ${copyright.date} ${company.name}. All Rights Reserved."/> + <property name="j2se.apidoc" value="http://java.sun.com/j2se/1.4.2/docs/api/"/> +  <target name="main" depends="all,check" @@ -154,6 +156,7 @@ <package name="org.apache.xml.resolver.readers"/> <package name="org.apache.xml.resolver.tools"/> <package name="org.apache.xml.resolver.apps"/> + <link href="${j2se.apidoc}"/> </javadoc> </target> ++++++ xml-commons-resolver10-resolver.1 ++++++ .TH XML-RESOLVER "1" "July 2004" "1.1" "User Commands" .SH NAME xml-resolver \- Resolve XML entities and URIs .SH SYNOPSIS .B xml-resolver \fR[\fIoptions\fR] \fIkeyword\fR .SH DESCRIPTION xml-resolver is a simple command line XML entity and URI resolver. It takes a number of parameters and passes them through the actual resolver class, and prints out the result. .PP The keyword argument identifies the type of resolution to perform, it must be one of "doctype", "document", "entity", "notation", "public", "system", or "uri". .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-n\fR \fIname\fR Set the name. .TP \fB\-p\fR \fIpublicid\fR Set the public identifier. .TP \fB\-s\fR \fIsystemid\fR Set the system identifier. .TP \fB\-a\fR Make the system URI absolute before resolution. .TP \fB\-u\fR \fIuri\fR Set the URI. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). The default is 0. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-resolver\fR. .SH "SEE ALSO" .BR xml-xread (1), .BR xml-xparse (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh(a)Sun.COM> ++++++ xml-commons-resolver10-resolver.sh ++++++ #!/bin/sh # # xml-commons-resolver resolver script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.resolver BASE_JARS="xml-commons-resolver10.jar xml-commons-jaxp-1.1-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver10-xparse.1 ++++++ .TH XML-XPARSE "1" "July 2004" "1.1" "User Commands" .SH NAME xml-xparse \- Parse XML documents with entity and URI resolution .SH SYNOPSIS .B xml-xparse \fR[\fIoptions\fR] \fIxmlfile\fR .SH DESCRIPTION xml-xparse is a simple command line tool for parsing and validating XML documents. It is not an actual XML parser, it just wraps around a JAXP Parser, adding support for catalog-based entity and URI resolution. .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-v\fR Perform a validating parse. This is the default. .TP \fB\-w\fR Perform a well-formed parse, not a validating parse. .TP \fB\-N\fR Perform a namespace-aware parse. This is the default. .TP \fB\-n\fR Perform a namespace-ignorant parse. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). Warnings are shown if the debug level is set to greater than 2. .TP \fB\-E\fR \fImaxerrors\fR Set the maximum number of errors to display. The default is 10. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-xparse\fR. .SH "SEE ALSO" .BR xml-xread (1), .BR xml-resolver (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh(a)Sun.COM> ++++++ xml-commons-resolver10-xparse.sh ++++++ #!/bin/sh # # xml-commons-resolver xparse script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.xparse BASE_JARS="xml-commons-resolver10.jar xml-commons-jaxp-1.1-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver10-xread.1 ++++++ .TH XML-XREAD "1" "July 2004" "1.1" "User Commands" .SH NAME xml-xread \- Parse XML documents with entity and URI resolution .SH SYNOPSIS .B xml-xread \fR[\fIoptions\fR] \fIxmlfile\fR .SH DESCRIPTION xml-xread is a simple command line tool for parsing and validating XML documents. It is not an actual XML parser, it just wraps around a JAXP XMLReader, adding support for catalog-based entity and URI resolution. .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-v\fR Perform a validating parse. This is the default. .TP \fB\-w\fR Perform a well-formed parse, not a validating parse. .TP \fB\-N\fR Perform a namespace-aware parse. This is the default. .TP \fB\-n\fR Perform a namespace-ignorant parse. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). Warnings are shown if the debug level is set to greater than 2. .TP \fB\-E\fR \fImaxerrors\fR Set the maximum number of errors to display. The default is 10. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-xread\fR. .SH "SEE ALSO" .BR xml-parse (1), .BR xml-resolver (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh(a)Sun.COM> ++++++ xml-commons-resolver10-xread.sh ++++++ #!/bin/sh # # xml-commons-resolver xread script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.xread BASE_JARS="xml-commons-resolver10.jar xml-commons-jaxp-1.1-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver11-resolver.1 ++++++ .TH XML-RESOLVER "1" "July 2004" "1.1" "User Commands" .SH NAME xml-resolver \- Resolve XML entities and URIs .SH SYNOPSIS .B xml-resolver \fR[\fIoptions\fR] \fIkeyword\fR .SH DESCRIPTION xml-resolver is a simple command line XML entity and URI resolver. It takes a number of parameters and passes them through the actual resolver class, and prints out the result. .PP The keyword argument identifies the type of resolution to perform, it must be one of "doctype", "document", "entity", "notation", "public", "system", or "uri". .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-n\fR \fIname\fR Set the name. .TP \fB\-p\fR \fIpublicid\fR Set the public identifier. .TP \fB\-s\fR \fIsystemid\fR Set the system identifier. .TP \fB\-a\fR Make the system URI absolute before resolution. .TP \fB\-u\fR \fIuri\fR Set the URI. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). The default is 0. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-resolver\fR. .SH "SEE ALSO" .BR xml-xread (1), .BR xml-xparse (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh(a)Sun.COM> ++++++ xml-commons-resolver11-resolver.sh ++++++ #!/bin/sh # # xml-commons-resolver resolver script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.resolver BASE_JARS="xml-commons-resolver11.jar xml-commons-jaxp-1.2-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver11-xparse.1 ++++++ .TH XML-XPARSE "1" "July 2004" "1.1" "User Commands" .SH NAME xml-xparse \- Parse XML documents with entity and URI resolution .SH SYNOPSIS .B xml-xparse \fR[\fIoptions\fR] \fIxmlfile\fR .SH DESCRIPTION xml-xparse is a simple command line tool for parsing and validating XML documents. It is not an actual XML parser, it just wraps around a JAXP Parser, adding support for catalog-based entity and URI resolution. .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-v\fR Perform a validating parse. This is the default. .TP \fB\-w\fR Perform a well-formed parse, not a validating parse. .TP \fB\-N\fR Perform a namespace-aware parse. This is the default. .TP \fB\-n\fR Perform a namespace-ignorant parse. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). Warnings are shown if the debug level is set to greater than 2. .TP \fB\-E\fR \fImaxerrors\fR Set the maximum number of errors to display. The default is 10. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-xparse\fR. .SH "SEE ALSO" .BR xml-xread (1), .BR xml-resolver (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh(a)Sun.COM> ++++++ xml-commons-resolver11-xparse.sh ++++++ #!/bin/sh # # xml-commons-resolver xparse script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.xparse BASE_JARS="xml-commons-resolver11.jar xml-commons-jaxp-1.2-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver11-xread.1 ++++++ .TH XML-XREAD "1" "July 2004" "1.1" "User Commands" .SH NAME xml-xread \- Parse XML documents with entity and URI resolution .SH SYNOPSIS .B xml-xread \fR[\fIoptions\fR] \fIxmlfile\fR .SH DESCRIPTION xml-xread is a simple command line tool for parsing and validating XML documents. It is not an actual XML parser, it just wraps around a JAXP XMLReader, adding support for catalog-based entity and URI resolution. .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-v\fR Perform a validating parse. This is the default. .TP \fB\-w\fR Perform a well-formed parse, not a validating parse. .TP \fB\-N\fR Perform a namespace-aware parse. This is the default. .TP \fB\-n\fR Perform a namespace-ignorant parse. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). Warnings are shown if the debug level is set to greater than 2. .TP \fB\-E\fR \fImaxerrors\fR Set the maximum number of errors to display. The default is 10. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-xread\fR. .SH "SEE ALSO" .BR xml-parse (1), .BR xml-resolver (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh(a)Sun.COM> ++++++ xml-commons-resolver11-xread.sh ++++++ #!/bin/sh # # xml-commons-resolver xread script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.xread BASE_JARS="xml-commons-resolver11.jar xml-commons-jaxp-1.2-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver12-resolver.1 ++++++ .TH XML-RESOLVER "1" "July 2004" "1.1" "User Commands" .SH NAME xml-resolver \- Resolve XML entities and URIs .SH SYNOPSIS .B xml-resolver \fR[\fIoptions\fR] \fIkeyword\fR .SH DESCRIPTION xml-resolver is a simple command line XML entity and URI resolver. It takes a number of parameters and passes them through the actual resolver class, and prints out the result. .PP The keyword argument identifies the type of resolution to perform, it must be one of "doctype", "document", "entity", "notation", "public", "system", or "uri". .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-n\fR \fIname\fR Set the name. .TP \fB\-p\fR \fIpublicid\fR Set the public identifier. .TP \fB\-s\fR \fIsystemid\fR Set the system identifier. .TP \fB\-a\fR Make the system URI absolute before resolution. .TP \fB\-u\fR \fIuri\fR Set the URI. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). The default is 0. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-resolver\fR. .SH "SEE ALSO" .BR xml-xread (1), .BR xml-xparse (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh(a)Sun.COM> ++++++ xml-commons-resolver12-resolver.sh ++++++ #!/bin/sh # # xml-commons-resolver resolver script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.resolver BASE_JARS="xml-commons-resolver12.jar xml-commons-jaxp-1.3-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver12-xparse.1 ++++++ .TH XML-XPARSE "1" "July 2004" "1.1" "User Commands" .SH NAME xml-xparse \- Parse XML documents with entity and URI resolution .SH SYNOPSIS .B xml-xparse \fR[\fIoptions\fR] \fIxmlfile\fR .SH DESCRIPTION xml-xparse is a simple command line tool for parsing and validating XML documents. It is not an actual XML parser, it just wraps around a JAXP Parser, adding support for catalog-based entity and URI resolution. .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-v\fR Perform a validating parse. This is the default. .TP \fB\-w\fR Perform a well-formed parse, not a validating parse. .TP \fB\-N\fR Perform a namespace-aware parse. This is the default. .TP \fB\-n\fR Perform a namespace-ignorant parse. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). Warnings are shown if the debug level is set to greater than 2. .TP \fB\-E\fR \fImaxerrors\fR Set the maximum number of errors to display. The default is 10. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-xparse\fR. .SH "SEE ALSO" .BR xml-xread (1), .BR xml-resolver (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh(a)Sun.COM> ++++++ xml-commons-resolver12-xparse.sh ++++++ #!/bin/sh # # xml-commons-resolver xparse script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.xparse BASE_JARS="xml-commons-resolver12.jar xml-commons-jaxp-1.3-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver12-xread.1 ++++++ .TH XML-XREAD "1" "July 2004" "1.1" "User Commands" .SH NAME xml-xread \- Parse XML documents with entity and URI resolution .SH SYNOPSIS .B xml-xread \fR[\fIoptions\fR] \fIxmlfile\fR .SH DESCRIPTION xml-xread is a simple command line tool for parsing and validating XML documents. It is not an actual XML parser, it just wraps around a JAXP XMLReader, adding support for catalog-based entity and URI resolution. .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-v\fR Perform a validating parse. This is the default. .TP \fB\-w\fR Perform a well-formed parse, not a validating parse. .TP \fB\-N\fR Perform a namespace-aware parse. This is the default. .TP \fB\-n\fR Perform a namespace-ignorant parse. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). Warnings are shown if the debug level is set to greater than 2. .TP \fB\-E\fR \fImaxerrors\fR Set the maximum number of errors to display. The default is 10. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-xread\fR. .SH "SEE ALSO" .BR xml-parse (1), .BR xml-resolver (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh(a)Sun.COM> ++++++ xml-commons-resolver12-xread.sh ++++++ #!/bin/sh # # xml-commons-resolver xread script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.xread BASE_JARS="xml-commons-resolver12.jar xml-commons-jaxp-1.3-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons.which.script -> xml-commons.which10.script ++++++ --- xml-commons/xml-commons.which.script 2006-04-21 16:25:16.000000000 +0200 +++ xml-commons/xml-commons.which10.script 2008-10-03 13:41:47.000000000 +0200 @@ -14,8 +14,8 @@ # Configuration MAIN_CLASS=org.apache.env.Which -BASE_JARS=xml-commons-which.jar -CLASSPATH="$CLASSPATH:$(build-classpath ant xerces-j2 crimson xalan-j2 xalan-j1 xml-commons-apis 2>/dev/null)" || : +BASE_JARS=xml-commons-which10.jar +CLASSPATH="$CLASSPATH:$(build-classpath ant ant-launcher xerces-j2 crimson xalan-j2 xalan-j1 xml-commons-jaxp-1.1-apis 2>/dev/null)" || : # Set parameters set_jvm ++++++ xml-commons.which.script -> xml-commons.which11.script ++++++ --- xml-commons/xml-commons.which.script 2006-04-21 16:25:16.000000000 +0200 +++ xml-commons/xml-commons.which11.script 2008-10-03 13:41:48.000000000 +0200 @@ -14,8 +14,8 @@ # Configuration MAIN_CLASS=org.apache.env.Which -BASE_JARS=xml-commons-which.jar -CLASSPATH="$CLASSPATH:$(build-classpath ant xerces-j2 crimson xalan-j2 xalan-j1 xml-commons-apis 2>/dev/null)" || : +BASE_JARS=xml-commons-which11.jar +CLASSPATH="$CLASSPATH:$(build-classpath ant ant-launcher xerces-j2 crimson xalan-j2 xalan-j1 xml-commons-jaxp-1.3-apis 2>/dev/null)" || : # Set parameters set_jvm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit doxygen for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package doxygen for openSUSE:Factory checked in at Mon Nov 15 17:28:15 CET 2010. -------- --- doxygen/doxygen.changes 2010-10-11 16:08:55.000000000 +0200 +++ doxygen/doxygen.changes 2010-11-15 15:41:40.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 12 15:02:04 UTC 2010 - mseben(a)gmail.com + +- changed modify_footer.patch: drop suse specific HTML_FOOTER_DESCRIPTION + option functionality, each package could use now HTML_TIMESTAMP to + avoid putting timestamp in to generated html files + +------------------------------------------------------------------- doxywizard.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ doxygen.spec ++++++ --- /var/tmp/diff_new_pack.tzRIYl/_old 2010-11-15 17:25:05.000000000 +0100 +++ /var/tmp/diff_new_pack.tzRIYl/_new 2010-11-15 17:25:05.000000000 +0100 @@ -21,7 +21,7 @@ Name: doxygen BuildRequires: bison flex gcc-c++ libpng-devel Version: 1.7.2 -Release: 1 +Release: 2 AutoReqProv: on License: GPLv2+ Group: Development/Tools/Doc Generators ++++++ doxywizard.spec ++++++ --- /var/tmp/diff_new_pack.tzRIYl/_old 2010-11-15 17:25:05.000000000 +0100 +++ /var/tmp/diff_new_pack.tzRIYl/_new 2010-11-15 17:25:05.000000000 +0100 @@ -21,7 +21,7 @@ Name: doxywizard BuildRequires: bison flex gcc-c++ libdrm-devel libjpeg-devel Version: 1.7.2 -Release: 1 +Release: 2 AutoReqProv: on Requires: doxygen = %{version} License: GPLv2+ ++++++ doxygen-1.7.0-modify_footer.patch ++++++ --- /var/tmp/diff_new_pack.tzRIYl/_old 2010-11-15 17:25:05.000000000 +0100 +++ /var/tmp/diff_new_pack.tzRIYl/_new 2010-11-15 17:25:05.000000000 +0100 @@ -1,62 +1,7 @@ -Index: src/config.xml -=================================================================== ---- src/config.xml.orig -+++ src/config.xml -@@ -762,6 +762,11 @@ The HTML_FOOTER tag can be used to speci - each generated HTML page. If it is left blank doxygen will generate a - standard footer. - ' defval='' depends='GENERATE_HTML'/> -+ <option type='bool' id='HTML_FOOTER_DESCRIPTION' docs=' -+The HTML_FOOTER_DATE_AND_PROJECT_NAME tag can be used to add build date, -+project name and Doxygen version to HTML footer. -+standard footer. -+' defval='' depends='GENERATE_HTML'/> - <option type='string' id='HTML_STYLESHEET' format='file' docs=' - The HTML_STYLESHEET tag can be used to specify a user-defined cascading - style sheet that is used by each HTML page. It can be used to -Index: src/htmlgen.cpp -=================================================================== ---- src/htmlgen.cpp.orig -+++ src/htmlgen.cpp -@@ -969,10 +969,16 @@ void HtmlGenerator::writeFooterFile(QFil - { - FTextStream t(&file); - t << "<hr class=\"footer\"/><address class=\"footer\"><small>\n"; -+ if (Config_getBool("HTML_FOOTER_DESCRIPTION")) { - t << theTranslator->trGeneratedAt( "$datetime", "$projectname" ); -- t << " <a href=\"http://www.doxygen.org/index.html\">" -+ t << " "; -+ } -+ t << "<a href=\"http://www.doxygen.org/index.html\">" - << "<img class=\"footer\" src=\"$relpath$doxygen.png\" alt=\"doxygen\"/>" -- << "</a> $doxygenversion"; -+ << "</a>"; -+ if (Config_getBool("HTML_FOOTER_DESCRIPTION")) { -+ t << " $doxygenversion"; -+ } - t << "</small></address>\n" - << "</body>\n" - << "</html>\n"; Index: src/configoptions.cpp =================================================================== --- src/configoptions.cpp.orig +++ src/configoptions.cpp -@@ -1096,6 +1096,15 @@ void addConfigOptions(Config *cfg) - cs->setWidgetType(ConfigString::File); - cs->addDependency("GENERATE_HTML"); - //---- -+ cb = cfg->addBool( -+ "HTML_FOOTER_DESCRIPTION", -+ "If the HTML_FOOTER_DESCRIPTION tag is set to YES, Doxygen will \n" -+ "add generated date, project name and doxygen version to HTML footer.", -+ FALSE -+ ); -+ //cs->setDefaultValue("FALSE"); -+ cs->addDependency("GENERATE_HTML"); -+ //---- - cs = cfg->addString( - "HTML_STYLESHEET", - "The HTML_STYLESHEET tag can be used to specify a user-defined cascading\n" @@ -1146,7 +1155,7 @@ void addConfigOptions(Config *cfg) "If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML\n" "page will contain the date and time when the page was generated. Setting\n" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bsdtar for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package bsdtar for openSUSE:Factory checked in at Mon Nov 15 17:24:52 CET 2010. -------- --- bsdtar/bsdtar.changes 2010-01-06 04:37:18.000000000 +0100 +++ bsdtar/bsdtar.changes 2010-11-11 14:42:22.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 11 13:36:59 UTC 2010 - puzel(a)novell.com + +- udpate to libarchive-2.8.4 + - see /usr/share/doc/packages/libarchive2/NEWS for changes +- drop libarchive-2.5.5_fix_testsuite.patch (upstream) +- update libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch +- clean up specfile +- disable make check for now + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libarchive-2.5.5.tar.bz2 libarchive-2.5.5_fix_testsuite.patch New: ---- libarchive-2.8.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsdtar.spec ++++++ --- /var/tmp/diff_new_pack.vZfVql/_old 2010-11-15 17:24:24.000000000 +0100 +++ /var/tmp/diff_new_pack.vZfVql/_new 2010-11-15 17:24:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package bsdtar (Version 2.5.5) +# spec file for package bsdtar (Version 2.8.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,19 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: bsdtar -Version: 2.5.5 -Release: 6 +Version: 2.8.4 +Release: 1 %define pkg_name libarchive # -License: BSD 3-clause (or similar) -Group: Development/Libraries/C and C++ +License: BSD3c(or similar) +Group: Productivity/Archiving/Compression +BuildRequires: libacl-devel +BuildRequires: pkg-config +BuildRequires: zlib-devel # BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libacl-devel zlib-devel %if 0%{?suse_version} > 1020 BuildRequires: libbz2-devel %else @@ -39,13 +40,11 @@ BuildRequires: e2fsprogs-devel %endif # -Url: http://people.freebsd.org/~kientzle/libarchive/ -# http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.ta… +Summary: Creates and reads several different streaming archive formats +# +Url: http://code.google.com/p/libarchive/ Source: libarchive-%{version}.tar.bz2 -Patch: libarchive-2.5.5_fix_testsuite.patch Patch1: libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch -# -Summary: Bsdtar is a programme that can create and read several different streaming archive formats %description Libarchive is a programming library that can create and read several @@ -58,17 +57,11 @@ This package contains the bsdtar cmdline utility. - - -Authors: --------- - Tim Kientzle <kientzle(a)freebsd.org> - %package -n libarchive2 -License: BSD 3-clause (or similar) -Group: Development/Libraries/C and C++ +License: BSD3c(or similar) # -Summary: Programming Library To Create And Read Several Different Streaming Archive Formats +Summary: Library to work with several different streaming archive formats +Group: Development/Libraries/C and C++ %description -n libarchive2 Libarchive is a programming library that can create and read several @@ -123,24 +116,19 @@ I/O. It should be very easy to add new formats, new compression methods, or new ways of reading/writing archives. - - -Authors: --------- - Tim Kientzle <kientzle(a)freebsd.org> - %package -n libarchive-devel -License: BSD 3-clause (or similar) +License: BSD3c(or similar) +Requires: libacl-devel Requires: libarchive2 = %{version} -Requires: zlib-devel libacl-devel +Requires: zlib-devel %if 0%{?suse_version} > 1020 Requires: libbz2-devel %else Requires: bzip2 %endif -Group: Development/Libraries/C and C++ # Summary: Development files for libarchive +Group: Development/Libraries/C and C++ %description -n libarchive-devel Libarchive is a programming library that can create and read several @@ -153,32 +141,27 @@ This package contains the development files. - - -Authors: --------- - Tim Kientzle <kientzle(a)freebsd.org> - %prep %setup -q -n %{pkg_name}-%{version} -%patch %patch1 %build #autoreconf -fi %configure --disable-static --enable-bsdcpio -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %check -%{__make} check +# Disabled until http://code.google.com/p/libarchive/issues/detail?id=115 +# is resolved. +#%%make check %install -%makeinstall +%make_install rm -fv minitar/*.o rm -fv %{buildroot}%{_libdir}/*.la %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %post -n libarchive2 -p /sbin/ldconfig @@ -201,5 +184,6 @@ %{_mandir}/man3/* %{_libdir}/libarchive.so %{_includedir}/archive* +%{_libdir}/pkgconfig/libarchive.pc %changelog ++++++ libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch ++++++ --- /var/tmp/diff_new_pack.vZfVql/_old 2010-11-15 17:24:24.000000000 +0100 +++ /var/tmp/diff_new_pack.vZfVql/_new 2010-11-15 17:24:24.000000000 +0100 @@ -1,40 +1,43 @@ +--- + cpio/cpio.c | 10 +++++++--- + libarchive/archive_write_disk.c | 8 +++++--- + 2 files changed, 12 insertions(+), 6 deletions(-) + Index: cpio/cpio.c =================================================================== ---- cpio/cpio.c.orig 2008-07-03 07:28:35.000000000 +0200 -+++ cpio/cpio.c 2008-10-27 17:31:56.806826303 +0100 -@@ -35,6 +35,15 @@ __FBSDID("$FreeBSD: src/usr.bin/cpio/cpi +--- cpio/cpio.c.orig ++++ cpio/cpio.c +@@ -38,8 +38,11 @@ __FBSDID("$FreeBSD: src/usr.bin/cpio/cpi #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif -+#ifdef HAVE_SYS_TIME_H -+#include <sys/time.h> -+#endif +-#ifdef HAVE_SYS_TIME_H +-#include <sys/time.h> +#ifdef HAVE_SYS_UTIME_H +#include <sys/utime.h> +#endif +#ifdef HAVE_UTIME_H +#include <utime.h> -+#endif + #endif #ifdef HAVE_ERRNO_H #include <errno.h> - #endif -@@ -662,7 +671,8 @@ restore_time(struct cpio *cpio, struct a - #endif +@@ -786,7 +789,8 @@ restore_time(struct cpio *cpio, struct a + } #ifdef HAVE_LUTIMES - if (lutimes(name, times) != 0) + if ((lutimes(name, times) != 0) && (errno==ENOSYS) && + (!S_ISLNK(archive_entry_mode(entry)) && utimes(name, times) != 0)) #else - if (!S_ISLNK(archive_entry_mode(entry)) && utimes(name, times) != 0) - #endif + if ((AE_IFLNK != archive_entry_filetype(entry)) + && utimes(name, times) != 0) Index: libarchive/archive_write_disk.c =================================================================== ---- libarchive/archive_write_disk.c.orig 2008-06-27 09:08:58.000000000 +0200 -+++ libarchive/archive_write_disk.c 2008-10-27 17:42:24.514385393 +0100 -@@ -1097,7 +1097,9 @@ _archive_write_close(struct archive *_a) - times[0].tv_sec = p->atime; - times[0].tv_usec = p->atime_nanos / 1000; +--- libarchive/archive_write_disk.c.orig ++++ libarchive/archive_write_disk.c +@@ -1265,7 +1265,9 @@ _archive_write_close(struct archive *_a) + times[1].tv_sec = p->mtime; + times[1].tv_usec = p->mtime_nanos / 1000; #ifdef HAVE_LUTIMES - lutimes(p->name, times); + if ((lutimes(p->name, times) != 0) && (errno==ENOSYS) && (!S_ISLNK(p->mode))) { @@ -43,13 +46,14 @@ #else utimes(p->name, times); #endif -@@ -1638,7 +1640,8 @@ set_time(struct archive_write_disk *a) +@@ -1886,8 +1888,8 @@ set_time(int fd, int mode, const char *n + (void)fd; /* UNUSED */ #endif - #ifdef HAVE_LUTIMES -- if (lutimes(a->name, times) != 0) -+ if ((lutimes(a->name, times) != 0) && (errno==ENOSYS) && -+ (!S_ISLNK(a->mode) && utimes(a->name, times) != 0)) +- (void)mode; /* UNUSED */ +- return (lutimes(name, times)); ++ return ((lutimes(name, times) != 0) && (errno==ENOSYS) && ++ (!S_ISLNK(mode)) && (utimes(name,mode) != 0)); #else - if (!S_ISLNK(a->mode) && utimes(a->name, times) != 0) - #endif + if (S_ISLNK(mode)) + return (0); ++++++ libarchive-2.5.5.tar.bz2 -> libarchive-2.8.4.tar.bz2 ++++++ ++++ 214767 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-doc for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package xorg-x11-doc for openSUSE:Factory checked in at Mon Nov 15 16:04:15 CET 2010. -------- --- xorg-x11-doc/xorg-x11-doc.changes 2010-04-07 12:13:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-doc/xorg-x11-doc.changes 2010-11-12 13:51:26.000000000 +0100 @@ -1,0 +2,18 @@ +Fri Nov 12 12:08:40 UTC 2010 - sndirsch(a)novell.com + +- xorg-docs 1.5.99.901 (1.6 RC1) + * This package provides the X Window System documentation that + doesn't belong in a more specific package. It used to provide + a lot of docs that did belong in more specific packages, but + that has largely been corrected in this release: + git diff --shortstat xorg-docs-1.5..xorg-docs-1.5.99.901 + 155 files changed, 27570 insertions(+), 112431 deletions(-) + The protocol specifications have mostly moved to the matching + proto modules. The library API references have mostly moved + to the matching lib modules. The server internals docs have + mostly moved to the xorg-server module. + What's left has mostly (but not yet completely) been converted + to Docbook XML, from troff, SGML, and other formats. +- adjusted xorg-x11-doc.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xorg-docs-1.5.tar.bz2 New: ---- xorg-docs-1.5.99.901.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-doc.spec ++++++ --- /var/tmp/diff_new_pack.pTVpNQ/_old 2010-11-15 16:03:58.000000000 +0100 +++ /var/tmp/diff_new_pack.pTVpNQ/_new 2010-11-15 16:03:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-doc (Version 7.5) +# spec file for package xorg-x11-doc (Version 7.5.99.901) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,14 +21,14 @@ Name: xorg-x11-doc BuildRequires: docbook-utils pkgconfig xorg-x11-util-devel Url: http://xorg.freedesktop.org/ -Version: 7.5 -Release: 2 +Version: 7.5.99.901 +Release: 1 License: MIT BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Documentation/Other Summary: X.Org documentation -Source: xorg-docs-1.5.tar.bz2 +Source: xorg-docs-1.5.99.901.tar.bz2 Patch: xorg-x11-doc.diff %description @@ -65,6 +65,6 @@ %files %defattr(-,root,root) %doc %{_mandir}/man7/* -%doc %{_datadir}/X11/ +%doc /usr/share/doc/xorg-docs/ %changelog ++++++ xorg-docs-1.5.tar.bz2 -> xorg-docs-1.5.99.901.tar.bz2 ++++++ ++++ 160502 lines of diff (skipped) ++++++ xorg-x11-doc.diff ++++++ --- /var/tmp/diff_new_pack.pTVpNQ/_old 2010-11-15 16:03:59.000000000 +0100 +++ /var/tmp/diff_new_pack.pTVpNQ/_new 2010-11-15 16:03:59.000000000 +0100 @@ -1,133 +1,12 @@ ---- man/general/Makefile.am.orig 2007-07-03 20:22:14.069593776 +0200 -+++ man/general/Makefile.am 2007-07-03 20:22:39.763091872 +0200 +--- man/Makefile.am.orig 2010-09-14 01:25:46.000000000 +0200 ++++ man/Makefile.am 2010-11-12 13:18:40.000000000 +0100 @@ -24,9 +24,7 @@ - miscman_PRE = \ - Consortium.man \ -- Xsecurity.man \ - Standards.man \ -- X.man \ - XOrgFoundation.man \ + miscman_PRE = \ + Consortium.man \ +- Xsecurity.man \ + Standards.man \ +- X.man \ + XOrgFoundation.man \ XProjectTeam.man - ---- ../xorg-docs-1.5.old//sgml/core/Xserver-spec.sgml 2010-04-04 12:34:52.000000000 +0000 -+++ sgml/core/Xserver-spec.sgml 2010-04-04 12:41:49.000000000 +0000 -@@ -4996,7 +4996,7 @@ mi and fb implementations.</para> - <listitem><para>none not implemented in sample implementation</para></listitem> - </itemizedlist> - </para> -- <table frame="all" id="routines-1"> -+ <table frame="box" id="routines-1"> - <title>Server Routines (Page 1)</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> -@@ -5063,7 +5063,7 @@ mi and fb implementations.</para> - </tgroup> - </table> -- <table frame="all" id="routines-2"> -+ <table frame="box" id="routines-2"> - <title>Server Routines (Page 2)</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> -@@ -5130,7 +5130,7 @@ mi and fb implementations.</para> - </tgroup> - </table> - -- <table frame="all" id="routines-3"> -+ <table frame="box" id="routines-3"> - <title>Server Routines (Page 3)</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> ---- ../xorg-docs-1.5.old//sgml/security/XACE-Spec.sgml 2010-04-04 12:34:52.000000000 +0000 -+++ sgml/security/XACE-Spec.sgml 2010-04-04 12:44:29.000000000 +0000 -@@ -188,7 +188,7 @@ - <section> - <title>Hooks</title> - <para>The currently defined set of XACE hooks is shown in <xref linkend="hooks_tab"/>. As discussed in <xref linkend="future_hooks"/>, the set of hooks is likely to change in the future as XACE is adopted and further security analysis of the X server is performed.</para> -- <table frame="all" id="hooks_tab"> -+ <table frame="box" id="hooks_tab"> - <title>XACE security hooks.</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> -@@ -330,7 +330,7 @@ - <para>The <structfield>parent</structfield> field is the parent resource itself or NULL if not set. The parent resource is set only when two conditions are met: The resource in question is being created at the time of the call (in which case the <structfield>access_mode</structfield> will include <literal>DixCreateAccess</literal>) and the resource in question has a defined parent object. <xref linkend="resource_access_parents" /> lists the resources that support parent objects. The purpose of these two fields is to provide generic support for "parent" resources.</para> - <para>The <structfield>access_mode</structfield> field encodes the type of action being performed. The valid mode bits are defined in <filename>include/dixaccess.h</filename>. The meaning of the bits depends on the specific resource type. Tables for some common types can be found in <xref linkend="resource_access_modes"/>. Note that the <literal>DixCreateAccess</literal> access mode has special meaning: it signifies that the resource object is in the process of being created. This provides an opportunity for the security extension to initialize its security label information in the structure devPrivates or otherwise. If the status field is set to an error code in this case, the resource creation will fail and no entry will be made under the specified resource ID.</para> - <para>The <structfield>status</structfield> field may be set to a nonzero X protocol error code. In this event, the resource lookup will fail and an error (usually, but not always, the status value) will be returned to the client.</para> -- <table frame="all" id="resource_access_modes"> -+ <table frame="box" id="resource_access_modes"> - <title>Resource access hook access modes.</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> -@@ -455,7 +455,7 @@ - </tgroup> - </table> - -- <table frame="all" id="resource_access_parents"> -+ <table frame="box" id="resource_access_parents"> - <title>Resource access hook parent objects.</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> -@@ -497,7 +497,7 @@ - <para>The <structfield>dev</structfield> field refers to the input device being accessed.</para> - <para>The <structfield>access_mode</structfield> field encodes the type of action being performed. The valid mode bits are described in the table below.</para> - <para>The <structfield>status</structfield> field may be set to a nonzero X protocol error code. In this event, the device operation will fail and an error (usually, but not always, the status value) will be returned to the client.</para> -- <table frame="all" id="device_access_modes"> -+ <table frame="box" id="device_access_modes"> - <title>Device access hook access modes.</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> -@@ -621,7 +621,7 @@ - <para>The <structfield>ppProp</structfield> field is a double-indirect pointer to the PropertyRec structure being accessed. The extra level of indirection supports property polyinstantiation; see below. If your extension does not use the polyinstantiation feature, simply dereference the pointer to obtain a <type>PropertyPtr</type> for the property</para> - <para>The <structfield>access_mode</structfield> field encodes the type of action being performed. The valid mode bits are described in the table below.</para> - <para>The <structfield>status</structfield> field may be set to a nonzero X protocol error code. In this event, the property request will not be processed further and the error code will be returned to the client. However, the <literal>BadMatch</literal> code has special meaning; see below.</para> -- <table frame="all" id="property_access_modes"> -+ <table frame="box" id="property_access_modes"> - <title>Property access hook mode bits.</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> -@@ -728,7 +728,7 @@ - <para>The <structfield>target</structfield> field refers to the client being manipulated.</para> - <para>The <structfield>access_mode</structfield> field encodes the type of action being performed. The valid mode bits are described in the table below.</para> - <para>The <structfield>status</structfield> field may be set to a nonzero X protocol error code. In this event, the request will fail and an error (usually, but not always, the status value) will be returned to the client.</para> -- <table frame="all" id="client_access_modes"> -+ <table frame="box" id="client_access_modes"> - <title>Client access hook mode bits.</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> -@@ -787,7 +787,7 @@ - <para>The <structfield>client</structfield> field refers to the client making the request.</para> - <para>The <structfield>access_mode</structfield> field encodes the type of action being performed. The valid mode bits are described in the table below.</para> - <para>The <structfield>status</structfield> field may be set to a nonzero X protocol error code. In this event, the request will fail and an error (usually, but not always, the status value) will be returned to the client.</para> -- <table frame="all" id="server_access_modes"> -+ <table frame="box" id="server_access_modes"> - <title>Server access hook mode bits.</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> -@@ -844,7 +844,7 @@ - <para>The <structfield>ppSel</structfield> field is a double-indirect pointer to the Selection structure being accessed. The extra level of indirection supports selection polyinstantiation; see below. If your extension does not use the polyinstantiation feature, simply dereference the pointer to obtain a <type>SelectionRec *</type> for the selection.</para> - <para>The <structfield>access_mode</structfield> field encodes the type of action being performed. The valid mode bits are described in the table below.</para> - <para>The <structfield>status</structfield> field may be set to a nonzero X protocol error code. In this event, the property request will not be processed further and the error code will be returned to the client. However, the <literal>BadMatch</literal> code has special meaning; see below.</para> -- <table frame="all" id="selection_access_modes"> -+ <table frame="box" id="selection_access_modes"> - <title>Selection access hook mode bits.</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> -@@ -899,7 +899,7 @@ - <para>The <structfield>screen</structfield> field refers to the screen object being referenced.</para> - <para>The <structfield>access_mode</structfield> field encodes the type of action being performed. The valid mode bits are described in the table below.</para> - <para>The <structfield>status</structfield> field may be set to a nonzero X protocol error code. In this event, the request will not be processed further and the error code will be returned to the client.</para> -- <table frame="all" id="screen_access_modes"> -+ <table frame="box" id="screen_access_modes"> - <title>Screen access hook mode bits.</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> -@@ -946,7 +946,7 @@ - <para>The <structfield>screen</structfield> field refers to the screen object being referenced.</para> - <para>The <structfield>access_mode</structfield> field encodes the type of action being performed. The valid mode bits are described in the table below.</para> - <para>The <structfield>status</structfield> field may be set to a nonzero X protocol error code. In this event, the request will not be processed further and the error code will be returned to the client.</para> -- <table frame="all" id="screensaver_access_modes"> -+ <table frame="box" id="screensaver_access_modes"> - <title>Screen saver access hook mode bits.</title> - <tgroup cols='3' align='left' colsep='1' rowsep='1'> - <thead> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video-intel-legacy for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package xorg-x11-driver-video-intel-legacy for openSUSE:Factory checked in at Mon Nov 15 16:03:48 CET 2010. -------- --- xorg-x11-driver-video-intel-legacy/xorg-x11-driver-video-intel-legacy.changes 2010-05-08 22:35:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-intel-legacy/xorg-x11-driver-video-intel-legacy.changes 2010-11-12 14:20:50.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 12 13:18:32 UTC 2010 - sndirsch(a)novell.com + +- xorg-server-1.9.diff + * fix build against xorg-server 1.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xorg-server-1.9.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video-intel-legacy.spec ++++++ --- /var/tmp/diff_new_pack.Q3aCVH/_old 2010-11-15 16:03:39.000000000 +0100 +++ /var/tmp/diff_new_pack.Q3aCVH/_new 2010-11-15 16:03:39.000000000 +0100 @@ -25,7 +25,7 @@ Group: System/X11/Servers/XF86_4 AutoReqProv: on Version: 2.9.1 -Release: 1 +Release: 4 Summary: Legacy Version of the Intel X.Org Driver Requires: xorg-x11-server Supplements: xorg-x11-server @@ -40,6 +40,7 @@ Patch5: moblin-uxa-Fix-segfault-on-source-only-picture-usage.patch Patch6: xf86-video-intel-buildfix.diff Patch7: xf86-video-intel-2.9.1-xorg-server-1.7.3-fixes.patch +Patch8: xorg-server-1.9.diff Patch100: xf86-video-intel-2.9.1-legacy.patch %description @@ -56,6 +57,7 @@ %patch5 -p1 %patch6 -p0 %patch7 -p0 +%patch8 -p1 %patch100 -p1 %build ++++++ xorg-server-1.9.diff ++++++ --- xf86-video-intel-2.9.1.orig//src/i830_video.c 2010-11-12 13:06:50.000000000 +0000 +++ xf86-video-intel-2.9.1/src/i830_video.c 2010-11-12 13:13:47.000000000 +0000 @@ -2207,7 +2207,7 @@ i830_clip_video_helper (ScrnInfoPtr pScr static void i830_fill_colorkey (ScreenPtr pScreen, uint32_t key, RegionPtr clipboxes) { - DrawablePtr root = &WindowTable[pScreen->myNum]->drawable; + DrawablePtr root = &(pScreen->root)->drawable; XID pval[2]; BoxPtr pbox = REGION_RECTS(clipboxes); int i, nbox = REGION_NUM_RECTS(clipboxes); @@ -2219,7 +2219,7 @@ i830_fill_colorkey (ScreenPtr pScreen, u gc = GetScratchGC(root->depth, pScreen); pval[0] = key; pval[1] = IncludeInferiors; - (void) ChangeGC(gc, GCForeground|GCSubwindowMode, pval); + (void) ChangeGC(NullClient, gc, GCForeground|GCSubwindowMode, pval); ValidateGC(root, gc); rects = xalloc (nbox * sizeof(xRectangle)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libzypp-bindings for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package libzypp-bindings for openSUSE:Factory checked in at Mon Nov 15 16:03:29 CET 2010. -------- --- libzypp-bindings/libzypp-bindings.changes 2010-10-20 12:57:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/libzypp-bindings/libzypp-bindings.changes 2010-11-04 11:03:09.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Nov 3 14:39:12 CET 2010 - ma(a)suse.de + +- Wrap GetResolvablesToInsDel +- version 0.5.7 + +------------------------------------------------------------------- +Wed Nov 3 13:42:42 CET 2010 - ma(a)suse.de + +- Wrap DownloadMode enum +- Add zypp::setZyppLogfilei. Pass empty string for off, '-' for + stderr or a filename. +- version 0.5.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libzypp-bindings-0.5.5.tar.bz2 New: ---- libzypp-bindings-0.5.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-bindings.spec ++++++ --- /var/tmp/diff_new_pack.zyGM4x/_old 2010-11-15 16:03:10.000000000 +0100 +++ /var/tmp/diff_new_pack.zyGM4x/_new 2010-11-15 16:03:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libzypp-bindings (Version 0.5.5) +# spec file for package libzypp-bindings (Version 0.5.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: libzypp-bindings -Version: 0.5.5 +Version: 0.5.7 Release: 1 License: GPLv2+ Summary: Bindings for libzypp ++++++ libzypp-bindings-0.5.5.tar.bz2 -> libzypp-bindings-0.5.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.5/examples/python/install_updates_dryrun.py new/libzypp-bindings-0.5.7/examples/python/install_updates_dryrun.py --- old/libzypp-bindings-0.5.5/examples/python/install_updates_dryrun.py 2010-10-20 13:09:40.000000000 +0200 +++ new/libzypp-bindings-0.5.7/examples/python/install_updates_dryrun.py 2010-11-04 10:52:41.000000000 +0100 @@ -44,6 +44,18 @@ if item.status().transacts(): print '%s | %s-%s | %s' % (item.repoInfo().alias(), item.name(), item.edition(), item.status() ) + +# +# +# +print '====================================================' +todo = zypp.GetResolvablesToInsDel( Z.pool() ) +for item in todo._toDelete: + print '-- %s | %s-%s | %s' % (item.repoInfo().alias(), item.name(), item.edition(), item.status() ) + +for item in todo._toInstall: + print '++ %s | %s-%s | %s' % (item.repoInfo().alias(), item.name(), item.edition(), item.status() ) + # # dryRun! # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.5/package/libzypp-bindings.changes new/libzypp-bindings-0.5.7/package/libzypp-bindings.changes --- old/libzypp-bindings-0.5.5/package/libzypp-bindings.changes 2010-10-20 13:09:40.000000000 +0200 +++ new/libzypp-bindings-0.5.7/package/libzypp-bindings.changes 2010-11-04 10:52:41.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Nov 3 14:39:12 CET 2010 - ma(a)suse.de + +- Wrap GetResolvablesToInsDel +- version 0.5.7 + +------------------------------------------------------------------- +Wed Nov 3 13:42:42 CET 2010 - ma(a)suse.de + +- Wrap DownloadMode enum +- Add zypp::setZyppLogfilei. Pass empty string for off, '-' for + stderr or a filename. +- version 0.5.6 + +------------------------------------------------------------------- Wed Oct 20 12:03:08 CEST 2010 - ma(a)suse.de - Offer interface to get/set KeyRing::defaultAccept bits. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.5/swig/ResPool.i new/libzypp-bindings-0.5.7/swig/ResPool.i --- old/libzypp-bindings-0.5.5/swig/ResPool.i 2010-10-20 13:09:40.000000000 +0200 +++ new/libzypp-bindings-0.5.7/swig/ResPool.i 2010-11-04 10:52:41.000000000 +0100 @@ -3,11 +3,17 @@ %ignore zypp::ResPool::byKindEnd; %ignore zypp::ResPool::byNameBegin; %ignore zypp::ResPool::byNameEnd; - %apply unsigned { zypp::ResPool::size_type }; - %include <zypp/ResPool.h> +%ignore zypp::pool::operator<<; +%include <zypp/pool/GetResolvablesToInsDel.h> +namespace zypp +{ + typedef ::std::list<zyppPoolItem> PoolItemList; + %template(PoolItemList) ::std::list<PoolItem>; +} + namespace zypp { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.5/swig/ZYppCommitPolicy.i new/libzypp-bindings-0.5.7/swig/ZYppCommitPolicy.i --- old/libzypp-bindings-0.5.5/swig/ZYppCommitPolicy.i 2010-10-20 13:09:40.000000000 +0200 +++ new/libzypp-bindings-0.5.7/swig/ZYppCommitPolicy.i 2010-11-04 10:52:41.000000000 +0100 @@ -5,4 +5,5 @@ %rename("syncPoolAfterCommit=") ZYppCommitPolicy::syncPoolAfterCommit(bool); #endif -%include <zypp/ZYppCommitPolicy.h> \ No newline at end of file +%include <zypp/DownloadMode.h> +%include <zypp/ZYppCommitPolicy.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.5/swig/zypp.i new/libzypp-bindings-0.5.7/swig/zypp.i --- old/libzypp-bindings-0.5.5/swig/zypp.i 2010-10-20 13:09:40.000000000 +0200 +++ new/libzypp-bindings-0.5.7/swig/zypp.i 2010-11-04 10:52:41.000000000 +0100 @@ -40,6 +40,7 @@ #include "zypp/repo/RepoType.h" #include "zypp/TmpPath.h" #include "zypp/Resolver.h" +#include "zypp/pool/GetResolvablesToInsDel.h" #include "zypp/Product.h" @@ -158,3 +159,19 @@ %include <zypp/ZYpp.h> %include "ZYppFactory.i" + +// +// helper +// +%{ +#include <zypp/base/LogControl.h> +%} +%inline %{ + namespace zypp + { + void setZyppLogfile( const std::string & file_r ) + { + base::LogControl::instance().logfile( file_r ); + } + } +%} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.5/VERSION.cmake new/libzypp-bindings-0.5.7/VERSION.cmake --- old/libzypp-bindings-0.5.5/VERSION.cmake 2010-10-20 13:09:40.000000000 +0200 +++ new/libzypp-bindings-0.5.7/VERSION.cmake 2010-11-04 10:52:41.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "5") -SET(VERSION_PATCH "5") +SET(VERSION_PATCH "7") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at Mon Nov 15 16:02:49 CET 2010. -------- --- rpmlint/rpmlint.changes 2010-11-04 15:20:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/rpmlint/rpmlint.changes 2010-11-11 08:56:20.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 11 08:55:56 CET 2010 - dmueller(a)suse.de + +- fix another exception in branding policy check (bnc#652628) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.wSEB3N/_old 2010-11-15 16:02:18.000000000 +0100 +++ /var/tmp/diff_new_pack.wSEB3N/_new 2010-11-15 16:02:18.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: rpm-python Summary: Rpm correctness checker Version: 1.0 -Release: 1 +Release: 2 Source0: %{name}-%{version}.tar.bz2 Source1: config Source1001: config.in ++++++ BrandingPolicyCheck.py ++++++ --- /var/tmp/diff_new_pack.wSEB3N/_old 2010-11-15 16:02:18.000000000 +0100 +++ /var/tmp/diff_new_pack.wSEB3N/_new 2010-11-15 16:02:18.000000000 +0100 @@ -105,7 +105,7 @@ for r in pkg.requires(): if r[0].find('-theme-') >= 0 or r[0].find('-branding-') >= 0: - if (r[1] != rpm.RPMSENSE_EQUAL or not r[2].startswith('1')): + if (r[1] != rpm.RPMSENSE_EQUAL or not r[2][1].startswith('1')): printError(pkg, 'suse-branding-unversioned-requires', r[0]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Mon Nov 15 16:01:46 CET 2010. -------- --- aaa_base/aaa_base.changes 2010-11-10 16:16:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2010-11-11 12:25:37.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 11 12:24:27 CET 2010 - werner(a)suse.de + +- Do not set ENV in /etc/profile as well in /etc/csh.login (bnc#611966) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.kv6Cin/_old 2010-11-15 16:01:29.000000000 +0100 +++ /var/tmp/diff_new_pack.kv6Cin/_new 2010-11-15 16:01:29.000000000 +0100 @@ -20,7 +20,7 @@ Name: aaa_base Version: 11.4 -Release: 10 +Release: 11 License: GPLv2+ Group: System/Fhs Provides: bin bootutls etc skeleng skelger ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/csh.login new/aaa_base/etc/csh.login --- old/aaa_base/etc/csh.login 2010-05-18 17:28:20.000000000 +0200 +++ new/aaa_base/etc/csh.login 2010-11-11 12:04:22.000000000 +0100 @@ -262,13 +262,6 @@ endif # -# System wide configuration of bourne shells like ash -# -if (! ${?CSHRCREAD} ) then - setenv ENV /etc/bash.bashrc -endif - -# # Avoid overwriting user settings if called twice # if (! ${?CSHRCREAD} ) then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/profile new/aaa_base/etc/profile --- old/aaa_base/etc/profile 2010-06-08 17:58:35.000000000 +0200 +++ new/aaa_base/etc/profile 2010-11-11 12:03:57.000000000 +0100 @@ -316,14 +316,6 @@ fi # -# System wide configuration of bourne shells like ash -# -if test "$is" != "ksh" -a "$is" != "zsh" -a -z "$PROFILEREAD" ; then - ENV=/etc/bash.bashrc - export ENV -fi - -# # Avoid overwriting user settings if called twice # if test -z "$PROFILEREAD" ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pcmciautils for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package pcmciautils for openSUSE:Factory checked in at Mon Nov 15 16:01:10 CET 2010. -------- --- pcmciautils/pcmciautils.changes 2010-09-10 15:30:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/pcmciautils/pcmciautils.changes 2010-11-11 11:03:40.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 11 10:03:27 UTC 2010 - coolo(a)novell.com + +- fix file list + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcmciautils.spec ++++++ --- /var/tmp/diff_new_pack.4rxM7l/_old 2010-11-15 16:00:54.000000000 +0100 +++ /var/tmp/diff_new_pack.4rxM7l/_new 2010-11-15 16:00:54.000000000 +0100 @@ -27,7 +27,7 @@ %endif Url: http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html Version: 017 -Release: 1 +Release: 2 Summary: Utilities for PC-Cards License: GPLv2+ Group: Hardware/Other @@ -89,6 +89,7 @@ /lib/udev/rules.d/60-pcmcia.rules %verify(not mode) %attr(4750,root,trusted) /sbin/pccardctl %dir /lib/udev +%dir /lib/udev/rules.d /lib/udev/pcmcia-check-broken-cis /lib/udev/pcmcia-socket-startup /sbin/lspcmcia @@ -96,7 +97,5 @@ /%{_docdir}/pcmciautils #/%{_mandir}/man[458]/* /%{_mandir}/man8/* -# %clean -# test -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Mon Nov 15 15:58:39 CET 2010. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-11-09 17:37:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-11-12 19:21:11.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 12 17:39:14 UTC 2010 - sndirsch(a)novell.com + +- readded and reenabled build of -xgi/-xgixp drivers +- xf86-video-xgi-buildfix.diff + * buildfix for -xgi driver + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xf86-video-xgi-1.6.0.tar.bz2 xf86-video-xgi-buildfix.diff xf86-video-xgixp-1.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.oAsSeF/_old 2010-11-15 15:57:38.000000000 +0100 +++ /var/tmp/diff_new_pack.oAsSeF/_new 2010-11-15 15:57:38.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 30 +Release: 31 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -72,6 +72,8 @@ Source54: xf86-video-mach64-6.8.2.tar.bz2 Source55: xf86-video-r128-6.8.1.tar.bz2 Source56: intel-gpu-tools-1.0.2-20100825-c935c60.tar.bz2 +Source57: xf86-video-xgi-1.6.0.tar.bz2 +Source58: xf86-video-xgixp-1.8.0.tar.bz2 Source99: baselibs.conf Source100: sax2-hwinfo-data.tar.gz %if %broken_kms_blacklist @@ -98,6 +100,7 @@ Patch140: xf86-video-ati-6.7.197-r128-xvideo.patch Patch141: xf86-video-ati-theatre.patch Patch142: xf86-video-ati-theatre-pciaccess.patch +Patch143: xf86-video-xgi-buildfix.diff %description This package contains X.Org video drivers. @@ -164,6 +167,9 @@ %patch141 -p1 %patch142 -p1 popd +pushd xf86-video-xgi-* +%patch143 -p1 +popd %build for dir in $(ls -d xf86-video-*) intel-gpu-tools-*; do ++++++ xf86-video-xgi-buildfix.diff ++++++ Binary files xf86-video-xgi-1.6.0.orig//src/.libs/xgi_accel.o and xf86-video-xgi-1.6.0/src/.libs/xgi_accel.o differ Binary files xf86-video-xgi-1.6.0.orig//src/.libs/xgi_drv.so and xf86-video-xgi-1.6.0/src/.libs/xgi_drv.so differ diff -u -r -p xf86-video-xgi-1.6.0.orig//src/xgi_accel.c xf86-video-xgi-1.6.0/src/xgi_accel.c --- xf86-video-xgi-1.6.0.orig//src/xgi_accel.c 2010-11-12 17:49:17.000000000 +0000 +++ xf86-video-xgi-1.6.0/src/xgi_accel.c 2010-11-12 18:08:02.000000000 +0000 @@ -958,6 +958,7 @@ Volari_AccelInit(ScreenPtr pScreen) return TRUE; } #endif /* EXA */ + return TRUE; } void diff -u -r -p xf86-video-xgi-1.6.0.orig//src/xgi_dri.c xf86-video-xgi-1.6.0/src/xgi_dri.c --- xf86-video-xgi-1.6.0.orig//src/xgi_dri.c 2010-11-12 17:49:17.000000000 +0000 +++ xf86-video-xgi-1.6.0/src/xgi_dri.c 2010-11-12 18:01:42.000000000 +0000 @@ -286,7 +286,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen) pDRIInfo->ddxDriverMajorVersion = PACKAGE_VERSION_MAJOR; pDRIInfo->ddxDriverMinorVersion = PACKAGE_VERSION_MINOR; pDRIInfo->ddxDriverPatchVersion = PACKAGE_VERSION_PATCHLEVEL; - pDRIInfo->frameBufferPhysicalAddress = pXGI->FbAddress; + pDRIInfo->frameBufferPhysicalAddress = (pointer) pXGI->FbAddress; pDRIInfo->frameBufferSize = pXGI->FbMapSize; /* ?? */ diff -u -r -p xf86-video-xgi-1.6.0.orig//src/xgi_driver.c xf86-video-xgi-1.6.0/src/xgi_driver.c --- xf86-video-xgi-1.6.0.orig//src/xgi_driver.c 2010-11-12 17:49:17.000000000 +0000 +++ xf86-video-xgi-1.6.0/src/xgi_driver.c 2010-11-12 18:03:01.000000000 +0000 @@ -3046,7 +3046,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) ); #endif - pXGI->xgi_HwDevExt.pjIOAddress = (XGIIOADDRESS) (pXGI->RelIO + 0x30); + pXGI->xgi_HwDevExt.pjIOAddress = (pointer)((XGIIOADDRESS) (pXGI->RelIO + 0x30)); xf86DrvMsg(pScrn->scrnIndex, from, "Relocated IO registers at 0x%lX\n", (unsigned long) pXGI->RelIO); ErrorF("xgi_driver.c-pXGI->xgi_HwDevExt.pjIOAddress=0x%x...\n", pXGI->xgi_HwDevExt.pjIOAddress); diff -u -r -p xf86-video-xgi-1.6.0.orig//src/xgi_setup.c xf86-video-xgi-1.6.0/src/xgi_setup.c --- xf86-video-xgi-1.6.0.orig//src/xgi_setup.c 2010-11-12 17:49:17.000000000 +0000 +++ xf86-video-xgi-1.6.0/src/xgi_setup.c 2010-11-12 18:04:05.000000000 +0000 @@ -587,7 +587,7 @@ XGI_InitHwDevInfo(ScrnInfoPtr pScrn) PDEBUG(ErrorF("pXGI->FbBase = 0x%08lx\n",(ULONG)(pXGI->FbBase))) ; PDEBUG(ErrorF("pHwDevInfo->pjVideoMemoryAddress = 0x%08lx\n",(ULONG)(pHwDevInfo->pjVideoMemoryAddress))) ; pHwDevInfo->ulVideoMemorySize = pXGI->FbMapSize ; - pHwDevInfo->pjIOAddress = pXGI->RelIO + 0x30 ; + pHwDevInfo->pjIOAddress = (pointer)(pXGI->RelIO + 0x30); switch (pXGI->Chipset) { case PCI_CHIP_XGIXG40: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0