diff --git a/redland.spec b/redland.spec index f373b48..edfc1a1 100644 --- a/redland.spec +++ b/redland.spec @@ -1,30 +1,33 @@ Name: redland Version: 1.0.17 -Release: 23%{?dist} +Release: 24%{?dist} Summary: RDF Application Framework License: LGPLv2+ or ASL 2.0 URL: http://librdf.org/ Source0: http://download.librdf.org/source/%{name}-%{version}.tar.gz -BuildRequires: make +BuildRequires: make BuildRequires: curl-devel BuildRequires: gcc-c++ -BuildRequires: libdb-devel BuildRequires: libtool-ltdl-devel BuildRequires: libxml2-devel >= 2.4.0 -%if 0%{?fedora} > 27 || 0%{?rhel} > 7 -BuildRequires: mariadb-connector-c-devel -%else -BuildRequires: mysql-devel -%endif BuildRequires: perl-interpreter -BuildRequires: libpq-devel BuildRequires: raptor2-devel BuildRequires: rasqal-devel >= 0.9.26 + +%if ! 0%{?rhel} +BuildRequires: libdb-devel +BuildRequires: libpq-devel +BuildRequires: mariadb-connector-c-devel BuildRequires: sqlite-devel +%endif +%if 0%{?rhel} +Obsoletes: redland-mysql < 1.0.17-24 +Obsoletes: redland-pgsql < 1.0.17-24 +%endif # can probably omit soon (f28 or f29?) -- rex Obsoletes: redland-virtuoso < 1.0.17-8 @@ -42,6 +45,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Header files for development with Redland. +%if ! 0%{?rhel} %package mysql Summary: MySQL storage support for Redland Requires: %{name}%{?_isa} = %{version}-%{release} @@ -55,7 +59,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description pgsql This package provides Redland's storage support for graphs in memory and persistently with PostgreSQL files or URIs. - +%endif %prep %setup -q @@ -67,12 +71,22 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %build + +%if 0%{?rhel} +%define distrooptions --without-bdb --without-sqlite --without-mysql --without-postgresql +%else +# fedora +%define distrooptions --with-bdb --with-sqlite --with-mysql --with-postgresql +%endif + export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure \ --enable-release \ --disable-static \ - --with-virtuoso=no + --without-threestone \ + --without-virtuoso \ + %{distrooptions} \ %make_build @@ -99,19 +113,23 @@ make check %{_bindir}/rdfproc %{_bindir}/redland-db-upgrade %dir %{_datadir}/redland -%{_datadir}/redland/mysql-v1.ttl -%{_datadir}/redland/mysql-v2.ttl %{_mandir}/man1/redland-db-upgrade.1* %{_mandir}/man1/rdfproc.1* %{_mandir}/man3/redland.3* +%if ! 0%{?rhel} %dir %{_libdir}/redland %{_libdir}/redland/librdf_storage_sqlite.so +%{_datadir}/redland/mysql-v1.ttl +%{_datadir}/redland/mysql-v2.ttl +%endif +%if ! 0%{?rhel} %files mysql %{_libdir}/redland/librdf_storage_mysql.so %files pgsql %{_libdir}/redland/librdf_storage_postgresql.so +%endif %files devel %doc ChangeLog RELEASE.html @@ -127,6 +145,9 @@ make check %changelog +* Tue Mar 09 2021 Caolán McNamara - 1.0.7-24 +- reduce rhel dependencies to what's needed + * Mon Feb 08 2021 Pavel Raiskup - 1.0.17-23 - rebuild for libpq ABI fix rhbz#1908268