Hello community,
here is the log from the commit of package xmlbeans for openSUSE:Factory
checked in at 2017-10-10 11:39:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlbeans (Old)
and /work/SRC/openSUSE:Factory/.xmlbeans.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlbeans"
Tue Oct 10 11:39:10 2017 rev:31 rq:531458 version:2.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlbeans/xmlbeans-mini.changes 2017-09-13
22:27:59.095460261 +0200
+++ /work/SRC/openSUSE:Factory/.xmlbeans.new/xmlbeans-mini.changes
2017-10-10 11:39:13.737367609 +0200
@@ -1,0 +2,7 @@
+Wed Oct 4 12:21:21 UTC 2017 - fst...@suse.com
+
+- Remove the dependency on java-1_5_0-gcj-compat
+- Use java source and target level 1.6 also for xmlbeans-mini
+- Clean spec files
+
+-------------------------------------------------------------------
@@ -6,0 +14,14 @@
+Mon Sep 11 14:21:30 UTC 2017 - fst...@suse.com
+
+- Added patch:
+ * xmlbeans-2.6.0-jdk9.patch
+ + Specify java source and target level 1.6 and java file
+ encoding in order to allow building with jdk9
+
+-------------------------------------------------------------------
+Thu Apr 27 14:50:06 UTC 2017 - dims...@opensuse.org
+
+- Buildignore xml-commons-jaxp-1.3-apis and xml-commons-resolver12
+ only when building xmlbeans-mini.
+
+-------------------------------------------------------------------
@@ -13 +34 @@
-Tue Dec 9 07:49:55 UTC 2014 - tchva...@suse.com
+Tue Dec 9 07:49:21 UTC 2014 - tchva...@suse.com
@@ -15 +36 @@
-- Put back gcj compat as it fixes build cycle
+- Try to fix the cycle, put back gcj compat dep
@@ -24 +45,7 @@
-Tue Jul 8 10:32:34 UTC 2014 - tchva...@suse.com
+Fri Aug 29 12:32:21 UTC 2014 - co...@suse.com
+
+- provide xmlbeans in xmlbeans-mini so it's a valid choice
+ during bootstrap
+
+-------------------------------------------------------------------
+Tue Jul 8 10:32:28 UTC 2014 - tchva...@suse.com
@@ -47 +74 @@
-Thu Sep 12 15:41:54 UTC 2013 - tchva...@suse.com
+Thu Sep 12 15:39:59 UTC 2013 - tchva...@suse.com
@@ -51,0 +79,5 @@
+Fri Aug 23 12:28:46 UTC 2013 - mvysko...@suse.com
+
+- remove javadoc and manual packages
+
+-------------------------------------------------------------------
@@ -57 +89 @@
-Fri Apr 5 09:03:57 UTC 2013 - idon...@suse.com
+Fri Apr 5 09:03:09 UTC 2013 - idon...@suse.com
@@ -87 +119 @@
-Mon Nov 8 12:09:54 UTC 2010 - mvysko...@suse.cz
+Mon Nov 8 12:09:49 UTC 2010 - mvysko...@suse.cz
@@ -92 +124 @@
-Thu Sep 2 12:50:48 UTC 2010 - mvysko...@suse.cz
+Thu Sep 2 12:50:46 UTC 2010 - mvysko...@suse.cz
--- /work/SRC/openSUSE:Factory/xmlbeans/xmlbeans.changes 2017-09-13
22:27:59.991334141 +0200
+++ /work/SRC/openSUSE:Factory/.xmlbeans.new/xmlbeans.changes 2017-10-10
11:39:13.765366380 +0200
@@ -1,0 +2,7 @@
+Wed Oct 4 12:21:21 UTC 2017 - fst...@suse.com
+
+- Remove the dependency on java-1_5_0-gcj-compat
+- Use java source and target level 1.6 also for xmlbeans-mini
+- Clean spec files
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmlbeans-mini.spec ++++++
--- /var/tmp/diff_new_pack.zgzStl/_old 2017-10-10 11:39:14.453336185 +0200
+++ /var/tmp/diff_new_pack.zgzStl/_new 2017-10-10 11:39:14.457336009 +0200
@@ -36,20 +36,24 @@
Patch3: xmlbeans-2.6.0-jdk9.patch
BuildRequires: ant >= 1.6
BuildRequires: bea-stax-api
+BuildRequires: java-devel
BuildRequires: javapackages-tools
BuildRequires: unzip
-#!BuildIgnore: antlr antlr-java
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+#!BuildIgnore: antlr
+#!BuildIgnore: antlr-java
BuildArch: noarch
%if %{bootstrap}
-BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: xml-commons-apis-bootstrap
BuildRequires: xml-commons-resolver-bootstrap
+#!BuildIgnore: xerces-j2
+#!BuildIgnore: xerces-j2-bootstrap
+#!BuildIgnore: xml-commons
+#!BuildIgnore: xml-commons-apis
+#!BuildIgnore: xml-commons-jaxp-1.3-apis
+#!BuildIgnore: xml-commons-resolver
+#!BuildIgnore: xml-commons-resolver12
# we need this to fix requires of rhino and others
Provides: xmlbeans
-#!BuildIgnore: xerces-j2-bootstrap
-#!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver
-#!BuildIgnore: xml-commons-jaxp-1.3-apis xml-commons-resolver12
%else
BuildRequires: ant-contrib
BuildRequires: ant-junit
@@ -57,8 +61,8 @@
BuildRequires: saxon9
BuildRequires: xml-commons-resolver >= 1.1
BuildRequires: xmlbeans-mini
-Conflicts: xmlbeans-mini
#!BuildIgnore: xmlbeans
+Conflicts: xmlbeans-mini
%endif
%description
@@ -88,10 +92,8 @@
%setup -q -n %{real}-%{version}
%patch0 -p1 -b .nodownload
%patch1 -p1
-%patch2 -p0
-%if ! %{bootstrap}
+%patch2
%patch3 -p1
-%endif
%build
# Piccolo and jam are rebuilt from source and bundled with xbean
@@ -148,14 +150,12 @@
%endif #if ! % { bootstrap}
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt README.txt
%dir %{_javadir}/xmlbeans/
%{_javadir}/xmlbeans/*.jar
%if ! %{bootstrap}
%files scripts
-%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/*
%endif #!bootstrap
++++++ xmlbeans.spec ++++++
--- /var/tmp/diff_new_pack.zgzStl/_old 2017-10-10 11:39:14.473335307 +0200
+++ /var/tmp/diff_new_pack.zgzStl/_new 2017-10-10 11:39:14.477335132 +0200
@@ -35,20 +35,24 @@
Patch3: xmlbeans-2.6.0-jdk9.patch
BuildRequires: ant >= 1.6
BuildRequires: bea-stax-api
+BuildRequires: java-devel
BuildRequires: javapackages-tools
BuildRequires: unzip
-#!BuildIgnore: antlr antlr-java
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+#!BuildIgnore: antlr
+#!BuildIgnore: antlr-java
BuildArch: noarch
%if %{bootstrap}
-BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: xml-commons-apis-bootstrap
BuildRequires: xml-commons-resolver-bootstrap
+#!BuildIgnore: xerces-j2
+#!BuildIgnore: xerces-j2-bootstrap
+#!BuildIgnore: xml-commons
+#!BuildIgnore: xml-commons-apis
+#!BuildIgnore: xml-commons-jaxp-1.3-apis
+#!BuildIgnore: xml-commons-resolver
+#!BuildIgnore: xml-commons-resolver12
# we need this to fix requires of rhino and others
Provides: xmlbeans
-#!BuildIgnore: xerces-j2-bootstrap
-#!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver
-#!BuildIgnore: xml-commons-jaxp-1.3-apis xml-commons-resolver12
%else
BuildRequires: ant-contrib
BuildRequires: ant-junit
@@ -56,8 +60,8 @@
BuildRequires: saxon9
BuildRequires: xml-commons-resolver >= 1.1
BuildRequires: xmlbeans-mini
-Conflicts: xmlbeans-mini
#!BuildIgnore: xmlbeans
+Conflicts: xmlbeans-mini
%endif
%description
@@ -87,10 +91,8 @@
%setup -q -n %{real}-%{version}
%patch0 -p1 -b .nodownload
%patch1 -p1
-%patch2 -p0
-%if ! %{bootstrap}
+%patch2
%patch3 -p1
-%endif
%build
# Piccolo and jam are rebuilt from source and bundled with xbean
@@ -147,14 +149,12 @@
%endif #if ! % { bootstrap}
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt README.txt
%dir %{_javadir}/xmlbeans/
%{_javadir}/xmlbeans/*.jar
%if ! %{bootstrap}
%files scripts
-%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/*
%endif #!bootstrap
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.zgzStl/_old 2017-10-10 11:39:14.501334079 +0200
+++ /var/tmp/diff_new_pack.zgzStl/_new 2017-10-10 11:39:14.501334079 +0200
@@ -3,3 +3,5 @@
sed "s/^%global bootstrap.*$/${EDIT_WARNING}%global bootstrap 1/;
s/^\(Name:.*\)$/\1-mini/;
" < xmlbeans.spec > xmlbeans-mini.spec
+rm -f xmlbeans-mini.changes
+ln xmlbeans.changes xmlbeans-mini.changes
