Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2014-06-16 21:43:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes
2014-05-10 08:32:48.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes
2014-06-16 21:43:48.000000000 +0200
@@ -7,0 +8,5 @@
+Thu May 8 10:48:23 UTC 2014 - [email protected]
+
+- remove quilt dependency
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.tRh3gn/_old 2014-06-16 21:43:50.000000000 +0200
+++ /var/tmp/diff_new_pack.tRh3gn/_new 2014-06-16 21:43:50.000000000 +0200
@@ -256,7 +256,6 @@
BuildRequires: jpackage-utils >= 1.7.5
BuildRequires: krb5-devel
BuildRequires: libjpeg-devel
-BuildRequires: quilt
%if %{with_system_lcms}
# since 2.4.1 release, newest lcms2 is needed
BuildRequires: liblcms2-devel >= 2.5
@@ -646,45 +645,37 @@
make patch
-# XXX: The quilt setup series fails with existing patches dir ... do not want
to
-# export an another patches dir, as this will not be in chroot, which is the
-# reason I use quilt - to be able edit patches directly in chroot
-function qpatch() {
- quilt import "${@}"
- quilt push
-}
-
%ifnarch aarch64
-qpatch -p0 %{PATCH3}
-qpatch -p0 %{PATCH4}
+patch -p0 -i %{PATCH3}
+patch -p0 -i %{PATCH4}
%endif
# % if %{debug}
-# qpatch -p0 %{PATCH5}
-# qpatch -p0 %{PATCH6}
+# patch -p0 -i %{PATCH5}
+# patch -p0 -i %{PATCH6}
# % endif
%ifnarch aarch64
-qpatch -p0 %{PATCH106}
-qpatch -p0 %{PATCH108}
-qpatch -p0 %{PATCH200}
+patch -p0 -i %{PATCH106}
+patch -p0 -i %{PATCH108}
+patch -p0 -i %{PATCH200}
%ifarch %{jit_arches}
-#qpatch -p0 %{PATCH402}
-qpatch -p0 %{PATCH403}
+#patch -p0 -i %{PATCH402}
+patch -p0 -i %{PATCH403}
%endif
%endif
-qpatch -p0 %{PATCH107}
+patch -p0 -i %{PATCH107}
-qpatch -p0 -R %{PATCH404}
+patch -p0 -R -i %{PATCH404}
#SUSE specific fixes
-qpatch -p1 %{PATCH1002}
+patch -p1 -i %{PATCH1002}
%if %{with zero}
-qpatch -p0 %{PATCH1004}
-qpatch -p1 %{PATCH1005}
+patch -p0 -i %{PATCH1004}
+patch -p1 -i %{PATCH1005}
#XXX: there are many issues in hotspot 2.1, but I would say noone will fix them
# so ignore all Werror like troubles we can find
@@ -693,7 +684,7 @@
%endif
%ifnarch aarch64
-qpatch -p1 %{PATCH1001}
+patch -p1 -i %{PATCH1001}
%endif
make %{_smp_mflags}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
