From 26268bc6ccf145270b9ef6c2f1115b398c31f4d4a98f1c9d439ced3d5b51e422 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 19 Feb 2013 09:07:29 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=65 --- file.changes | 6 ++++++ file.spec | 16 ++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/file.changes b/file.changes index 7619075..e45bcb0 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 19 09:05:31 UTC 2013 - werner@suse.de + +- Use %libname macro and make that file-magic obsoletes libmagic-data + compare with bnc# 804323 to avoid trouble with interim package name + ------------------------------------------------------------------- Wed Jan 23 13:00:47 UTC 2013 - werner@suse.de diff --git a/file.spec b/file.spec index 99b8d6c..ec2aae4 100644 --- a/file.spec +++ b/file.spec @@ -16,6 +16,9 @@ # +%define somajor 1 +%define libname libmagic%{somajor} + Name: file BuildRequires: findutils BuildRequires: libtool @@ -73,25 +76,26 @@ used by apsfilter to permit automatic printing of different file types. %package -n file-magic Summary: The magic files for libmagic to use Group: Development/Libraries/Other +Obsoletes: libmagic-data %description -n file-magic This package contains the basic magic files that libmagic reads and uses to estimate a file's type. -%package -n libmagic1 +%package -n %libname Summary: Library with file's functionality Group: Development/Libraries/Other Requires: file-magic = %{version} -%description -n libmagic1 +%description -n %libname This library reads magic files and detects file types. Used by file command %package -n file-devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/Other Provides: file:/usr/include/magic.h +Requires: %libname = %{version} Requires: glibc-devel -Requires: libmagic1 = %{version} %description -n file-devel This package contains all necessary include files and libraries needed @@ -177,11 +181,11 @@ find %{buildroot}%{_bindir}/file %{_bindir}/ /%{_lib}/ %{_libdir}/ | \ unset LD_LIBRARY_PATH %{__rm} -f %{buildroot}%{_libdir}/*.la -%post -n libmagic1 -p /sbin/ldconfig +%post -n %libname -p /sbin/ldconfig -%postun -n libmagic1 -p /sbin/ldconfig +%postun -n %libname -p /sbin/ldconfig -%files -n libmagic1 +%files -n %libname %defattr (644,root,root,755) %{_libdir}/lib*.so.*