diff options
| author | CoprDistGit <infra@openeuler.org> | 2023-05-30 08:55:11 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2023-05-30 08:55:11 +0000 |
| commit | 87207239fdb31e0234b7d54f547e2d4fd64ad3d5 (patch) | |
| tree | 5eba4d509fa2001a434f403a57d6f27920cf9c75 | |
| parent | 013560a96d059e9221eb8965e0a07d3c7e73bc8e (diff) | |
automatic import of rpkg-macros
| -rw-r--r-- | allow_protocol_file.patch | 12 | ||||
| -rw-r--r-- | rpkg-macros.spec | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/allow_protocol_file.patch b/allow_protocol_file.patch new file mode 100644 index 0000000..d83f1d3 --- /dev/null +++ b/allow_protocol_file.patch @@ -0,0 +1,12 @@ +diff -ur rpkg-util-macros-orig/tests/run rpkg-util-macros/tests/run +--- rpkg-util-macros-orig/tests/run 2023-05-30 08:51:11.465641122 +0000 ++++ rpkg-util-macros/tests/run 2023-05-30 08:51:11.465641122 +0000 +@@ -1,6 +1,8 @@ + #!/bin/bash + + export testdir="$(builtin cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" ++# workaround for git secure patch which may fail the tests ++git config protocol.file.allow always + + for dir in `ls -d "$testdir"/test_*/`; do + echo "====================== $(basename ${dir}) ======================" diff --git a/rpkg-macros.spec b/rpkg-macros.spec index c36d64c..7b2ec73 100644 --- a/rpkg-macros.spec +++ b/rpkg-macros.spec @@ -15,6 +15,7 @@ URL: https://pagure.io/rpkg-util.git # git checkout rpkg-macros-2.0-1 # ./rpkg spec --sources Source0: rpkg-util-macros-28034317.tar.gz +Patch1: allow_protocol_file.patch BuildArch: noarch @@ -57,6 +58,7 @@ Please, see man rpkg-macros for more information. %prep %setup -T -b 0 -q -n rpkg-util-macros +%autopatch -p1 %check PATH=bin/:$PATH tests/run |