From 9f835ac0ff7a8ec9f476837f2ad1b31dfb7decf7413e1eb80fb5a3287dde87de Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 1 Jun 2014 10:08:07 +0000 Subject: [PATCH] Accepting request 235707 from home:elvigia:branches:Archiving - libarchive-xattr.patch, fix subtle wrong library check that causes this package to depend on libattr when it should be using glibc. OBS-URL: https://build.opensuse.org/request/show/235707 OBS-URL: https://build.opensuse.org/package/show/Archiving/libarchive?expand=0&rev=34 --- libarchive-xattr.patch | 11 +++++++++++ libarchive.changes | 7 +++++++ libarchive.spec | 7 +++++-- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 libarchive-xattr.patch diff --git a/libarchive-xattr.patch b/libarchive-xattr.patch new file mode 100644 index 0000000..6b6517b --- /dev/null +++ b/libarchive-xattr.patch @@ -0,0 +1,11 @@ +--- libarchive-3.1.2.orig/configure.ac ++++ libarchive-3.1.2/configure.ac +@@ -568,7 +568,7 @@ AC_ARG_ENABLE([xattr], + if test "x$enable_xattr" != "xno"; then + AC_CHECK_HEADERS([attr/xattr.h]) + AC_CHECK_HEADERS([sys/xattr.h sys/ea.h]) +- AC_CHECK_LIB(attr,setxattr) ++ AC_SEARCH_LIBS([setxattr], [attr]) + AC_CHECK_FUNCS([extattr_get_file extattr_list_file]) + AC_CHECK_FUNCS([extattr_set_fd extattr_set_file]) + AC_CHECK_FUNCS([fgetxattr flistxattr fsetxattr getxattr]) diff --git a/libarchive.changes b/libarchive.changes index 1b6f18f..73c98d0 100644 --- a/libarchive.changes +++ b/libarchive.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 28 17:18:59 UTC 2014 - crrodriguez@opensuse.org + +- libarchive-xattr.patch, fix subtle wrong library check + that causes this package to depend on libattr when it should + be using glibc. + ------------------------------------------------------------------- Sun Nov 24 16:22:02 UTC 2013 - andreas.stieger@gmx.de diff --git a/libarchive.spec b/libarchive.spec index 8210656..5eb6872 100644 --- a/libarchive.spec +++ b/libarchive.spec @@ -1,7 +1,7 @@ # # spec file for package libarchive # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,7 +42,6 @@ Source0: http://www.libarchive.org/downloads/libarchive-%{version}.tar.gz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libacl-devel -BuildRequires: libattr-devel BuildRequires: libbz2-devel %if %{with ext2fs} BuildRequires: libext2fs-devel @@ -50,11 +49,13 @@ BuildRequires: libext2fs-devel %if %{with openssl} BuildRequires: libopenssl-devel %endif +BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: pkg-config BuildRequires: xz-devel BuildRequires: zlib-devel Patch0: libarchive-openssl.patch +Patch1: libarchive-xattr.patch %description Libarchive is a programming library that can create and read several @@ -163,7 +164,9 @@ static library for libarchive %if %{with openssl} %patch0 %endif +%patch1 -p1 %build +autoreconf -fiv %global optflags %{optflags} -D_REENTRANT -pipe %configure \ --disable-silent-rules \