From 5baf44e71243bfa915e90dd8f9b8cfad6152d64e85ebc635218e1cba6c1becb3 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 20 Apr 2016 08:01:20 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=137 --- baselibs.conf | 5 +---- file.spec | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 09285b5..978c84d 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,9 +1,6 @@ libmagic1 requires "file-magic- = " -file - requires "libmagic1- = " - requires "file-magic- = " file-devel + requires -file- requires "libmagic1- = " - requires "file-magic- = " file-magic diff --git a/file.spec b/file.spec index b29b28b..32cd9f2 100644 --- a/file.spec +++ b/file.spec @@ -171,8 +171,8 @@ install -s dcore %{buildroot}%{_bindir} # Check out that the binary does not bail out: LD_LIBRARY_PATH=%{buildroot}%{_libdir} export LD_LIBRARY_PATH -#find %{buildroot}%{_bindir}/file %{_bindir}/ /%{_lib}/ %{_libdir}/ | \ -# xargs %{buildroot}%{_bindir}/file -m %{buildroot}%{_miscdir}/magic +find %{buildroot}%{_bindir}/file %{_bindir}/ /%{_lib}/ %{_libdir}/ | \ + xargs %{buildroot}%{_bindir}/file -m %{buildroot}%{_miscdir}/magic unset LD_LIBRARY_PATH %{__rm} -f %{buildroot}%{_libdir}/*.la