RPM: synchronize redhat directory with r14.1.x branch

Signed-off-by: François Andriot <[email protected]>

1 files changed, 15 insertions, 2 deletions

diff --git a/redhat/extras/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec
index dab280946..f1a779fc9 100644
--- a/redhat/extras/htdig/htdig.spec
+++ b/redhat/extras/htdig/htdig.spec
@@ -1,6 +1,12 @@
 %define _disable_ld_as_needed 1
 %define _disable_ld_no_undefined 1
 
+%if 0%{?mdkver} >= 5000000
+%global __cc /usr/bin/gcc
+%global __cxx /usr/bin/g++
+%global prefer_gcc 1
+%endif
+
 %define contentdir /var/www
 
 Summary:	A web indexing and searching system for a small domain or intranet
@@ -26,6 +32,9 @@ BuildRequires:	zlib-devel
 
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 
+Provides: group(htdig)
+Provides: user(htdig)
+
 %description
 The ht://Dig system is a complete world wide web indexing and searching system 
 for a small domain or intranet. This system is not meant to replace the need 
@@ -105,10 +114,10 @@ Libraries needed to develop for htdig.
 %defattr(-,root,root)
 %doc ChangeLog
 %doc htdoc/*
-%{_libdir}/htdig/*.a
+#%{_libdir}/htdig/*.a
 %{_libdir}/htdig/*.la
 %{_libdir}/htdig/*[a-z].so
-%{_libdir}/htdig_db/*.a
+#%{_libdir}/htdig_db/*.a
 %{_libdir}/htdig_db/*.la
 %{_libdir}/htdig_db/*[a-z].so
 %{_includedir}/*
@@ -204,6 +213,10 @@ autoreconf -fiv
     --with-apache=/usr/sbin/httpd \
     --with-zlib=%{_prefix}
 
+%if 0%{?fedora} == 40
+echo "#define HAVE_SHMGET 1" >>"db/db_config.h"
+%endif
+
 %__make %{?_smp_mflags}
 mv htdoc/ChangeLog .