From dc21c775ad38753e19ef6f8007bcbf2ab56e510a Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 20 Jul 2018 12:20:42 -0400 Subject: [PATCH] Use pkg-config instead of pkgconf Signed-off-by: Stephen Gallagher --- 0001-Use-pkg-config-for-compatibility.patch | 39 +++++++++++++++++++++ libmodulemd.spec | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-Use-pkg-config-for-compatibility.patch diff --git a/0001-Use-pkg-config-for-compatibility.patch b/0001-Use-pkg-config-for-compatibility.patch new file mode 100644 index 0000000..15190b9 --- /dev/null +++ b/0001-Use-pkg-config-for-compatibility.patch @@ -0,0 +1,39 @@ +From b948ccbc296fd7520817a12c1b0fecfddbcfe7bf Mon Sep 17 00:00:00 2001 +From: Stephen Gallagher +Date: Fri, 20 Jul 2018 12:04:35 -0400 +Subject: [PATCH] Use pkg-config for compatibility + +Signed-off-by: Stephen Gallagher +--- + modulemd/v1/tests/test-import-headers.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/modulemd/v1/tests/test-import-headers.sh b/modulemd/v1/tests/test-import-headers.sh +index 3277b8d054d55f828b3a3f1c9ad61f124fa2c065..51c9fbc3df0d8f2dbff324042201011b89548458 100755 +--- a/modulemd/v1/tests/test-import-headers.sh ++++ b/modulemd/v1/tests/test-import-headers.sh +@@ -28,17 +28,17 @@ int main (int argc, char **argv) + } + EOF + + cat $header.c + +- echo "gcc \`pkgconf --cflags gobject-2.0\` \ +- \`pkgconf --cflags yaml-0.1\` \ ++ echo "gcc \`pkg-config --cflags gobject-2.0\` \ ++ \`pkg-config --cflags yaml-0.1\` \ + -I `dirname $arg` \ + -o $header.out \ + $header.c" +- gcc `pkgconf --cflags gobject-2.0` \ +- `pkgconf --cflags yaml-0.1` \ ++ gcc `pkg-config --cflags gobject-2.0` \ ++ `pkg-config --cflags yaml-0.1` \ + -I `dirname $arg` \ + -o $header.out \ + $header.c + done + +-- +2.17.1 + diff --git a/libmodulemd.spec b/libmodulemd.spec index a0cbbc7..bb800e5 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -23,7 +23,7 @@ BuildRequires: pkgconfig(gtk-doc) BuildRequires: valgrind # Patches - +Patch0001: 0001-Use-pkg-config-for-compatibility.patch %description C Library for manipulating module metadata files.