May 2017 - openSUSE Commits - openSUSE Mailing Lists

commit bcel for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package bcel for openSUSE:Factory checked in at 2017-05-31 13:31:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bcel (Old) and /work/SRC/openSUSE:Factory/.bcel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bcel" Wed May 31 13:31:40 2017 rev:25 rq:496981 version:5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/bcel/bcel.changes 2015-04-02 16:00:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bcel.new/bcel.changes 2017-05-31 13:31:53.590169379 +0200 @@ -1,0 +2,5 @@ +Fri May 19 16:56:30 UTC 2017 - tchvatal(a)suse.com + +- Buildignore more java implementations + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bcel.spec ++++++ --- /var/tmp/diff_new_pack.vEvcpy/_old 2017-05-31 13:31:54.230079179 +0200 +++ /var/tmp/diff_new_pack.vEvcpy/_new 2017-05-31 13:31:54.234078615 +0200 @@ -1,7 +1,7 @@ # # spec file for package bcel # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,8 +32,10 @@ #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 #!BuildIgnore: xml-commons-jaxp-1.3-apis -#!BuildIgnore: java-1_6_0-openjdk-devel -#!BuildIgnore: java-1_7_0-openjdk-devel +#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel +#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel +#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel +#!BuildIgnore: java-9-openjdk java-9-openjdk-devel #!BuildIgnore: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap Requires: regexp

1 0

commit oro for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package oro for openSUSE:Factory checked in at 2017-05-31 13:31:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oro (Old) and /work/SRC/openSUSE:Factory/.oro.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oro" Wed May 31 13:31:46 2017 rev:17 rq:496982 version:2.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/oro/oro.changes 2014-06-30 22:50:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.oro.new/oro.changes 2017-05-31 13:31:54.402054938 +0200 @@ -1,0 +2,5 @@ +Sat May 20 18:16:52 UTC 2017 - tchvatal(a)suse.com + +- Do not require dead package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oro.spec ++++++ --- /var/tmp/diff_new_pack.zNI290/_old 2017-05-31 13:31:54.849991799 +0200 +++ /var/tmp/diff_new_pack.zNI290/_new 2017-05-31 13:31:54.849991799 +0200 @@ -1,7 +1,7 @@ # # spec file for package oro # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,6 @@ Url: http://jakarta.apache.org/oro/ Source0: %{full_name}-%{version}.tar.gz BuildRequires: ant -BuildRequires: java2-devel-packages BuildRequires: xml-commons-apis Provides: %{full_name} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build

1 0

commit java-1_7_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2017-05-31 13:31:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_7_0-openjdk" Wed May 31 13:31:34 2017 rev:85 rq:496978 version:1.7.0.141 Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes 2017-04-24 09:45:00.639976909 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes 2017-05-31 13:31:39.528151498 +0200 @@ -1,0 +2,177 @@ +Sat May 20 17:05:25 UTC 2017 - tchvatal(a)suse.com + +- Own /usr/lib64/jvm-exports as 1.8.0 and newer do because it is + no longer in javapackages-tools + +------------------------------------------------------------------- +Wed May 17 11:03:15 UTC 2017 - fstrba(a)suse.com + +- Update to 2.6.10 - OpenJDK 7u141 (bsc#1034849) +* Security fixes + - S8163520, CVE-2017-3509: Reuse cache entries + - S8163528, CVE-2017-3511: Better library loading + - S8165626, CVE-2017-3512: Improved window framing + - S8167110, CVE-2017-3514: Windows peering issue + - S8169011, CVE-2017-3526: Resizing XML parse trees + - S8170222, CVE-2017-3533: Better transfers of files + - S8171121, CVE-2017-3539: Enhancing jar checking + - S8171533, CVE-2017-3544: Better email transfer + - S8172299: Improve class processing + * New features + - PR3347: jstack.stp should support AArch64 + * Import of OpenJDK 7 u141 build 0 + - S4717864: setFont() does not update Fonts of Menus already on + screen + - S6474807: (smartcardio) CardTerminal.connect() throws + CardException instead of CardNotPresentException + - S6518907: cleanup IA64 specific code in Hotspot + - S6869327: Add new C2 flag to keep safepoints in counted loops. + - S7112912: Message "Error occurred during initialization of + VM" on boxes with lots of RAM + - S7124213: [macosx] pack() does ignore size of a component; + doesn't on the other platforms + - S7124219: [macosx] Unable to draw images to fullscreen + - S7124552: [macosx] NullPointerException in getBufferStrategy() + - S7148275: [macosx] setIconImages() not working correctly + (distorted icon when minimized) + - S7154841: [macosx] Popups appear behind taskbar + - S7155957: + closed/java/awt/MenuBar/MenuBarStress1/MenuBarStress1.java + hangs on win 64 bit with jdk8 + - S7160627: [macosx] TextArea has wrong initial size + - S7167293: FtpURLConnection connection leak on + FileNotFoundException + - S7168851: [macosx] Netbeans crashes in + CImage.nativeCreateNSImageFromArray + - S7197203: sun/misc/URLClassPath/ClassnameCharTest.sh failed, + compile error + - S8005255: [macosx] Cleanup warnings in sun.lwawt + - S8006088: Incompatible heap size flags accepted by VM + - S8007295: Reduce number of warnings in awt classes + - S8010722: assert: failed: heap size is too big for compressed + oops + - S8011059: [macosx] Support automatic @2x images loading on + Mac OS X + - S8014058: Regression tests for 8006088 + - S8014489: + tests/gc/arguments/Test(Serial|CMS|Parallel|G1)HeapSizeFlags + jtreg tests invoke wrong class + - S8016302: Change type of the number of GC workers to unsigned + int (2) + - S8024662: gc/arguments/TestUseCompressedOopsErgo.java does + not compile. + - S8024669: Native OOME when allocating after changes to + maximum heap supporting Coops sizing on sparcv9 + - S8024926: [macosx] AquaIcon HiDPI support + - S8025974: l10n for policytool + - S8027025: [macosx] getLocationOnScreen returns 0 if parent + invisible + - S8028212: Custom cursor HiDPI support + - S8028471: PPC64 (part 215): opto: Extend ImplicitNullCheck + optimization. + - S8031573: [macosx] Checkmarks of JCheckBoxMenuItems aren't + rendered in high resolution on Retina + - S8033534: [macosx] Get MultiResolution image from native + system + - S8033786: White flashing when opening Dialogs and Menus using + Nimbus with dark background + - S8035568: [macosx] Cursor management unification + - S8041734: JFrame in full screen mode leaves empty workspace + after close + - S8059803: Update use of GetVersionEx to get correct Windows + version in hs_err files + - S8066504: GetVersionEx in + java.base/windows/native/libjava/java_props_md.c might not + get correct Windows version 0 + - S8079595: Resizing dialog which is JWindow parent makes JVM + crash + - S8080729: [macosx] java 7 and 8 JDialogs on multiscreen jump + to parent frame on focus + - S8130769: The new menu can't be shown on the menubar after + clicking the "Add" button. + - S8133357: 8u65 l10n resource file translation update + - S8146602: + jdk/test/sun/misc/URLClassPath/ClassnameCharTest.java test + fails with NullPointerException + - S8147842: IME Composition Window is displayed at incorrect + location + - S8147910: Cache initial active_processor_count + - S8150490: Update OS detection code to recognize Windows + Server 2016 + - S8161147: jvm crashes when -XX:+UseCountedLoopSafepoints is + enabled + - S8161195: Regression: + closed/javax/swing/text/FlowView/LayoutTest.java + - S8161993: G1 crashes if active_processor_count changes during + startup + - S8162603: Unrecognized VM option 'UseCountedLoopSafepoints' + - S8162876: [TEST_BUG] + sun/net/www/protocol/http/HttpInputStream.java fails + intermittently + - S8164533: sun/security/ssl/SSLSocketImpl/CloseSocket.java + failed with "Error while cleaning up threads after test" + - S8167179: Make XSL generated namespace prefixes local to + transformation process + - S8169465: Deadlock in com.sun.jndi.ldap.pool.Connections + - S8169589: [macosx] Activating a JDialog puts to back another + dialog + - S8170307: Stack size option -Xss is ignored + - S8170316: (tz) Support tzdata2016j + - S8170814: Reuse cache entries (part II) + - S8171388: Update JNDI Thread contexts + - S8171949: [macosx] AWT_ZoomFrame Automated tests fail with + error: The bitwise mask Frame.ICONIFIED is not setwhen the + frame is in ICONIFIED state + - S8171952: [macosx] + AWT_Modality/Automated/ModalExclusion/NoExclusion/ModelessDialog + test fails as DummyButton on Dialog did not gain focus when + clicked. + - S8173931: 8u131 L10n resource file update + - S8174844: Incorrect GPL header causes RE script to miss swap + to commercial header for licensee source bundle + - S8175087: [bsd] Fix build after "8024900: PPC64: Enable new + build on AIX (jdk part)" + - S8175163: [bsd] Fix build after "8005629: javac warnings + compiling java.awt.EventDispatchThread..." + - S8176044: (tz) Support tzdata2017a + * Import of OpenJDK 7 u141 build 1 + - S8043723: max_heap_for_compressed_oops() declared with + size_t, but defined with uintx + * Import of OpenJDK 7 u141 build 2 + - S8011123: serialVersionUID of + java.awt.dnd.InvalidDnDOperationException changed in JDK8-b82 + * Backports + - S6515172, PR3362: Runtime.availableProcessors() ignores Linux + taskset command + - S8011621, PR3209: live_ranges_in_separate_class.patch + - S8022284, PR3209: Hide internal data structure in PhaseCFG + - S8023003, PR3209: Cleanup the public interface to PhaseCFG + - S8023691, PR3209: Create interface for nodes in class Block + - S8023988, PR3209: Move local scheduling of nodes to the CFG + creation and code motion phase (PhaseCFG) + - S8043780, PR3369: Use open(O_CLOEXEC) instead of + fcntl(FD_CLOEXEC) + - S8157306, PR3209: Random infrequent null pointer exceptions + in javac + - S8173783, PR3329: IllegalArgumentException: + jdk.tls.namedGroups + - S8173941, PR3330: SA does not work if executable is DSO + - S8174729, PR3361: Race Condition in + java.lang.reflect.WeakCache + * Bug fixes + - PR3349: Architectures unsupported by SystemTap tapsets throw + a parse error + - PR3370: Disable ARM32 JIT by default in jdk_generic_profile.sh + - PR3379: Perl should be mandatory + - PR3390: javac.in and javah.in should use @PERL@ rather than a + hardcoded path + * CACAO + - PR2732: Raise javadoc memory limits for CACAO again! + * AArch64 port + - S8177661, PR3367: Correct ad rule output register types from + iRegX to iRegXNoSp +- Removed patch: + * java-1_7_0-openjdk-gcc6.patch + - Not needed anymore + +------------------------------------------------------------------- java-1_7_0-openjdk.changes: same change Old: ---- icedtea-2.6.9.tar.xz icedtea-2.6.9.tar.xz.sig java-1_7_0-openjdk-gcc6.patch New: ---- icedtea-2.6.10.tar.xz icedtea-2.6.10.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.EY5nmQ/_old 2017-05-31 13:31:44.139501502 +0200 +++ /var/tmp/diff_new_pack.EY5nmQ/_new 2017-05-31 13:31:44.143500939 +0200 @@ -19,7 +19,7 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{arm} %{aarch64} %global test_arches %{ix86} x86_64 ppc64 ppc64le -%global icedtea_version 2.6.9 +%global icedtea_version 2.6.10 %global icedtea_sound_version 1.0.1 %global mauvedate 2008-10-22 %global buildoutputdir openjdk.build/ @@ -31,7 +31,7 @@ # Standard JPackage naming and versioning defines. %global priority 1705 %global javaver 1.7.0 -%global buildver 131 +%global buildver 141 # Standard JPackage directories and symbolic links. %global sdklnk java-%{javaver}-openjdk %global archname %{sdklnk} @@ -212,7 +212,6 @@ # Avoid too much silence from javadoc Patch1005: java-1_7_0-openjdk-javadoc-verbose.patch Patch1006: java-1_7_0-openjdk-override.patch -Patch2000: java-1_7_0-openjdk-gcc6.patch Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch Patch10012: java-1_7_0-openjdk-libjvm-link.patch BuildRequires: alsa-lib-devel @@ -647,8 +646,6 @@ patch -p0 -i %{PATCH1006} %endif -patch -p0 -i %{PATCH2000} - make %{?_smp_mflags} export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image @@ -1125,6 +1122,7 @@ %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE %doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README +%dir %{_libdir}/jvm-exports %dir %{_jvmdir}/%{sdkdir}/jre/lib/desktop/ %{_jvmdir}/%{sdkdir}/jre/lib/desktop/policytool.desktop ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.EY5nmQ/_old 2017-05-31 13:31:44.171496992 +0200 +++ /var/tmp/diff_new_pack.EY5nmQ/_new 2017-05-31 13:31:44.175496429 +0200 @@ -19,7 +19,7 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{arm} %{aarch64} %global test_arches %{ix86} x86_64 ppc64 ppc64le -%global icedtea_version 2.6.9 +%global icedtea_version 2.6.10 %global icedtea_sound_version 1.0.1 %global mauvedate 2008-10-22 %global buildoutputdir openjdk.build/ @@ -31,7 +31,7 @@ # Standard JPackage naming and versioning defines. %global priority 1705 %global javaver 1.7.0 -%global buildver 131 +%global buildver 141 # Standard JPackage directories and symbolic links. %global sdklnk java-%{javaver}-openjdk %global archname %{sdklnk} @@ -212,7 +212,6 @@ # Avoid too much silence from javadoc Patch1005: java-1_7_0-openjdk-javadoc-verbose.patch Patch1006: java-1_7_0-openjdk-override.patch -Patch2000: java-1_7_0-openjdk-gcc6.patch Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch Patch10012: java-1_7_0-openjdk-libjvm-link.patch BuildRequires: alsa-lib-devel @@ -647,8 +646,6 @@ patch -p0 -i %{PATCH1006} %endif -patch -p0 -i %{PATCH2000} - make %{?_smp_mflags} export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image @@ -1125,6 +1122,7 @@ %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE %doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README +%dir %{_libdir}/jvm-exports %dir %{_jvmdir}/%{sdkdir}/jre/lib/desktop/ %{_jvmdir}/%{sdkdir}/jre/lib/desktop/policytool.desktop ++++++ corba.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-737fd3fbf139/.hgtags new/corba-4d807b58849e/.hgtags --- old/corba-737fd3fbf139/.hgtags 2017-02-07 05:06:20.000000000 +0100 +++ new/corba-4d807b58849e/.hgtags 2017-05-03 04:50:27.000000000 +0200 @@ -665,3 +665,8 @@ 9e002eaf26ed37030c32c6ab410ac278b8118ee2 icedtea-2.6.8 ba84d0d43df1de8075f5ab5b02adfe1b964111ec icedtea-2.6.9pre01 d93d13bcb01d7b635d0e021877e1102e34bae8fb jdk7u131-b00 +737fd3fbf1394a5640e3524679ef831347186853 icedtea-2.6.9 +dcdf5b845fa7dc9727327abf76bba06df4ce2ad7 icedtea-2.6.10pre01 +61c10a1eaa7b6f77e63f90e624a82a664a451d42 jdk7u141-b00 +caa46a309b1195a0301956e7416633b717553925 jdk7u141-b01 +39240de9d27767c8bad74e34f83f0a4902a9ef85 jdk7u141-b02 ++++++ hotspot.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/hotspot.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/hotspot.tar.bz2 differ: char 11, line 1 ++++++ icedtea-2.6.9.tar.xz -> icedtea-2.6.10.tar.xz ++++++ ++++ 5665 lines of diff (skipped) ++++++ jaxp.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-aa1c302a99fb/.hgtags new/jaxp-4099d8cf255f/.hgtags --- old/jaxp-aa1c302a99fb/.hgtags 2017-02-07 05:06:22.000000000 +0100 +++ new/jaxp-4099d8cf255f/.hgtags 2017-05-03 04:50:27.000000000 +0200 @@ -666,3 +666,8 @@ 3369fa5a875b8c39e9dc2b16bd8486270947d73c icedtea-2.6.8 6572cfcae3450e4fc9225ceecaf1acdb6dd5891a icedtea-2.6.9pre01 51ed13d07beb90ff71d8625d9d6409cc4add5cbc jdk7u131-b00 +aa1c302a99fb73dbd9db49e0c33990bd2d17016e icedtea-2.6.9 +82f4cfac52dbd67aafd16b47c131358738499f4a icedtea-2.6.10pre01 +f347b141975453f642ae1140a45aa7c6127551dd jdk7u141-b00 +e096a279a1c226d7d3a4aa19d5beeba1fb0507cf jdk7u141-b01 +b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java new/jaxp-4099d8cf255f/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java --- old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java 2017-02-07 05:06:22.000000000 +0100 +++ new/jaxp-4099d8cf255f/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java 2017-05-03 04:50:27.000000000 +0200 @@ -1016,7 +1016,7 @@ "Propriet\u00E0 di sistema org.xml.sax.parser non specificata"}, { ER_PARSER_ARG_CANNOT_BE_NULL, - "L''argomento del parser non deve essere nullo"}, + "L'argomento del parser non deve essere nullo"}, { ER_FEATURE, "Funzione: {0}"}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java new/jaxp-4099d8cf255f/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java --- old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2017-02-07 05:06:22.000000000 +0100 +++ new/jaxp-4099d8cf255f/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2017-05-03 04:50:27.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -31,6 +31,7 @@ import com.sun.org.apache.bcel.internal.generic.GETSTATIC; import com.sun.org.apache.bcel.internal.generic.INVOKEINTERFACE; import com.sun.org.apache.bcel.internal.generic.INVOKESPECIAL; +import com.sun.org.apache.bcel.internal.generic.INVOKESTATIC; import com.sun.org.apache.bcel.internal.generic.INVOKEVIRTUAL; import com.sun.org.apache.bcel.internal.generic.ISTORE; import com.sun.org.apache.bcel.internal.generic.InstructionHandle; @@ -1252,6 +1253,10 @@ classGen.getConstantPool()); transf.addException("com.sun.org.apache.xalan.internal.xsltc.TransletException"); + // call resetPrefixIndex at the beginning of transform + final int check = cpg.addMethodref(BASIS_LIBRARY_CLASS, "resetPrefixIndex", "()V"); + il.append(new INVOKESTATIC(check)); + // Define and initialize current with the root node final LocalVariableGen current = transf.addLocalVariable("current", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java new/jaxp-4099d8cf255f/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java --- old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java 2017-02-07 05:06:22.000000000 +0100 +++ new/jaxp-4099d8cf255f/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java 2017-05-03 04:50:27.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -48,6 +48,7 @@ import java.text.NumberFormat; import java.util.Locale; import java.util.ResourceBundle; +import java.util.concurrent.atomic.AtomicInteger; import javax.xml.transform.dom.DOMSource; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -1530,16 +1531,25 @@ } /** - * This function is used in the execution of xsl:element + * These functions are used in the execution of xsl:element to generate + * and reset namespace prefix index local to current transformation process */ - private static int prefixIndex = 0; - public static String generatePrefix() { - synchronized (BasisLibrary.class) { - return ("ns" + prefixIndex++); - } + return ("ns" + threadLocalPrefixIndex.get().getAndIncrement()); + } + + public static void resetPrefixIndex() { + threadLocalPrefixIndex.get().set(0); } + private static final ThreadLocal<AtomicInteger> threadLocalPrefixIndex = + new ThreadLocal<AtomicInteger>() { + @Override + protected AtomicInteger initialValue() { + return new AtomicInteger(); + } + }; + public static final String RUN_TIME_INTERNAL_ERR = "RUN_TIME_INTERNAL_ERR"; public static final String RUN_TIME_COPY_ERR = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java new/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java --- old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java 2017-02-07 05:06:22.000000000 +0100 +++ new/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java 2017-05-03 04:50:27.000000000 +0200 @@ -1,13 +1,14 @@ /* - * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. */ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -136,7 +137,7 @@ if (DEBUG_START_END_ELEMENT) System.out.println(">>> scanStartElementNS()"); // Note: namespace processing is on by default - fEntityScanner.scanQName(fElementQName, NameType.ATTRIBUTE); + fEntityScanner.scanQName(fElementQName, NameType.ELEMENTSTART); // REVISIT - [Q] Why do we need this local variable? -- mrglavas String rawname = fElementQName.rawname; if (fBindNamespaces) { @@ -346,7 +347,7 @@ protected void scanStartElementName () throws IOException, XNIException { // Note: namespace processing is on by default - fEntityScanner.scanQName(fElementQName, NameType.ATTRIBUTE); + fEntityScanner.scanQName(fElementQName, NameType.ELEMENTSTART); // Must skip spaces here because the DTD scanner // would consume them at the end of the external subset. fSawSpace = fEntityScanner.skipSpaces(); @@ -572,7 +573,7 @@ System.out.println(">>> scanAttribute()"); // name - fEntityScanner.scanQName(fAttributeQName, NameType.ATTRIBUTE); + fEntityScanner.scanQName(fAttributeQName, NameType.ATTRIBUTENAME); // equals fEntityScanner.skipSpaces(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java new/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java --- old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java 2017-02-07 05:06:22.000000000 +0100 +++ new/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java 2017-05-03 04:50:27.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved. */ /* @@ -1208,7 +1208,7 @@ // definitions while (!fEntityScanner.skipChar('>', null)) { - String name = fEntityScanner.scanName(NameType.ATTRIBUTE); + String name = fEntityScanner.scanName(NameType.ATTRIBUTENAME); if (name == null) { reportFatalError("AttNameRequiredInAttDef", new Object[]{elName}); @@ -1352,7 +1352,7 @@ fMarkUpDepth++; do { skipSeparator(false, !scanningInternalSubset()); - String aName = fEntityScanner.scanName(NameType.ATTRIBUTE); + String aName = fEntityScanner.scanName(NameType.ATTRIBUTENAME); if (aName == null) { reportFatalError("MSG_NAME_REQUIRED_IN_NOTATIONTYPE", new Object[]{elName, atName}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java new/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java --- old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java 2017-02-07 05:06:22.000000000 +0100 +++ new/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java 2017-05-03 04:50:27.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved. */ /* @@ -411,7 +411,7 @@ if (DEBUG_START_END_ELEMENT) System.out.println(this.getClass().toString() +">>> scanAttribute()"); // name - fEntityScanner.scanQName(fAttributeQName, NameType.ATTRIBUTE); + fEntityScanner.scanQName(fAttributeQName, NameType.ATTRIBUTENAME); // equals fEntityScanner.skipSpaces(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java new/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java --- old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java 2017-02-07 05:06:22.000000000 +0100 +++ new/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java 2017-05-03 04:50:27.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -562,6 +562,14 @@ switchToXML11Scanner(); } + if (fEventType == XMLStreamConstants.CHARACTERS || + fEventType == XMLStreamConstants.ENTITY_REFERENCE || + fEventType == XMLStreamConstants.PROCESSING_INSTRUCTION || + fEventType == XMLStreamConstants.COMMENT || + fEventType == XMLStreamConstants.CDATA) { + fEntityScanner.checkNodeCount(fEntityScanner.fCurrentEntity); + } + return fEventType; } catch (IOException ex) { // if this error occured trying to resolve the external DTD subset diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties new/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties --- old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties 2017-02-07 05:06:22.000000000 +0100 +++ new/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties 2017-05-03 04:50:27.000000000 +0200 @@ -106,7 +106,7 @@ src-element.2.2 = src-element.2.2: poich\u00E9 ''{0}'' contiene l''attributo ''ref'', il suo contenuto deve corrispondere a (annotation?), ma \u00E8 stato trovato ''{1}''. src-element.3 = src-element.3: l''elemento "{0}" ha sia un attributo ''type'' che un elemento figlio "anonymous type". \u00C8 consentito uno solo di questi valori per un elemento. src-import.1.1 = src-import.1.1: l''attributo "{0}" dello spazio di nomi di una voce di informazioni di elemento <import> non deve essere uguale al targetNamespace dello schema in cui esiste. - src-import.1.2 = src-import.1.2: se l''attributo dello spazio di nomi non \u00E8 presente in una voce di informazioni di elemento <import>, lo schema che lo contiene deve avere un targetNamespace. + src-import.1.2 = src-import.1.2: se l'attributo dello spazio di nomi non \u00E8 presente in una voce di informazioni di elemento <import>, lo schema che lo contiene deve avere un targetNamespace. src-import.2 = src-import.2: l''elemento radice del documento "{0}" deve avere lo spazio di nomi denominato ''http://www.w3.org/2001/XMLSchema'' e il nome locale ''schema''. src-import.3.1 = src-import.3.1: l''attributo "{0}" dello spazio di nomi di una voce di informazioni di elemento <import> deve essere uguale all''attributo targetNamespace ''{1}'' del documento importato. src-import.3.2 = src-import.3.2: non esiste alcun attributo dello spazio di nomi nella voce di informazioni di elemento <import>, pertanto il documento importato non pu\u00F2 avere alcun attributo targetNamespace. tuttavia, \u00E8 stato trovato targetNamespace ''{1}'' nel documento importato. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties new/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties --- old/jaxp-aa1c302a99fb/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties 2017-02-07 05:06:22.000000000 +0100 +++ new/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties 2017-05-03 04:50:27.000000000 +0200 @@ -9,7 +9,7 @@ FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n # XPointer Framework Error Messages -XPointerProcessingError = XPointerProcessingError: si \u00E8 verificato un errore durante l'elaborazione dell''espressione XPointer. +XPointerProcessingError = XPointerProcessingError: si \u00E8 verificato un errore durante l'elaborazione dell'espressione XPointer. InvalidXPointerToken = InvalidXPointerToken: l''espressione XPointer contiene il token non valido ''{0}''. InvalidXPointerExpression = InvalidXPointerExpression: l''espressione XPointer ''{0}'' non \u00E8 valida. MultipleShortHandPointers = MultipleShortHandPointers: l''espressione XPointer ''{0}'' non \u00E8 valida. Contiene pi\u00F9 puntatori ShortHand. @@ -22,6 +22,6 @@ # XPointer Element Scheme Error Messages InvalidElementSchemeToken = InvalidElementSchemeToken: l''espressione XPointer dello schema element() contiene il token non valido ''{0}''. InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: l''espressione XPointer ''{0}'' dello schema di elemento non \u00E8 valida. -XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: si \u00E8 verificato un errore durante l'elaborazione dell''espressione di schema element() XPointer. +XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: si \u00E8 verificato un errore durante l'elaborazione dell'espressione di schema element() XPointer. InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: lo schema element() contiene un puntatore ShortHand ''{0}'' con NCName non valido. InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: lo schema element() contiene un carattere di sequenza secondaria ''{0}'' non valido. ++++++ jaxws.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-ea96df8beff4/.hgtags new/jaxws-bc4f48c1ccba/.hgtags --- old/jaxws-ea96df8beff4/.hgtags 2017-02-07 05:06:25.000000000 +0100 +++ new/jaxws-bc4f48c1ccba/.hgtags 2017-05-03 04:50:27.000000000 +0200 @@ -665,3 +665,8 @@ 26bcf28b3a6076e7b51f88d6d78d4709c8da93d4 icedtea-2.6.8 3301b643d02c62f1b73f4fc70cfb52378ba0303e icedtea-2.6.9pre01 edcc7c1e297588b30daaf61e3cdf25203f829cd4 jdk7u131-b00 +ea96df8beff4c1b51c3e07cc290fd4792300f34e icedtea-2.6.9 +fc563206c50c7fc0ad45d68a921f60bf7b7d3b56 icedtea-2.6.10pre01 +90c86962aa2e81ecd8d5d79a282f2492447e4c6e jdk7u141-b00 +506e24eee4e1887fbfdd77512f830b75e14c5759 jdk7u141-b01 +1af82a2d3d16626b8d2f5e633d23c027975406b8 jdk7u141-b02 ++++++ jdk.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/jdk.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/jdk.tar.bz2 differ: char 11, line 1 ++++++ langtools.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-dd8e22d986c8/.hgtags new/langtools-6e30439005f6/.hgtags --- old/langtools-dd8e22d986c8/.hgtags 2017-02-07 05:06:35.000000000 +0100 +++ new/langtools-6e30439005f6/.hgtags 2017-05-03 04:50:27.000000000 +0200 @@ -665,3 +665,8 @@ 545e512eb4de948a44e6dd2187f386c644149aa7 icedtea-2.6.8 4f7f0c054b2d447b4a283810abbba7a0558f0a87 icedtea-2.6.9pre01 240ca8086e7151b5c516b5b46d84201e4e8f5806 jdk7u131-b00 +dd8e22d986c8b0f50c25b1a35f981933a926d992 icedtea-2.6.9 +fd8dde40d9dd105f07880bd002feb73555fbb16b icedtea-2.6.10pre01 +b1802aa8be3a49d2a5c07160f2406165e309efde jdk7u141-b00 +853798299f7a4f38745632dc256219fbf75f861e jdk7u141-b01 +ba8ba083c4392a1ddfe40467de1e08d77443807e jdk7u141-b02 ++++++ openjdk.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-6-2dd04ef37829/.hgtags new/icedtea7-forest-2-6-b3f98f0d4549/.hgtags --- old/icedtea7-forest-2-6-2dd04ef37829/.hgtags 2017-02-07 05:06:16.000000000 +0100 +++ new/icedtea7-forest-2-6-b3f98f0d4549/.hgtags 2017-05-03 04:50:27.000000000 +0200 @@ -663,3 +663,8 @@ 653c2662034dc87d063bc61c9741045041db7182 icedtea-2.6.8 36a89571adf078953219bf591098eaf18bc7213f icedtea-2.6.9pre01 259e6ca7faf17e2b96fb0733f30e62327a7acdfa jdk7u131-b00 +2dd04ef37829f92208f9044177284fab5db04e28 icedtea-2.6.9 +cd7f56e178662fcdc453edb6622b404f53aaea56 icedtea-2.6.10pre01 +e3b3add63d287cd07398949308308135ded4197e jdk7u141-b00 +b21d7bc25e0f96c6ed9b19e1ea0ea6253c34d7fe jdk7u141-b01 +db8fe12e5e508b18dd0aeb166099406a774b0d04 jdk7u141-b02

1 0

commit sac for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package sac for openSUSE:Factory checked in at 2017-05-31 13:31:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sac (Old) and /work/SRC/openSUSE:Factory/.sac.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sac" Wed May 31 13:31:27 2017 rev:6 rq:496886 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/sac/sac.changes 2016-03-16 10:26:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sac.new/sac.changes 2017-05-31 13:31:29.073625118 +0200 @@ -1,0 +2,5 @@ +Sat May 20 07:29:06 UTC 2017 - tchvatal(a)suse.com + +- Fix build with new javapackages-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sac.spec ++++++ --- /var/tmp/diff_new_pack.oBzZMb/_old 2017-05-31 13:31:31.253317879 +0200 +++ /var/tmp/diff_new_pack.oBzZMb/_new 2017-05-31 13:31:31.257317315 +0200 @@ -1,7 +1,7 @@ # # spec file for package sac # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,12 +31,11 @@ Source2: %{name}-MANIFEST.MF Source3: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/w3c/css/sac/1.3/sac-1.3.p… BuildRequires: ant -BuildRequires: java-devel -BuildRequires: jpackage-utils +BuildRequires: javapackages-local +BuildRequires: javapackages-tools BuildRequires: unzip BuildRequires: zip Requires: java -Requires: jpackage-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch

1 0

commit saxon6 for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package saxon6 for openSUSE:Factory checked in at 2017-05-31 13:31:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/saxon6 (Old) and /work/SRC/openSUSE:Factory/.saxon6.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "saxon6" Wed May 31 13:31:23 2017 rev:10 rq:496837 version:6.5.5 Changes: -------- --- /work/SRC/openSUSE:Factory/saxon6/saxon6.changes 2014-08-01 19:27:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.saxon6.new/saxon6.changes 2017-05-31 13:31:24.414281876 +0200 @@ -1,0 +2,5 @@ +Fri May 19 17:10:09 UTC 2017 - tchvatal(a)suse.com + +- Do not require javapackage-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ saxon6.spec ++++++ --- /var/tmp/diff_new_pack.4Val20/_old 2017-05-31 13:31:25.098185477 +0200 +++ /var/tmp/diff_new_pack.4Val20/_new 2017-05-31 13:31:25.102184913 +0200 @@ -1,7 +1,7 @@ # # spec file for package saxon6 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -134,7 +134,6 @@ Summary: Utility scripts for %{name} Group: Productivity/Publishing/XML Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools Provides: saxon-scripts %description scripts

1 0

commit saxon8 for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package saxon8 for openSUSE:Factory checked in at 2017-05-31 13:31:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/saxon8 (Old) and /work/SRC/openSUSE:Factory/.saxon8.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "saxon8" Wed May 31 13:31:17 2017 rev:17 rq:496836 version:B.8.8 Changes: -------- --- /work/SRC/openSUSE:Factory/saxon8/saxon8.changes 2014-08-01 19:27:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.saxon8.new/saxon8.changes 2017-05-31 13:31:19.898918339 +0200 @@ -1,0 +2,5 @@ +Fri May 19 17:09:34 UTC 2017 - tchvatal(a)suse.com + +- Do not require javapackage-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ saxon8.spec ++++++ --- /var/tmp/diff_new_pack.xIi3NV/_old 2017-05-31 13:31:20.862782478 +0200 +++ /var/tmp/diff_new_pack.xIi3NV/_new 2017-05-31 13:31:20.870781350 +0200 @@ -1,7 +1,7 @@ # # spec file for package saxon8 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -144,7 +144,6 @@ Summary: Utility scripts for saxon8 Group: Development/Languages/Other Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools %description scripts Utility scripts for saxon8.

1 0

commit apache-commons-parent for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package apache-commons-parent for openSUSE:Factory checked in at 2017-05-31 13:31:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-commons-parent (Old) and /work/SRC/openSUSE:Factory/.apache-commons-parent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-commons-parent" Wed May 31 13:31:13 2017 rev:11 rq:496830 version:32 Changes: -------- --- /work/SRC/openSUSE:Factory/apache-commons-parent/apache-commons-parent.changes 2015-04-02 15:53:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache-commons-parent.new/apache-commons-parent.changes 2017-05-31 13:31:14.263712649 +0200 @@ -1,0 +2,12 @@ +Fri May 19 16:59:46 UTC 2017 - tchvatal(a)suse.com + +- Do not require java-devel for build + +------------------------------------------------------------------- +Fri May 19 10:04:45 UTC 2017 - pcervinka(a)suse.com + +- New build dependency: javapackages-local +- Fixed requires +- Spec file cleaned + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-commons-parent.spec ++++++ --- /var/tmp/diff_new_pack.4vspVg/_old 2017-05-31 13:31:14.735646127 +0200 +++ /var/tmp/diff_new_pack.4vspVg/_new 2017-05-31 13:31:14.739645564 +0200 @@ -1,7 +1,7 @@ # # spec file for package apache-commons-parent # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,6 @@ %define base_name parent %define short_name commons-%{base_name} - Name: apache-%{short_name} Version: 32 Release: 0 @@ -26,38 +25,19 @@ License: Apache-2.0 Group: Development/Libraries/Java Url: http://svn.apache.org/repos/asf/commons/proper/%{short_name}/tags/%{short_n… - # svn export http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-… # tar caf commons-parent-32.tar.xz commons-parent-32 Source0: %{short_name}-%{version}.tar.xz - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - -BuildRequires: java-devel >= 1.6.0 +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: xz - Requires: java >= 1.6.0 -Requires: javapackages-tools -#Requires: maven2 >= 2.2.1 -#Requires: maven-antrun-plugin -#Requires: maven-assembly-plugin -#Requires: maven-compiler-plugin -#Requires: maven-idea-plugin -#Requires: maven-install-plugin -#Requires: maven-jar-plugin -#Requires: maven-javadoc-plugin -#Requires: maven-plugin-bundle -#Requires: maven-resources-plugin -#Requires: maven-surefire-plugin -Requires(post): javapackages-tools -Requires(postun): javapackages-tools - Provides: jakarta-%{short_name} = %{version}-%{release} Obsoletes: jakarta-%{short_name} < 23 Provides: %{short_name} = %{version}-%{release} Obsoletes: %{short_name} < 23 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description The Project Object Model files for the apache-commons packages.

1 0

commit ant for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package ant for openSUSE:Factory checked in at 2017-05-31 13:31:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ant (Old) and /work/SRC/openSUSE:Factory/.ant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ant" Wed May 31 13:31:05 2017 rev:59 rq:496829 version:1.9.9 Changes: -------- --- /work/SRC/openSUSE:Factory/ant/ant-antlr.changes 2017-02-28 23:46:41.318139471 +0100 +++ /work/SRC/openSUSE:Factory/.ant.new/ant-antlr.changes 2017-05-31 13:31:07.716635490 +0200 @@ -1,0 +2,20 @@ +Fri May 19 08:08:28 UTC 2017 - tchvatal(a)suse.com + +- Disable javadoc completely it is on the web in much better form +- Remove if0 conditions +- Remove patch apache-ant-old-gcj-build.patch for sle11 and unused +- Fix build with split javapackages-tools + +------------------------------------------------------------------- +Mon May 8 20:05:59 UTC 2017 - bwiedemann(a)suse.com + +- Version bump to 1.9.9: + * Read WHATSNEW file for full changelist + +------------------------------------------------------------------- +Mon May 8 07:43:51 UTC 2017 - bwiedemann(a)suse.de + +- Add reproducible.patch to allow reproducible builds of ant itself + and packages built with ant like jcodings + +------------------------------------------------------------------- ant-junit.changes: same change ant.changes: same change Old: ---- apache-ant-1.9.6-src.tar.bz2 apache-ant-1.9.6-src.tar.bz2.asc apache-ant-old-gcj-build.patch New: ---- apache-ant-1.9.9-src.tar.bz2 apache-ant-1.9.9-src.tar.bz2.asc reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-antlr.spec ++++++ --- /var/tmp/diff_new_pack.BLdtgl/_old 2017-05-31 13:31:10.616226779 +0200 +++ /var/tmp/diff_new_pack.BLdtgl/_new 2017-05-31 13:31:10.620226216 +0200 @@ -23,20 +23,12 @@ %bcond_with junit %bcond_without antlr -# disable javadoc build on arm platform - it delays a build a lot -# mvyskocil: ifarch does not work for noarch packages ... -%if %{_arch} != arm -%global build_javadoc 1 -%else -%global build_javadoc 0 -%endif - %global ant_home %{_datadir}/ant %global major_version 1.9 Name: ant-antlr -Version: 1.9.6 +Version: 1.9.9 Release: 0 Summary: Antlr Task for ant License: Apache-2.0 @@ -49,8 +41,8 @@ Source1002: ant.keyring Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch -#PATCH-FIX-SLE: fix building with old gcj by working around bugs -Patch2: apache-ant-old-gcj-build.patch +#PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079 +Patch3: reproducible.patch %if %{with bootstrap} BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel @@ -60,6 +52,8 @@ %endif BuildRequires: antlr-bootstrap BuildRequires: javapackages-tools +# Needed for maven conversions +BuildRequires: javapackages-local BuildRequires: unzip #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap @@ -73,6 +67,9 @@ BuildRequires: xerces-j2 BuildRequires: xml-commons-apis %endif +%if 0%{?suse_version} > 1320 +BuildRequires: strip-nondeterminism +%endif %if %{with bootstrap} Requires: java-devel >= 1.5.0 Requires: javapackages-tools @@ -90,6 +87,7 @@ Requires: antlr %requires_eq ant Provides: ant-antlr = %{version}-%{release} +Obsoletes: ant-javadoc %endif %if %{with junit} Requires: junit4 @@ -104,41 +102,9 @@ This package contains optional JUnit tasks for Apache Ant. %else -# FIXME: this should be different for antlr %description Apache Ant is a Java-based build tool. In theory, it is kind of like Make, but without Make's wrinkles. - -Why another build tool when there is already make, gnumake, nmake, jam, -and others? Because all those tools have limitations that Ant's -original author could not live with when developing software across -multiple platforms. Make-like tools are inherently shell-based--they -evaluate a set of dependencies then execute commands, not unlike what -you would issue in a shell. This means that you can easily extend these -tools by using or writing any program for the OS that you are working -on. However, this also means that you limit yourself to the OS, or at -least the OS type, such as Unix, that you are working on. - -Makefiles are inherently evil as well. Anybody who has worked on them -for any time has run into the dreaded tab problem. "Is my command not -executing because I have a space in front of my tab???" said the -original author of Ant way too many times. Tools like Jam took care of -this to a great degree, but still have yet another format to use and -remember. - -Ant is different. Instead of a model where it is extended with -shell-based commands, Ant is extended using Java classes. Instead of -writing shell commands, the configuration files are XML-based, calling -out a target tree where various tasks are executed. Each task is run by -an object that implements a particular task interface. - -Granted, this removes some of the expressive power that is inherent by -being able to construct a shell command such as `find . -name foo -exec -rm {}`, but it gives you the ability to be cross-platform--to work -anywhere and everywhere. If you really need to execute a shell command, -Ant has an <exec> task that allows different commands to be executed -based on the OS used. - %endif %if %{with bootstrap} @@ -236,20 +202,6 @@ This package contains optional commons net tasks for Apache Ant. -# Disable because we don't ship the dependencies -%if 0 -%package -n ant-jai -Summary: Optional jai tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jai -%requires_eq ant -BuildRequires: jai - -%description -n ant-jai -Optional jai tasks for ant. -%endif - %package -n ant-apache-bcel Summary: Optional apache bcel tasks for ant License: Apache-2.0 @@ -381,17 +333,6 @@ This package contains the manual for Apache Ant. -%if 0%{?build_javadoc} -%package -n ant-javadoc -Summary: Javadoc for ant -License: Apache-2.0 -Group: Development/Tools/Building - -%description -n ant-javadoc -Apache Ant is a Java-based build tool. - -This package contains the javadoc documentation for Apache Ant. -%endif #javadoc %endif %prep @@ -402,13 +343,9 @@ # When bootstrapping, we don't have junit %if %{with bootstrap} %patch0 -p1 -%if 0%{?suse_version} < 1200 -%patch2 -p1 -%endif %endif - -# Fix class-path-in-manifest rpmlint warning %patch1 +%patch3 -p1 # clean jar files %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm @@ -420,9 +357,6 @@ src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \ src/tests/junit/org/apache/tools/mail/MailMessageTest.java -#FIXME: need newer junit4 package -#rm src/tests/junit/org/example/junit/JUnit4Skippable.java - #install jars %if %{with junit} build-jar-repository -s -p lib/optional junit4 @@ -447,12 +381,6 @@ #remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar - -%if 0%{?build_javadoc} -export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) -ant javadocs -%endif - %endif %if %{with bootstrap} @@ -463,6 +391,7 @@ sh -x ./build.sh --noconfig jars %endif +%?strip_all_nondeterminism %install # ANT_HOME and subdirs @@ -584,7 +513,6 @@ echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver echo "jakarta-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging echo "jakarta-commons-net ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/ant.d/commons-net -#echo "jai ant/ant-jai" > %{buildroot}%{_sysconfdir}/ant.d/jai echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel echo "log4j ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro @@ -596,20 +524,6 @@ echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil %endif -%if %{with antlr} - -%if 0%{?build_javadoc} -mkdir -p %{buildroot}%{_javadocdir}/ant -cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/ant -%endif #javadoc - -%endif - -%if 0%{?build_javadoc} -# fix link between manual and javadoc -(cd manual; ln -sf %{_javadocdir}/%{name} api) -%endif #javadoc - %if %{with bootstrap} find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ -a ! -name ant-update.xsl \ @@ -655,7 +569,11 @@ %{_mavenpomdir}/JPP-ant-launcher.pom %{_mavenpomdir}/JPP-ant-parent.pom %{_mavenpomdir}/JPP-ant.pom +%if %{?suse_version} > 1320 %{_datadir}/maven-metadata/ant.xml +%else +%config(noreplace) %{_mavendepmapfragdir}/ant +%endif %dir %{_mavenpomdir} %endif @@ -666,7 +584,11 @@ %{ant_home}/lib/ant-antlr.jar %config(noreplace) %{_sysconfdir}/ant.d/antlr %{_mavenpomdir}/JPP.ant-ant-antlr.pom +%if %{?suse_version} > 1320 %{_datadir}/maven-metadata/ant-antlr.xml +%else +%config(noreplace) %{_mavendepmapfragdir}/ant-antlr +%endif %dir %{_mavenpomdir} %endif @@ -680,7 +602,11 @@ %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl %{_mavenpomdir}/JPP.ant-ant-junit*.pom +%if %{?suse_version} > 1320 %{_datadir}/maven-metadata/ant-junit.xml +%else +%config(noreplace) %{_mavendepmapfragdir}/ant-junit +%endif %dir %{_mavenpomdir} %endif @@ -741,15 +667,6 @@ %config(noreplace) %{_sysconfdir}/ant.d/commons-net %{_mavenpomdir}/JPP.ant-ant-commons-net.pom %dir %{_mavenpomdir} -# Disable as we dont ship the dependencies -%if 0 - -%files -n ant-jai -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-jai.jar -%{ant_home}/lib/ant-jai.jar -%config(noreplace) %{_sysconfdir}/ant.d/jai -%endif %files -n ant-apache-bcel %defattr(0644,root,root,0755) @@ -829,13 +746,6 @@ %files -n ant-manual %defattr(0644,root,root,0755) %doc manual/* - -%if 0%{?build_javadoc} - -%files -n ant-javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/ant -%endif #javadoc %endif %changelog ++++++ ant-junit.spec ++++++ --- /var/tmp/diff_new_pack.BLdtgl/_old 2017-05-31 13:31:10.652221706 +0200 +++ /var/tmp/diff_new_pack.BLdtgl/_new 2017-05-31 13:31:10.656221142 +0200 @@ -23,20 +23,12 @@ %bcond_without junit %bcond_with antlr -# disable javadoc build on arm platform - it delays a build a lot -# mvyskocil: ifarch does not work for noarch packages ... -%if %{_arch} != arm -%global build_javadoc 1 -%else -%global build_javadoc 0 -%endif - %global ant_home %{_datadir}/ant %global major_version 1.9 Name: ant-junit -Version: 1.9.6 +Version: 1.9.9 Release: 0 Summary: Optional junit tasks for ant License: Apache-2.0 @@ -49,8 +41,8 @@ Source1002: ant.keyring Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch -#PATCH-FIX-SLE: fix building with old gcj by working around bugs -Patch2: apache-ant-old-gcj-build.patch +#PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079 +Patch3: reproducible.patch %if %{with bootstrap} BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel @@ -60,6 +52,8 @@ %endif BuildRequires: antlr-bootstrap BuildRequires: javapackages-tools +# Needed for maven conversions +BuildRequires: javapackages-local BuildRequires: unzip #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap @@ -73,6 +67,9 @@ BuildRequires: xerces-j2 BuildRequires: xml-commons-apis %endif +%if 0%{?suse_version} > 1320 +BuildRequires: strip-nondeterminism +%endif %if %{with bootstrap} Requires: java-devel >= 1.5.0 Requires: javapackages-tools @@ -90,6 +87,7 @@ Requires: antlr %requires_eq ant Provides: ant-antlr = %{version}-%{release} +Obsoletes: ant-javadoc %endif %if %{with junit} Requires: junit4 @@ -104,41 +102,9 @@ This package contains optional JUnit tasks for Apache Ant. %else -# FIXME: this should be different for antlr %description Apache Ant is a Java-based build tool. In theory, it is kind of like Make, but without Make's wrinkles. - -Why another build tool when there is already make, gnumake, nmake, jam, -and others? Because all those tools have limitations that Ant's -original author could not live with when developing software across -multiple platforms. Make-like tools are inherently shell-based--they -evaluate a set of dependencies then execute commands, not unlike what -you would issue in a shell. This means that you can easily extend these -tools by using or writing any program for the OS that you are working -on. However, this also means that you limit yourself to the OS, or at -least the OS type, such as Unix, that you are working on. - -Makefiles are inherently evil as well. Anybody who has worked on them -for any time has run into the dreaded tab problem. "Is my command not -executing because I have a space in front of my tab???" said the -original author of Ant way too many times. Tools like Jam took care of -this to a great degree, but still have yet another format to use and -remember. - -Ant is different. Instead of a model where it is extended with -shell-based commands, Ant is extended using Java classes. Instead of -writing shell commands, the configuration files are XML-based, calling -out a target tree where various tasks are executed. Each task is run by -an object that implements a particular task interface. - -Granted, this removes some of the expressive power that is inherent by -being able to construct a shell command such as `find . -name foo -exec -rm {}`, but it gives you the ability to be cross-platform--to work -anywhere and everywhere. If you really need to execute a shell command, -Ant has an <exec> task that allows different commands to be executed -based on the OS used. - %endif %if %{with bootstrap} @@ -236,20 +202,6 @@ This package contains optional commons net tasks for Apache Ant. -# Disable because we don't ship the dependencies -%if 0 -%package -n ant-jai -Summary: Optional jai tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jai -%requires_eq ant -BuildRequires: jai - -%description -n ant-jai -Optional jai tasks for ant. -%endif - %package -n ant-apache-bcel Summary: Optional apache bcel tasks for ant License: Apache-2.0 @@ -381,17 +333,6 @@ This package contains the manual for Apache Ant. -%if 0%{?build_javadoc} -%package -n ant-javadoc -Summary: Javadoc for ant -License: Apache-2.0 -Group: Development/Tools/Building - -%description -n ant-javadoc -Apache Ant is a Java-based build tool. - -This package contains the javadoc documentation for Apache Ant. -%endif #javadoc %endif %prep @@ -402,13 +343,9 @@ # When bootstrapping, we don't have junit %if %{with bootstrap} %patch0 -p1 -%if 0%{?suse_version} < 1200 -%patch2 -p1 -%endif %endif - -# Fix class-path-in-manifest rpmlint warning %patch1 +%patch3 -p1 # clean jar files %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm @@ -420,9 +357,6 @@ src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \ src/tests/junit/org/apache/tools/mail/MailMessageTest.java -#FIXME: need newer junit4 package -#rm src/tests/junit/org/example/junit/JUnit4Skippable.java - #install jars %if %{with junit} build-jar-repository -s -p lib/optional junit4 @@ -447,12 +381,6 @@ #remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar - -%if 0%{?build_javadoc} -export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) -ant javadocs -%endif - %endif %if %{with bootstrap} @@ -463,6 +391,7 @@ sh -x ./build.sh --noconfig jars %endif +%?strip_all_nondeterminism %install # ANT_HOME and subdirs @@ -584,7 +513,6 @@ echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver echo "jakarta-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging echo "jakarta-commons-net ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/ant.d/commons-net -#echo "jai ant/ant-jai" > %{buildroot}%{_sysconfdir}/ant.d/jai echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel echo "log4j ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro @@ -596,20 +524,6 @@ echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil %endif -%if %{with antlr} - -%if 0%{?build_javadoc} -mkdir -p %{buildroot}%{_javadocdir}/ant -cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/ant -%endif #javadoc - -%endif - -%if 0%{?build_javadoc} -# fix link between manual and javadoc -(cd manual; ln -sf %{_javadocdir}/%{name} api) -%endif #javadoc - %if %{with bootstrap} find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ -a ! -name ant-update.xsl \ @@ -655,7 +569,11 @@ %{_mavenpomdir}/JPP-ant-launcher.pom %{_mavenpomdir}/JPP-ant-parent.pom %{_mavenpomdir}/JPP-ant.pom +%if %{?suse_version} > 1320 %{_datadir}/maven-metadata/ant.xml +%else +%config(noreplace) %{_mavendepmapfragdir}/ant +%endif %dir %{_mavenpomdir} %endif @@ -666,7 +584,11 @@ %{ant_home}/lib/ant-antlr.jar %config(noreplace) %{_sysconfdir}/ant.d/antlr %{_mavenpomdir}/JPP.ant-ant-antlr.pom +%if %{?suse_version} > 1320 %{_datadir}/maven-metadata/ant-antlr.xml +%else +%config(noreplace) %{_mavendepmapfragdir}/ant-antlr +%endif %dir %{_mavenpomdir} %endif @@ -680,7 +602,11 @@ %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl %{_mavenpomdir}/JPP.ant-ant-junit*.pom +%if %{?suse_version} > 1320 %{_datadir}/maven-metadata/ant-junit.xml +%else +%config(noreplace) %{_mavendepmapfragdir}/ant-junit +%endif %dir %{_mavenpomdir} %endif @@ -741,15 +667,6 @@ %config(noreplace) %{_sysconfdir}/ant.d/commons-net %{_mavenpomdir}/JPP.ant-ant-commons-net.pom %dir %{_mavenpomdir} -# Disable as we dont ship the dependencies -%if 0 - -%files -n ant-jai -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-jai.jar -%{ant_home}/lib/ant-jai.jar -%config(noreplace) %{_sysconfdir}/ant.d/jai -%endif %files -n ant-apache-bcel %defattr(0644,root,root,0755) @@ -829,13 +746,6 @@ %files -n ant-manual %defattr(0644,root,root,0755) %doc manual/* - -%if 0%{?build_javadoc} - -%files -n ant-javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/ant -%endif #javadoc %endif %changelog ++++++ ant.spec ++++++ --- /var/tmp/diff_new_pack.BLdtgl/_old 2017-05-31 13:31:10.688216632 +0200 +++ /var/tmp/diff_new_pack.BLdtgl/_new 2017-05-31 13:31:10.688216632 +0200 @@ -22,20 +22,12 @@ %bcond_with junit %bcond_with antlr -# disable javadoc build on arm platform - it delays a build a lot -# mvyskocil: ifarch does not work for noarch packages ... -%if %{_arch} != arm -%global build_javadoc 1 -%else -%global build_javadoc 0 -%endif - %global ant_home %{_datadir}/ant %global major_version 1.9 Name: ant -Version: 1.9.6 +Version: 1.9.9 Release: 0 Summary: Java-based build tool License: Apache-2.0 @@ -48,17 +40,21 @@ Source1002: ant.keyring Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch -#PATCH-FIX-SLE: fix building with old gcj by working around bugs -Patch2: apache-ant-old-gcj-build.patch +#PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079 +Patch3: reproducible.patch %if %{with bootstrap} BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel +#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel +#!BuildIgnore: java-9-openjdk java-9-openjdk-devel %else BuildRequires: java-devel >= 1.5.0 %endif BuildRequires: antlr-bootstrap BuildRequires: javapackages-tools +# Needed for maven conversions +BuildRequires: javapackages-local BuildRequires: unzip #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap @@ -72,6 +68,9 @@ BuildRequires: xerces-j2 BuildRequires: xml-commons-apis %endif +%if 0%{?suse_version} > 1320 +BuildRequires: strip-nondeterminism +%endif %if %{with bootstrap} Requires: java-devel >= 1.5.0 Requires: javapackages-tools @@ -89,6 +88,7 @@ Requires: antlr %requires_eq ant Provides: ant-antlr = %{version}-%{release} +Obsoletes: ant-javadoc %endif %if %{with junit} Requires: junit4 @@ -103,41 +103,9 @@ This package contains optional JUnit tasks for Apache Ant. %else -# FIXME: this should be different for antlr %description Apache Ant is a Java-based build tool. In theory, it is kind of like Make, but without Make's wrinkles. - -Why another build tool when there is already make, gnumake, nmake, jam, -and others? Because all those tools have limitations that Ant's -original author could not live with when developing software across -multiple platforms. Make-like tools are inherently shell-based--they -evaluate a set of dependencies then execute commands, not unlike what -you would issue in a shell. This means that you can easily extend these -tools by using or writing any program for the OS that you are working -on. However, this also means that you limit yourself to the OS, or at -least the OS type, such as Unix, that you are working on. - -Makefiles are inherently evil as well. Anybody who has worked on them -for any time has run into the dreaded tab problem. "Is my command not -executing because I have a space in front of my tab???" said the -original author of Ant way too many times. Tools like Jam took care of -this to a great degree, but still have yet another format to use and -remember. - -Ant is different. Instead of a model where it is extended with -shell-based commands, Ant is extended using Java classes. Instead of -writing shell commands, the configuration files are XML-based, calling -out a target tree where various tasks are executed. Each task is run by -an object that implements a particular task interface. - -Granted, this removes some of the expressive power that is inherent by -being able to construct a shell command such as `find . -name foo -exec -rm {}`, but it gives you the ability to be cross-platform--to work -anywhere and everywhere. If you really need to execute a shell command, -Ant has an <exec> task that allows different commands to be executed -based on the OS used. - %endif %if %{with bootstrap} @@ -235,20 +203,6 @@ This package contains optional commons net tasks for Apache Ant. -# Disable because we don't ship the dependencies -%if 0 -%package -n ant-jai -Summary: Optional jai tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jai -%requires_eq ant -BuildRequires: jai - -%description -n ant-jai -Optional jai tasks for ant. -%endif - %package -n ant-apache-bcel Summary: Optional apache bcel tasks for ant License: Apache-2.0 @@ -380,17 +334,6 @@ This package contains the manual for Apache Ant. -%if 0%{?build_javadoc} -%package -n ant-javadoc -Summary: Javadoc for ant -License: Apache-2.0 -Group: Development/Tools/Building - -%description -n ant-javadoc -Apache Ant is a Java-based build tool. - -This package contains the javadoc documentation for Apache Ant. -%endif #javadoc %endif %prep @@ -401,13 +344,9 @@ # When bootstrapping, we don't have junit %if %{with bootstrap} %patch0 -p1 -%if 0%{?suse_version} < 1200 -%patch2 -p1 -%endif %endif - -# Fix class-path-in-manifest rpmlint warning %patch1 +%patch3 -p1 # clean jar files %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm @@ -419,9 +358,6 @@ src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \ src/tests/junit/org/apache/tools/mail/MailMessageTest.java -#FIXME: need newer junit4 package -#rm src/tests/junit/org/example/junit/JUnit4Skippable.java - #install jars %if %{with junit} build-jar-repository -s -p lib/optional junit4 @@ -446,12 +382,6 @@ #remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar - -%if 0%{?build_javadoc} -export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) -ant javadocs -%endif - %endif %if %{with bootstrap} @@ -462,6 +392,7 @@ sh -x ./build.sh --noconfig jars %endif +%?strip_all_nondeterminism %install # ANT_HOME and subdirs @@ -583,7 +514,6 @@ echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver echo "jakarta-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging echo "jakarta-commons-net ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/ant.d/commons-net -#echo "jai ant/ant-jai" > %{buildroot}%{_sysconfdir}/ant.d/jai echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel echo "log4j ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro @@ -595,20 +525,6 @@ echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil %endif -%if %{with antlr} - -%if 0%{?build_javadoc} -mkdir -p %{buildroot}%{_javadocdir}/ant -cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/ant -%endif #javadoc - -%endif - -%if 0%{?build_javadoc} -# fix link between manual and javadoc -(cd manual; ln -sf %{_javadocdir}/%{name} api) -%endif #javadoc - %if %{with bootstrap} find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ -a ! -name ant-update.xsl \ @@ -654,7 +570,11 @@ %{_mavenpomdir}/JPP-ant-launcher.pom %{_mavenpomdir}/JPP-ant-parent.pom %{_mavenpomdir}/JPP-ant.pom +%if %{?suse_version} > 1320 %{_datadir}/maven-metadata/ant.xml +%else +%config(noreplace) %{_mavendepmapfragdir}/ant +%endif %dir %{_mavenpomdir} %endif @@ -665,7 +585,11 @@ %{ant_home}/lib/ant-antlr.jar %config(noreplace) %{_sysconfdir}/ant.d/antlr %{_mavenpomdir}/JPP.ant-ant-antlr.pom +%if %{?suse_version} > 1320 %{_datadir}/maven-metadata/ant-antlr.xml +%else +%config(noreplace) %{_mavendepmapfragdir}/ant-antlr +%endif %dir %{_mavenpomdir} %endif @@ -679,7 +603,11 @@ %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl %{_mavenpomdir}/JPP.ant-ant-junit*.pom +%if %{?suse_version} > 1320 %{_datadir}/maven-metadata/ant-junit.xml +%else +%config(noreplace) %{_mavendepmapfragdir}/ant-junit +%endif %dir %{_mavenpomdir} %endif @@ -740,15 +668,6 @@ %config(noreplace) %{_sysconfdir}/ant.d/commons-net %{_mavenpomdir}/JPP.ant-ant-commons-net.pom %dir %{_mavenpomdir} -# Disable as we dont ship the dependencies -%if 0 - -%files -n ant-jai -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-jai.jar -%{ant_home}/lib/ant-jai.jar -%config(noreplace) %{_sysconfdir}/ant.d/jai -%endif %files -n ant-apache-bcel %defattr(0644,root,root,0755) @@ -828,13 +747,6 @@ %files -n ant-manual %defattr(0644,root,root,0755) %doc manual/* - -%if 0%{?build_javadoc} - -%files -n ant-javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/ant -%endif #javadoc %endif %changelog ++++++ apache-ant-1.9.6-src.tar.bz2 -> apache-ant-1.9.9-src.tar.bz2 ++++++ ++++ 13226 lines of diff (skipped) ++++++ reproducible.patch ++++++ commit 7c6c749c952153170e82b791d97086e99fe2a3cb Author: Stefan Bodewig <bodewig(a)apache.org> Date: Mon May 8 18:44:07 2017 +0200 add magic property that override's tstamp's idea of "now" https://bz.apache.org/bugzilla/show_bug.cgi?id=61079 diff --git a/manual/Tasks/tstamp.html b/manual/Tasks/tstamp.html index 82812a579..6baa0c882 100644 --- a/manual/Tasks/tstamp.html +++ b/manual/Tasks/tstamp.html @@ -40,6 +40,12 @@ to indicate, for example, the release date. The best place for this task is probably in an initialization target.</p> +<p><em>Since Ant 1.9.10</em> the magic + property <code>ant.tstamp.now</code> can be used to specify a fixed + date value in order to create reproducible builds. Its value must be + a number and is interpreted as seconds since the epoch (midnight + 1970-01-01).</p> + <h3>Parameters</h3> <table border="1" cellpadding="2" cellspacing="0"> <tr> diff --git a/manual/running.html b/manual/running.html index 529afc7dc..3bfb500c8 100644 --- a/manual/running.html +++ b/manual/running.html @@ -485,6 +485,11 @@ <a href="argumentprocessor.html#repository">ArgumentProcessor internal repository</a>. </td> </tr> +<tr> + <td><code>ant.tstamp.now</code></td> + <td>number, seconds since the epoch (midnight 1970-01-01)</td> + <td>The value to use as current time and date for <tstamp></td> +</tr> </table> <p> diff --git a/src/main/org/apache/tools/ant/MagicNames.java b/src/main/org/apache/tools/ant/MagicNames.java index bc39a2578..67ab8a810 100644 --- a/src/main/org/apache/tools/ant/MagicNames.java +++ b/src/main/org/apache/tools/ant/MagicNames.java @@ -289,5 +289,18 @@ public final class MagicNames { * Value {@value} */ public static final String HTTP_AGENT_PROPERTY = "ant.http.agent"; + + /** + * Magic property that can be set to contain a value for tstamp's + * "now" in order to make builds that use the task create + * reproducible results. + * + * <p>The value is expected to be a number representing the date + * as seconds since the epoch.</p> + * + * Value: {@value} + * @since Ant 1.9.10 + */ + public static final String TSTAMP_NOW = "ant.tstamp.now"; } diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java index 805427aba..a6a35d7b4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java +++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java @@ -32,6 +32,7 @@ import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Location; +import org.apache.tools.ant.MagicNames; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.EnumeratedAttribute; @@ -68,7 +69,7 @@ public class Tstamp extends Task { */ public void execute() throws BuildException { try { - Date d = new Date(); + Date d = getNow(); Enumeration i = customFormats.elements(); while (i.hasMoreElements()) { @@ -110,6 +111,22 @@ public class Tstamp extends Task { } /** + * Return the {@link Date} instance to use as base for DSTAMP, TSTAMP and TODAY. + */ + protected Date getNow() { + String magicNow = getProject().getProperty(MagicNames.TSTAMP_NOW); + if (magicNow != null && magicNow.length() > 0) { + try { + return new Date(1000 * Long.parseLong(magicNow)); + } catch (NumberFormatException ex) { + log("magic property " + MagicNames.TSTAMP_NOW + " ignored as " + + magicNow + " is not a valid number"); + } + } + return new Date(); + } + + /** * This nested element that allows a property to be set * to the current date and time in a given format. * The date/time patterns are as defined in the diff --git a/src/tests/antunit/taskdefs/tstamp-test.xml b/src/tests/antunit/taskdefs/tstamp-test.xml new file mode 100644 index 000000000..c9bebf866 --- /dev/null +++ b/src/tests/antunit/taskdefs/tstamp-test.xml @@ -0,0 +1,27 @@ +<?xml version="1.0"?> + +<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> + <import file="../antunit-base.xml" /> + + <target name="testMagicProperty"> + <local name="ant.tstamp.now"/> + <property name="ant.tstamp.now" value="100000"/> + <tstamp/> + <au:assertPropertyEquals name="DSTAMP" value="19700102"/> + </target> +</project>

1 0

commit jdom for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package jdom for openSUSE:Factory checked in at 2017-05-31 13:31:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jdom (Old) and /work/SRC/openSUSE:Factory/.jdom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jdom" Wed May 31 13:31:00 2017 rev:20 rq:496827 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/jdom/jdom.changes 2015-04-02 16:00:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jdom.new/jdom.changes 2017-05-31 13:31:02.177416269 +0200 @@ -1,0 +2,5 @@ +Fri May 19 16:55:11 UTC 2017 - tchvatal(a)suse.com + +- Expand the buildignore lines for newer jdk + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jdom.spec ++++++ --- /var/tmp/diff_new_pack.Xsf7pt/_old 2017-05-31 13:31:03.601215578 +0200 +++ /var/tmp/diff_new_pack.Xsf7pt/_new 2017-05-31 13:31:03.601215578 +0200 @@ -1,7 +1,7 @@ # # spec file for package jdom # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -61,6 +61,8 @@ BuildRequires: servletapi5 #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel +#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel +#!BuildIgnore: java-9-openjdk java-9-openjdk-devel BuildRequires: unzip BuildRequires: xalan-j2 BuildRequires: xerces-j2

1 0

commit ecj for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package ecj for openSUSE:Factory checked in at 2017-05-31 13:30:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ecj (Old) and /work/SRC/openSUSE:Factory/.ecj.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ecj" Wed May 31 13:30:54 2017 rev:22 rq:496824 version:4.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ecj/ecj.changes 2015-09-17 09:17:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ecj.new/ecj.changes 2017-05-31 13:30:57.142126015 +0200 @@ -1,0 +2,5 @@ +Fri May 19 12:04:39 UTC 2017 - tchvatal(a)suse.com + +- Fix build with javapacakges-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ecj.spec ++++++ --- /var/tmp/diff_new_pack.IQeD9p/_old 2017-05-31 13:30:58.309961404 +0200 +++ /var/tmp/diff_new_pack.IQeD9p/_new 2017-05-31 13:30:58.313960840 +0200 @@ -1,7 +1,7 @@ # # spec file for package ecj # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,16 +46,18 @@ Patch3: eclipse-gcj-nodummysymbol.patch BuildRequires: ant BuildRequires: gzip +BuildRequires: javapackages-local +BuildRequires: javapackages-tools BuildRequires: unzip Conflicts: ecj-bootstrap Provides: eclipse-ecj = %{version}-%{release} Obsoletes: eclipse-ecj < 3.4.2-4 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if 0%{?suse_version} > 1315 || 0%{?is_opensuse} == 1 #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel #!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel +#!BuildIgnore: java-9-openjdk java-9-openjdk-devel BuildRequires: java-1_7_0-openjdk-bootstrap-devel %else BuildRequires: java-devel >= 1.7.0

1 0