diff options
Diffstat (limited to 'redhat/extras/htdig')
| -rw-r--r-- | redhat/extras/htdig/htdig.spec | 28 | ||||
| -rw-r--r-- | redhat/extras/htdig/patches/fix-ftbfs-gcc14 | 11 | ||||
| -rw-r--r-- | redhat/extras/htdig/patches/gcc-11.patch (renamed from redhat/extras/htdig/patches/gcc-11) | 0 | ||||
| -rw-r--r-- | redhat/extras/htdig/patches/series | 3 |
4 files changed, 29 insertions, 13 deletions
diff --git a/redhat/extras/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec index f1a779fc9..0dfa92ebc 100644 --- a/redhat/extras/htdig/htdig.spec +++ b/redhat/extras/htdig/htdig.spec @@ -20,10 +20,12 @@ URL: http://www.htdig.org/ Source0: htdig_3.2.0b6.orig.tar.gz Patch1: patches/htdig_3.2.0b6-13.diff -Patch2: patches/gcc-6 -Patch3: patches/sourceforge_logo -Patch4: patches/drop-bogus-assignment -Patch5: patches/gcc-11 +Patch2: patches/kfreebsd +Patch3: patches/gcc-6 +Patch4: patches/sourceforge_logo +Patch5: patches/drop-bogus-assignment +Patch6: patches/gcc-11.patch +Patch7: patches/fix-ftbfs-gcc14 BuildRequires: flex >= 2.5.4a-13 BuildRequires: libtool @@ -114,10 +116,14 @@ Libraries needed to develop for htdig. %defattr(-,root,root) %doc ChangeLog %doc htdoc/* -#%{_libdir}/htdig/*.a +%if 0%{?mdkver} < 5000000 +%{_libdir}/htdig/*.a +%endif %{_libdir}/htdig/*.la %{_libdir}/htdig/*[a-z].so -#%{_libdir}/htdig_db/*.a +%if 0%{?mdkver} < 5000000 +%{_libdir}/htdig_db/*.a +%endif %{_libdir}/htdig_db/*.la %{_libdir}/htdig_db/*[a-z].so %{_includedir}/* @@ -148,7 +154,6 @@ various web servers on the campus network. %files web %defattr(-,root,root) -%config(missingok, noreplace) %attr(0755,root,root) /etc/cron.daily/htdig-dbgen %{contentdir}/html/htdig %{contentdir}/cgi-bin/* @@ -193,6 +198,8 @@ fi %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 autoreconf -fiv @@ -226,9 +233,6 @@ rm -rf %{buildroot} %__make install DESTDIR=%{?buildroot} -# Installs the cron job -%__install -d -m 755 cron/htdig-dbgen "%{buildroot}%{?_sysconfdir}/cron.daily/htdig-dbgen" - cp %{buildroot}%{contentdir}/cgi-bin/htsearch %{buildroot}%{_bindir} chmod 644 %{buildroot}%{contentdir}/html/htdig/* @@ -238,10 +242,10 @@ ln -sf ./search.html %{buildroot}%{contentdir}/html/htdig/index.html # now get rid of the %{buildroot} paths in the conf files for i in /etc/htdig.conf /usr/bin/rundig ; do - perl -pi -e "s|%{buildroot}||g" %{buildroot}/$i + perl -pi -e "s|%{buildroot}||g" %{buildroot}/$i done -mkdir -p %{buildroot}%{_datadir} +%__install -d %{buildroot}%{_datadir} mv %{buildroot}%{contentdir}/html/htdig %{buildroot}%{_datadir} ln -sf ../../../usr/share/htdig %{buildroot}%{contentdir}/html/htdig diff --git a/redhat/extras/htdig/patches/fix-ftbfs-gcc14 b/redhat/extras/htdig/patches/fix-ftbfs-gcc14 new file mode 100644 index 000000000..88914b6a0 --- /dev/null +++ b/redhat/extras/htdig/patches/fix-ftbfs-gcc14 @@ -0,0 +1,11 @@ +--- a/db/os_map.c ++++ b/db/os_map.c +@@ -31,6 +31,8 @@ + #endif + + #include "db_int.h" ++#include "db_page.h" ++#include "db_ext.h" + #include "os_jump.h" + + #ifdef HAVE_MMAP diff --git a/redhat/extras/htdig/patches/gcc-11 b/redhat/extras/htdig/patches/gcc-11.patch index 09c974cea..09c974cea 100644 --- a/redhat/extras/htdig/patches/gcc-11 +++ b/redhat/extras/htdig/patches/gcc-11.patch diff --git a/redhat/extras/htdig/patches/series b/redhat/extras/htdig/patches/series index da0d40c91..857883dbb 100644 --- a/redhat/extras/htdig/patches/series +++ b/redhat/extras/htdig/patches/series @@ -3,4 +3,5 @@ kfreebsd gcc-6 sourceforge_logo drop-bogus-assignment -gcc-11 +gcc-11.patch +fix-ftbfs-gcc14 |