From 827b17219d6e72d6d73f9a432c98e012e1e26b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?= Date: Thu, 26 Nov 2020 09:35:46 +0200 Subject: [PATCH] [libzypp] Fix diff arguments for busybox-diff. --- ...-Fix-diff-arguments-for-busybox-diff.patch | 27 +++++++++++++++++++ rpm/libzypp.spec | 1 + 2 files changed, 28 insertions(+) create mode 100644 rpm/0008-libzypp-Fix-diff-arguments-for-busybox-diff.patch diff --git a/rpm/0008-libzypp-Fix-diff-arguments-for-busybox-diff.patch b/rpm/0008-libzypp-Fix-diff-arguments-for-busybox-diff.patch new file mode 100644 index 0000000..3bb7ad6 --- /dev/null +++ b/rpm/0008-libzypp-Fix-diff-arguments-for-busybox-diff.patch @@ -0,0 +1,27 @@ +From 6593ab4bab379b2c0ef9a73f6da937bebf91b642 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?= + +Date: Thu, 26 Nov 2020 09:34:44 +0200 +Subject: [PATCH] [libzypp] Fix diff arguments for busybox-diff. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Juho Hämäläinen +--- + po/PotfileDiff.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/po/PotfileDiff.sh b/po/PotfileDiff.sh +index 04a249c04..ee72c5dfc 100755 +--- a/po/PotfileDiff.sh ++++ b/po/PotfileDiff.sh +@@ -10,4 +10,4 @@ extract "$1" >"$OLDTMP" + extract "$2" >"$NEWTMP" + + shift 2 # additional args for diff +-diff -u0 "$@" "$OLDTMP" "$NEWTMP" ++diff -U 0 "$@" "$OLDTMP" "$NEWTMP" +-- +2.25.1 + diff --git a/rpm/libzypp.spec b/rpm/libzypp.spec index f83de54..909d6de 100644 --- a/rpm/libzypp.spec +++ b/rpm/libzypp.spec @@ -15,6 +15,7 @@ Patch4: 0004-libzypp-Enable-netrcoptional-on-libcurl-to-allow-for.patch Patch5: 0005-Disable-docs-building-with-force.patch Patch6: 0006-Use-rpm-platform-for-architecture-autodetection.patch Patch7: 0007-Revert-Cleanup-remove-unneeded-ifndef-SWIG.patch +Patch8: 0008-libzypp-Fix-diff-arguments-for-busybox-diff.patch BuildRequires: cmake BuildRequires: pkgconfig(openssl) >= 1.1 # Need boost > 1.53 for string_ref utility