From 000e4b2b48f8540976ce625c1ca67579f15bc343 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Thu, 13 Jul 2017 10:19:29 -0500
Subject: [PATCH] .spec cosmetics, rebuild (mariadb)

---
 redland.spec | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/redland.spec b/redland.spec
index 4e62669..e300c04 100644
--- a/redland.spec
+++ b/redland.spec
@@ -5,19 +5,18 @@
 
 Name:           redland
 Version:        1.0.17
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        RDF Application Framework
 
-Group:          System Environment/Libraries
 License:        LGPLv2+ or ASL 2.0
 URL:            http://librdf.org/
 Source0:        http://download.librdf.org/source/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  curl-devel
 BuildRequires:  libdb-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  libxml2-devel >= 2.4.0
+# FIXME/TODO: consider explicitly using mariadb -- rex
 BuildRequires:  mysql-devel
 BuildRequires:  perl-interpreter
 BuildRequires:  postgresql-devel
@@ -39,14 +38,12 @@ for RDF developers to experiment with the technology.
 
 %package         devel
 Summary:         Libraries and header files for programs that use Redland
-Group:           Development/Libraries
 Requires:        %{name}%{?_isa} = %{version}-%{release}
 %description     devel
 Header files for development with Redland.
 
 %package         mysql
 Summary:         MySQL storage support for Redland
-Group:           System Environment/Libraries
 Requires:        %{name}%{?_isa} = %{version}-%{release}
 %description     mysql
 This package provides Redland's storage support for graphs in memory and
@@ -54,7 +51,6 @@ persistently with MySQL files or URIs.
 
 %package         pgsql
 Summary:         PostgreSQL storage support for Redland
-Group:           System Environment/Libraries
 Requires:        %{name}%{?_isa} = %{version}-%{release}
 %description     pgsql
 This package provides Redland's storage support for graphs in memory and
@@ -63,7 +59,6 @@ persistently with PostgreSQL files or URIs.
 %if 0%{?virtuoso}
 %package         virtuoso
 Summary:         Virtuoso storage support for Redland
-Group:           System Environment/Libraries
 BuildRequires:   libiodbc-devel
 Requires:        %{name}%{?_isa} = %{version}-%{release}
 %description     virtuoso
@@ -80,6 +75,7 @@ persistently with Virtuoso files or URIs.
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 %endif
 
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -92,30 +88,24 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 #unpackaged files
-find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
+find $RPM_BUILD_ROOT -name \*.la -exec rm -v {} \;
 
 
 %check
 make check
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.LIB LICENSE.txt NEWS README
-%doc LICENSE-2.0.txt NOTICE TODO
+%doc AUTHORS NEWS README
+%doc NOTICE TODO
 %doc FAQS.html LICENSE.html NEWS.html README.html TODO.html
+%license COPYING COPYING.LIB LICENSE.txt LICENSE-2.0.txt
 %{_libdir}/librdf.so.0*
 %{_bindir}/rdfproc
 %{_bindir}/redland-db-upgrade
@@ -129,21 +119,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/redland/librdf_storage_sqlite.so
 
 %files mysql
-%defattr(-,root,root,-)
 %{_libdir}/redland/librdf_storage_mysql.so
 
 %files pgsql
-%defattr(-,root,root,-)
 %{_libdir}/redland/librdf_storage_postgresql.so
 
 %if 0%{?virtuoso}
 %files virtuoso
-%defattr(-,root,root,-)
 %{_libdir}/redland/librdf_storage_virtuoso.so
 %endif
 
 %files devel
-%defattr(-,root,root,-)
 %doc ChangeLog RELEASE.html
 %{_bindir}/redland-config
 %{_datadir}/redland/Redland.i
@@ -157,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 13 2017 Rex Dieter <rdieter@fedoraproject.org> - 1.0.17-10
+- .spec cosmetics, rebuild (mariadb)
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.17-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild