From a56a7ace5647934f03c8e762e649cf3b5218887e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Jul 11 2016 07:35:48 +0000 Subject: spec file cleanups, Use %%license --- diff --git a/libservicelog.spec b/libservicelog.spec index b7b4fec..600b0e3 100644 --- a/libservicelog.spec +++ b/libservicelog.spec @@ -1,24 +1,22 @@ -Name: libservicelog -Version: 1.1.16 -Release: 2%{?dist} -Summary: Servicelog Database and Library +Name: libservicelog +Version: 1.1.16 +Release: 3%{?dist} +Summary: Servicelog Database and Library -Group: System Environment/Libraries +Group: System Environment/Libraries #v29_notify_gram.c v29_notify_gram.h are GPLv2+ -License: LGPLv2 and GPLv2+ -URL: http://linux-diag.sourceforge.net/libservicelog +License: LGPLv2 and GPLv2+ +URL: http://linux-diag.sourceforge.net/libservicelog Source: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz -Requires(pre): shadow-utils +# Link with needed libraries +Patch0: libservicelog-1.1.9-libs.patch -BuildRequires: sqlite-devel autoconf libtool bison librtas-devel flex +BuildRequires: sqlite-devel autoconf libtool bison librtas-devel flex +Requires(pre): shadow-utils # because of librtas-devel -ExclusiveArch: ppc ppc64 ppc64le - - -# Link with needed libraries -Patch0: libservicelog-1.1.9-libs.patch +ExclusiveArch: ppc %{power64} %description The libservicelog package contains a library to create and maintain a @@ -27,13 +25,13 @@ allows for the logging of serviceable and informational events, and for the logging of service procedures that have been performed upon the system. -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig sqlite-devel +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig sqlite-devel -%description devel +%description devel Contains header files for building with libservicelog. @@ -48,12 +46,12 @@ autoreconf -fiv # these errors are fixed in upstream code. CFLAGS="%{optflags} -fPIC -DPIC" CFLAGS=`echo $CFLAGS | sed 's/-Werror=format-security//'` -%{__make} CFLAGS="$CFLAGS" %{?_smp_mflags} +make CFLAGS="$CFLAGS" %{?_smp_mflags} %install -%{__make} install DESTDIR=%{buildroot} -%{__rm} -f %{buildroot}%{_libdir}/*.la +make install DESTDIR=%{buildroot} +rm -f %{buildroot}%{_libdir}/*.la %pre @@ -61,11 +59,12 @@ getent group service >/dev/null || /usr/sbin/groupadd -r service %post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files -%doc COPYING AUTHORS +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS %{_libdir}/libservicelog-*.so.* %dir %attr(755, root, service) /var/lib/servicelog %config(noreplace) %verify(not md5 size mtime) %attr(644,root,service) /var/lib/servicelog/servicelog.db @@ -77,6 +76,10 @@ getent group service >/dev/null || /usr/sbin/groupadd -r service %changelog +* Mon Jul 11 2016 Peter Robinson 1.1.16-3 +- spec file cleanups +- Use %%license + * Sat Apr 9 2016 Peter Robinson 1.1.16-2 - Rebuild for librtas soname bump