From 9293429ba4f6e32d01e5e7521b793c70b364e482276e4e5c737c662dd781b88b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 13 Feb 2013 08:06:32 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Archiving/libarchive?expand=0&rev=21 --- libarchive.changes | 5 +++++ libarchive.spec | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/libarchive.changes b/libarchive.changes index 168aa02..bc08830 100644 --- a/libarchive.changes +++ b/libarchive.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 13 08:05:35 UTC 2013 - werner@suse.de + +- Use %libname macro to be consistent throughout the spec file + ------------------------------------------------------------------- Tue Feb 5 18:48:08 UTC 2013 - p.drouand@gmail.com diff --git a/libarchive.spec b/libarchive.spec index 8cbd2c5..0a63b61 100644 --- a/libarchive.spec +++ b/libarchive.spec @@ -16,6 +16,9 @@ # +%define somajor 13 +%define libname libarchive%{somajor} + Name: libarchive Version: 3.1.1 Release: 0 @@ -53,11 +56,11 @@ Group: Productivity/Archiving/Compression %description -n bsdtar This package contains the bsdtar cmdline utility. -%package -n libarchive13 +%package -n %{libname} Summary: Library to work with several different streaming archive formats Group: Development/Libraries/C and C++ -%description -n libarchive13 +%description -n %{libname} Libarchive is a programming library that can create and read several different streaming archive formats, including most popular tar variants and several cpio formats. It can also write shar archives and @@ -111,8 +114,8 @@ I/O. It should be very easy to add new formats, new compression methods, or new ways of reading/writing archives. %package -n libarchive-devel +Requires: %{libname} = %{version} Requires: libacl-devel -Requires: libarchive12 = %{version} Requires: libbz2-devel Requires: zlib-devel Summary: Development files for libarchive @@ -145,9 +148,9 @@ make check find %{buildroot} -name '*.la' -type f -delete -print rm "%{buildroot}%{_mandir}/man5/"{tar,cpio,mtree}.5* -%post -n libarchive13 -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig -%postun -n libarchive13 -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %files -n bsdtar %defattr(-,root,root) @@ -156,7 +159,7 @@ rm "%{buildroot}%{_mandir}/man5/"{tar,cpio,mtree}.5* %{_mandir}/man1/* %{_mandir}/man5/* -%files -n libarchive13 +%files -n %{libname} %defattr(-,root,root) %doc COPYING NEWS README %{_libdir}/libarchive.so.*