From 83e01a9446d6e9676fbc90982b1cb75fa9ba9b9264d07931187bc1e5ffd99195 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 16 Nov 2014 20:55:17 +0000 Subject: [PATCH] Move out of /pkg/ OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=82 --- kmod.changes | 5 +++++ kmod.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/kmod.changes b/kmod.changes index 106f75b..9da864c 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 16 20:54:36 UTC 2014 - jengelh@inai.de + +- Move include files out of pkg/ into a normal subdir of includedir. + ------------------------------------------------------------------- Sun Nov 16 18:22:37 UTC 2014 - crrodriguez@opensuse.org diff --git a/kmod.spec b/kmod.spec index b299127..b8a97a6 100644 --- a/kmod.spec +++ b/kmod.spec @@ -41,7 +41,7 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 BuildRequires: xz -%if 0%{?sles_version} +%if 0%{?sles_version} == 11 BuildRequires: xz-devel >= 4.99 BuildRequires: zlib-devel %else @@ -107,12 +107,12 @@ export LDFLAGS="-Wl,-z,relro,-z,now" # The extra --includedir gives us the possibility to detect dependent # packages which fail to properly use pkgconfig. %configure \ -%if 0%{?sles_version} +%if 0%{?sles_version} == 11 zlib_CFLAGS=" " zlib_LIBS="-lz" \ %endif --with-xz \ --with-zlib \ - --includedir="%_includedir/pkg/%name" \ + --includedir="%_includedir/%name" \ --with-rootlibdir="%_libdir" \ --bindir="%_bindir" make %{?_smp_mflags} V=1