Spec file clean up

libservicelog.spec

@@ -1,13 +1,13 @@
 Name:           libservicelog
 Version:        1.1.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Servicelog Database and Library
 
 Group:          System Environment/Libraries
-License:        LGPLv2
+#v29_notify_gram.c v29_notify_gram.h are GPLv2+
+License:        LGPLv2 and GPLv2+
 URL:            http://linux-diag.sourceforge.net/servicelog
-Source0:        http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
+Source:        http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre):       shadow-utils
 
@@ -30,7 +30,7 @@ the logging of service procedures that have been performed upon the system.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig sqlite-devel
 
 %description    devel
@@ -52,14 +52,10 @@ CFLAGS=`echo $CFLAGS | sed 's/-Werror=format-security//'`
 
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__make} install DESTDIR=%{buildroot}
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
 %pre
 getent group service >/dev/null || /usr/sbin/groupadd service
 
@@ -69,21 +65,21 @@ getent group service >/dev/null || /usr/sbin/groupadd service
 /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING NEWS AUTHORS
 %{_libdir}/libservicelog-*.so.*
 %dir %attr(755, root, service) /var/lib/servicelog
-%verify(not md5 size mtime) %attr(644,root,service) /var/lib/servicelog/servicelog.db
+%config(noreplace) %verify(not md5 size mtime) %attr(644,root,service) /var/lib/servicelog/servicelog.db
-%config(noreplace) /var/lib/servicelog/servicelog.db
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/servicelog-1
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/servicelog-1.pc
 
 
 %changelog
+* Mon Jun 02 2014 Jakub Čajka <jcajka@redhat.com> - 1.1.14-6
+- Spec file clean up
+
 * Mon Mar 10 2014 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 1.1.14-5
 - Fix CFLAGS