1 changed files with 13 additions and 68 deletions
--- a/SPECS/bogofilter.spec
+++ b/SPECS/bogofilter.spec
@ -1,16 +1,15 @@
 Summary: Fast anti-spam filtering by Bayesian statistical analysis
 Name: bogofilter
 Version: 1.2.5
-Release: 8%{?dist}
+Release: 2%{?dist}
 License: GPLv2
+Group: Applications/Internet
 URL: http://bogofilter.sourceforge.net/
-Source0: http://downloads.sourceforge.net/bogofilter/bogofilter-%{version}.tar.xz
+Source: http://downloads.sourceforge.net/bogofilter/bogofilter-%{version}.tar.xz
 BuildRequires: gcc
 BuildRequires: flex libdb-devel gsl-devel
 BuildRequires: /usr/bin/iconv
 BuildRequires: perl-generators
-BuildRequires: make
-BuildRequires: xhtml1-dtds

 %description
 Bogofilter is a Bayesian spam filter.  In its normal mode of
@ -23,6 +22,7 @@ by sites that process a lot of mail.

 %package bogoupgrade
 Summary: Upgrades bogofilter database to current version
+Group: Applications/Internet
 Requires: %{name} = %{version}-%{release}

 %description bogoupgrade
@ -35,6 +35,7 @@ main bogofilter package.

 %prep
 %setup -q
+
 iconv -f iso-8859-1 -t utf-8 \
 doc/bogofilter-faq-fr.html > doc/bogofilter-faq-fr.html.utf8
 %{__mv} -f doc/bogofilter-faq-fr.html.utf8 \
@ -56,89 +57,33 @@ iconv -f iso-8859-1 -t utf-8 \

 %{__chmod} -x contrib/*

-for d in contrib ; do
-  install -d %{buildroot}%{_docdir}/%{name}/$d
-  files=$(find "$d" -maxdepth 1 -type f -print)
-  for f in $files ; do
-    case $f in
-      *.c|*.o|*.obj|*/Makefile*) continue ;;
-      *.1)
-	cp -p $f %{buildroot}%{_mandir}/man1 ;;
-      *)
-        cp -p $f %{buildroot}%{_docdir}/%{name}/$d ;;
-    esac
-  done
-done
-
-mv bogogrep* contrib
-
-find %{buildroot}%{_docdir}/%{name} -name .dirstamp -print -delete
-
 %check
 %{__make} %{?_smp_mflags} check

 %files bogoupgrade
+%defattr(-, root, root, 0755)
 %{_bindir}/bogoupgrade
 %{_mandir}/man1/bogoupgrade*

 %files
-%doc AUTHORS COPYING GETTING.STARTED NEWS README* RELEASE.NOTES* TODO bogofilter.cf.example
+%defattr(-, root, root, 0755)
+%doc AUTHORS COPYING NEWS README* RELEASE.NOTES* TODO bogofilter.cf.example
 %doc doc/bogofilter-SA* doc/bogofilter-tuning.HOWTO* doc/integrating* doc/programmer/
-%doc doc/README.*db
-%doc rpm-doc/html/ rpm-doc/xml/
+%doc rpm-doc/html/ rpm-doc/xml/ contrib
 %{_mandir}/man1/bogo*.1*
 %{_mandir}/man1/bf_*.1*
 %config(noreplace) %{_sysconfdir}/bogofilter.cf
 %{_bindir}/bogo*
 %{_bindir}/bf_*
-%{_docdir}/%{name}/contrib/*
 %exclude %{_bindir}/bogoupgrade
 %exclude %{_mandir}/man1/bogoupgrade*

 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.5-8
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Tue Apr 20 2021 Milan Crha <mcrha@redhat.com> - 1.2.5-7
- Resolves: #1950909 (Change what files are installed)
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.5-6
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-4
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Nov 28 2019 Adrian Reber <adrian@lisas.de> - 1.2.5-1
- Updated to 1.2.5
- No longer necessary to re-package sources: All problematic files have
-  been re-licensed
- All 19 patches are part of the 1.2.5 release and have been removed
-
-* Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 1.2.4-18
- Rebuilt for GSL 2.6.
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Feb 13 2019 Adrian Reber <adrian@lisas.de> - 1.2.4-16
- Applied 11 patches from Georg Sauthoff (#1676460)
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Mon May 18 2020 Milan Crha <mcrha@redhat.com> - 1.2.5-2
+- Bump version to have OSCI/gating tests rerun with updated tests

-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Fri May 15 2020 Milan Crha <mcrha@redhat.com> - 1.2.5-1
+- Resolves: #1836279 (Update to 1.2.5)

 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild