From 5380ca9f9d055835c65c18c284e1cd5b975adb26 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 11 Jul 2016 07:44:14 +0000 Subject: [PATCH] Spec cleanups, Use %%license --- libvpd.spec | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/libvpd.spec b/libvpd.spec index 24712d8..bfe29d6 100644 --- a/libvpd.spec +++ b/libvpd.spec @@ -11,11 +11,9 @@ License: LGPLv2+ URL: http://linux-diag.sf.net/Lsvpd.html Source: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: sqlite-devel zlib-devel libstdc++-devel libtool -ExclusiveArch: ppc ppc64 ppc64le +ExclusiveArch: ppc %{power64} %description The libvpd package contains the classes that are used to access a vpd database @@ -34,14 +32,11 @@ Contains header files for building with libvpd. %build ./bootstrap.sh %configure --disable-static -%{__make} %{?_smp_mflags} - -%clean -%{__rm} -rf $RPM_BUILD_ROOT +make %{?_smp_mflags} %install -%{__rm} -rf $RPM_BUILD_ROOT -%{__make} install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +find %{buildroot} -type f -name "*.la" -delete # re-symlink *.so to SONAME, fix the symlinks issue by downgrade/upgrade pushd %{buildroot}%{_libdir} @@ -58,17 +53,15 @@ popd %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc COPYING README -%exclude %{_libdir}/*.la +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc README %{_libdir}/libvpd_cxx-2.2.so.* %{_libdir}/libvpd-2.2.so.* %{_sysconfdir}/udev/rules.d/90-vpdupdate.rules %{_var}/lib/lsvpd/run.vpdupdate %files devel -%defattr(-,root,root,-) -%exclude %{_libdir}/*.la %{_includedir}/libvpd-2 %{_libdir}/libvpd_cxx.so %{_libdir}/libvpd.so @@ -76,6 +69,10 @@ popd %{_libdir}/pkgconfig/libvpd_cxx-2.pc %changelog +* Mon Jul 11 2016 Peter Robinson +- Spec cleanups +- Use %%license + * Mon Mar 21 2016 Than Ngo - 2.2.5-3 - re-symlink *.so to SONAME, fix the symlinks issue by downgrade/upgrade