2 changed files with 168 additions and 23 deletions
--- a/SOURCES/0001-rhbz-1936659-stub-deprecated.patch
+++ b/SOURCES/0001-rhbz-1936659-stub-deprecated.patch
@ -0,0 +1,69 @@
+diff -ru redland-1.0.17.orig/src/rdf_uri.c redland-1.0.17/src/rdf_uri.c
+--- redland-1.0.17.orig/src/rdf_uri.c	2021-03-22 09:02:42.420115182 +0000
+++ redland-1.0.17/src/rdf_uri.c	2021-03-22 09:06:54.432694225 +0000
+@@ -358,32 +358,14 @@
+  * @world: #librdf_world object
+  * @uri: #librdf_uri object
+  *
+- * Get a digest for the URI.
+- * 
+- * Generates a digest object for the URI.  The digest factory used is
+- * determined at class initialisation time by librdf_init_uri().
+- * 
+- * Return value: new #librdf_digest object or NULL on failure.
+ * exported public in error but never usable
+ *
+ * Return value: NULL.
+  **/
+ librdf_digest*
+ librdf_uri_get_digest(librdf_world* world, librdf_uri* uri)
+ {
+-  librdf_digest* d;
+-  unsigned char *str;
+-  size_t len;
+-  
+-  LIBRDF_ASSERT_OBJECT_POINTER_RETURN_VALUE(uri, librdf_uri, NULL);
+-
+-  d = librdf_new_digest_from_factory(world, world->digest_factory);
+-  if(!d)
+-    return NULL;
+-
+-  str = librdf_uri_as_counted_string(uri, &len);
+-  
+-  librdf_digest_update(d, str, len);
+-  librdf_digest_final(d);
+-  
+-  return d;
+  return NULL;
+ }
+ 
+ 
+@@ -536,7 +518,6 @@
+ {
+   const unsigned char *hp_string=(const unsigned char*)"http://purl.org/net/dajobe/";
+   librdf_uri *uri1, *uri2, *uri3, *uri4, *uri5, *uri6, *uri7, *uri8, *uri9;
+-  librdf_digest *d;
+   const char *program=librdf_basename((const char*)argv[0]);
+   const char *file_string="/big/long/directory/file";
+   const unsigned char *file_uri_string=(const unsigned char*)"file:///big/long/directory/file";
+@@ -571,18 +552,11 @@
+   librdf_uri_print(uri2, stderr);
+   fputs("\n", stderr);
+ 
+-  
+-  fprintf(stderr, "%s: Getting digest for URI\n", program);
+-  d = librdf_uri_get_digest(world, uri2);
+-  if(!d) {
+-    fprintf(stderr, "%s: Failed to get digest for URI %s\n", program, 
+  if(librdf_uri_get_digest(world, uri2)) {
+    fprintf(stderr, "%s: Didn't fail to get digest for URI %s\n", program, 
+ 	    librdf_uri_as_string(uri2));
+     return(1);
+   }
+-  fprintf(stderr, "%s: Digest is: ", program);
+-  librdf_digest_print(d, stderr);
+-  fputs("\n", stderr);
+-  librdf_free_digest(d);
+ 
+   uri3=librdf_new_uri(world, (const unsigned char*)"file:/big/long/directory/");
+   uri4=librdf_new_uri(world, (const unsigned char*)"http://somewhere/dir/");
--- a/SPECS/redland.spec
+++ b/SPECS/redland.spec
@ -1,28 +1,39 @@

 Name:           redland
 Version:        1.0.17
-Release:        14%{?dist}
+Release:        29%{?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

+%if 0%{?rhel}
+Patch1:         0001-rhbz-1936659-stub-deprecated.patch
+%endif
+
+BuildRequires:  make
 BuildRequires:  curl-devel
+BuildRequires:  gcc-c++
+BuildRequires:  gtk-doc
 BuildRequires:  libdb-devel
+BuildRequires:  libtool
 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:  postgresql-devel
-BuildRequires:  raptor2-devel
+BuildRequires:  raptor2-devel 
 BuildRequires:  rasqal-devel >= 0.9.26
+
+%if ! 0%{?rhel}
+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

@ -40,6 +51,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}
@ -53,10 +65,15 @@ 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
+%if 0%{?rhel}
+%patch1 -p1 -b .stub-deprecated
+%endif
+
+NOCONFIGURE=1 ./autogen.sh

 # hack to nuke rpaths
 %if "%{_libdir}" != "/usr/lib"
@ -65,18 +82,31 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure


 %build
+
+# rhbz#1952816 we need at last --with-bdb so rdfproc can work, e.g. rebuild of hunspell-ur
+
+%if 0%{?rhel}
+%define distrooptions --disable-digests --without-sqlite --without-mysql --without-postgresql
+%else
+# fedora
+%define distrooptions --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
+  --with-bdb \
+  --without-threestone \
+  --without-virtuoso \
+  %{distrooptions} \

-make %{?_smp_mflags}
+%make_build


 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install

 #unpackaged files
 find $RPM_BUILD_ROOT -name \*.la -exec rm -v {} \;
@ -86,8 +116,7 @@ find $RPM_BUILD_ROOT -name \*.la -exec rm -v {} \;
 make check


-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets

 %files
 %doc AUTHORS NEWS README
@ -98,19 +127,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
@ -126,8 +159,51 @@ make check


 %changelog
-* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.0.17-14
- Rebuilt for MSVSphere 8.8
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.17-29
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 23 2021 Caolán McNamara <caolanm@redhat.com> - 1.0.7-28
+- rhbz#1952816 rdfproc: Failed to open hashes storage
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.17-27
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Mon Mar 22 2021 Caolán McNamara <caolanm@redhat.com> - 1.0.7-26
+- rhbz#1936659 disable rhel redland digests and stub deprecated librdf_uri_get_digest
+
+* Tue Mar 09 2021 Caolán McNamara <caolanm@redhat.com> - 1.0.7-25
+- rhbz#1936659 rhel redland uses deprecated SHA-1 algorithm by default
+
+* Tue Mar 09 2021 Caolán McNamara <caolanm@redhat.com> - 1.0.7-24
+- reduce rhel dependencies to what's needed
+
+* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 1.0.17-23
+- rebuild for libpq ABI fix rhbz#1908268
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.17-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Sep 29 2020 Than Ngo <than@redhat.com> - 1.0.17-21
+- Fix FTBFS in ELN
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.17-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.17-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.17-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.17-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.17-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Mar 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.0.17-15
+- BR: gcc-c++, use %%make_build %%make_install %%ldconfig_scriptlets

 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.17-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@ -258,7 +334,7 @@ make check
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

-* Thu Jan 22 2009 Rex Dieter <rdieter@fedoraproject.org> 1.0.7-5
+* Thu Jan 22 2009 Rex Dieter <rdieter@fedoraproject.org> 1.0.7-5 
 - respin (mysql)

 * Fri Jan 16 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.0.7-4
@ -267,7 +343,7 @@ make check
 * Sun Nov 23 2008 Thomas Vander Stichele <thomas at apestaart dot org>
 - 1.0.7-3
 - updated summary
- not rebuilt yet
+- not rebuilt yet 

 * Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.0.7-2
 - rebuild for db4-4.7
@ -379,13 +455,13 @@ make check

 * Mon Sep 8 2003 Dave Beckett <dave.beckett@bristol.ac.uk>
 - require raptor 1.0.0
-
+ 
 * Thu Sep 4 2003 Dave Beckett <dave.beckett@bristol.ac.uk>
 - added rdfproc
-
+ 
 * Thu Aug 28 2003 Dave Beckett <dave.beckett@bristol.ac.uk>
 - patches added post 0.9.13 to fix broken perl UNIVERSAL::isa
-
+ 
 * Thu Aug 21 2003 Dave Beckett <dave.beckett@bristol.ac.uk>
 - Add redland-db-upgrade.1
 - Removed duplicate perl CORE shared objects