Hello community, here is the log from the commit of package bogofilter for openSUSE:Factory checked in at 2017-04-17 10:23:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bogofilter (Old) and /work/SRC/openSUSE:Factory/.bogofilter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bogofilter" Mon Apr 17 10:23:51 2017 rev:30 rq:486976 version:1.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/bogofilter/bogofilter.changes 2017-02-20 13:13:19.523385689 +0100 +++ /work/SRC/openSUSE:Factory/.bogofilter.new/bogofilter.changes 2017-04-17 10:23:52.498915696 +0200 @@ -1,0 +2,6 @@ +Mon Apr 10 08:07:05 UTC 2017 - [email protected] + +- Small spec file cleanup +- Adjust usage of update-alternatives + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bogofilter.spec ++++++ --- /var/tmp/diff_new_pack.3aasws/_old 2017-04-17 10:23:54.226671010 +0200 +++ /var/tmp/diff_new_pack.3aasws/_new 2017-04-17 10:23:54.230670443 +0200 @@ -27,7 +27,7 @@ Source10: README.SUSE # PATCH-FEATURE-OPENSUSE bogofilter-kyotocabinet.patch --replace tokyocabinet with kyotocabinet following # tokyocabinet recommendations -Patch: bogofilter-kyotocabinet.patch +Patch0: bogofilter-kyotocabinet.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: db-devel @@ -40,7 +40,6 @@ BuildRequires: libkyotocabinet-devel BuildRequires: libxml2-tools %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Bogofilter is a Bayesian spam filter. In normal operation, it takes an @@ -55,9 +54,7 @@ Summary: Fast Anti-Spam Filtering by Bayesian Statistical Analysis Group: Productivity/Networking/Email/Utilities Requires: %{name}-backend = %{version} -%if 0%{?suse_version} > 1110 BuildArch: noarch -%endif %description common Bogofilter is a Bayesian spam filter. In normal operation, it takes an @@ -73,9 +70,7 @@ %package doc Summary: Bogofilter documentation Group: Documentation/Other -%if 0%{?suse_version} > 1110 BuildArch: noarch -%endif %description doc This package contains the documentation of %{name} @@ -85,8 +80,8 @@ Summary: Bogofilter kyotocabinet backend Group: Productivity/Networking/Email/Utilities Requires: %{name}-common = %{version} -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(post): update-alternatives +Requires(postun): update-alternatives Provides: %{name}-backend = %{version} Provides: %{name}-tokyocabinet = %{version} # Please remove the "=" of the obsoletes tag with the next update @@ -100,10 +95,10 @@ Summary: Bogofilter sqlite3 backend Group: Productivity/Networking/Email/Utilities Requires: %{name}-common = %{version} -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(post): update-alternatives +Requires(postun): update-alternatives Provides: %{name}-backend = %{version} -%if 0%{suse_version} == 1310 +%if 0%{?suse_version} == 1310 Conflicts: %{name}-db %endif @@ -114,12 +109,12 @@ Summary: Bogofilter libdb backend Group: Productivity/Networking/Email/Utilities Requires: %{name}-common = %{version} -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(post): update-alternatives +Requires(postun): update-alternatives Provides: %{name} = %{version} Obsoletes: %{name} < %{version} Provides: %{name}-backend = %{version} -%if 0%{suse_version} == 1310 +%if 0%{?suse_version} == 1310 Conflicts: %{name}-sqlite3 %endif @@ -129,7 +124,7 @@ %prep %setup -q %if 0%{?suse_version} > 1320 -%patch -p1 +%patch0 -p1 %endif %build @@ -139,20 +134,20 @@ --with-database=kyotocabinet \ --program-suffix=-kyotocabinet make %{?_smp_mflags} -make %{?_smp_mflags} install DESTDIR=%{buildroot} +%make_install %endif %configure \ --with-database=sqlite3 \ --program-suffix=-sqlite3 make %{?_smp_mflags} -make %{?_smp_mflags} install DESTDIR=%{buildroot} +%make_install %configure \ --with-database=db \ --program-suffix=-db make %{?_smp_mflags} -make %{?_smp_mflags} install DESTDIR=%{buildroot} +%make_install %install mv %{buildroot}/%{_sysconfdir}/bogofilter.cf.example %{buildroot}/%{_sysconfdir}/bogofilter.cf @@ -187,7 +182,7 @@ done done # add a vendor README to the doc package -install -D -m 0644 %{S:10} %{buildroot}/%{_defaultdocdir}/bogofilter-doc/README.SUSE +install -D -m 0644 %{SOURCE10} %{buildroot}/%{_defaultdocdir}/bogofilter-doc/README.SUSE %if 0%{?suse_version} > 1320 %post kyotocabinet @@ -207,7 +202,7 @@ --slave %{_mandir}/man1/bf_tar.1.gz bf_tar.1.gz %{_mandir}/man1/bf_tar-kyotocabinet.1.gz %postun kyotocabinet -if [ "$1" = 0 ] ; then +if [ ! -f %{_bindir}/bogofilter-kyotocabinet ] ; then %{_sbindir}/update-alternatives --remove bogofilter %{_bindir}/bogofilter-kyotocabinet fi %endif @@ -229,7 +224,7 @@ --slave %{_mandir}/man1/bf_tar.1.gz bf_tar.1.gz %{_mandir}/man1/bf_tar-sqlite3.1.gz %postun sqlite3 -if [ "$1" = 0 ] ; then +if [ ! -f %{_bindir}/bogofilter-sqlite3 ] ; then %{_sbindir}/update-alternatives --remove bogofilter %{_bindir}/bogofilter-sqlite3 fi @@ -250,7 +245,7 @@ --slave %{_mandir}/man1/bf_tar.1.gz bf_tar.1.gz %{_mandir}/man1/bf_tar-db.1.gz %postun db -if [ "$1" = 0 ] ; then +if [ ! -f %{_bindir}/bogofilter-db ] ; then %{_sbindir}/update-alternatives --remove bogofilter %{_bindir}/bogofilter-db fi @@ -267,14 +262,14 @@ %doc doc/README* doc/bogofilter-SA-* doc/*.html doc/integrating* %doc doc/programmer/ doc/rpm.notes.BerkeleyDB %doc %{_defaultdocdir}/bogofilter-doc/README.SUSE -%{_mandir}/man1/bogofilter.1.* -%{_mandir}/man1/bogolexer.1.* -%{_mandir}/man1/bogoupgrade.1.* -%{_mandir}/man1/bogotune.1.* -%{_mandir}/man1/bogoutil.1.* -%{_mandir}/man1/bf_compact.1.* -%{_mandir}/man1/bf_copy.1.* -%{_mandir}/man1/bf_tar.1.* +%{_mandir}/man1/bogofilter.1%{ext_man} +%{_mandir}/man1/bogolexer.1%{ext_man} +%{_mandir}/man1/bogoupgrade.1%{ext_man} +%{_mandir}/man1/bogotune.1%{ext_man} +%{_mandir}/man1/bogoutil.1%{ext_man} +%{_mandir}/man1/bf_compact.1%{ext_man} +%{_mandir}/man1/bf_copy.1%{ext_man} +%{_mandir}/man1/bf_tar.1%{ext_man} %if 0%{?suse_version} > 1320 %files kyotocabinet @@ -301,7 +296,7 @@ %{_bindir}/bf_copy %{_bindir}/bf_tar %{_bindir}/*-kyotocabinet -%{_mandir}/man1/*-kyotocabinet.1.* +%{_mandir}/man1/*-kyotocabinet.1%{ext_man} %endif %files sqlite3 @@ -328,7 +323,7 @@ %{_bindir}/bf_copy %{_bindir}/bf_tar %{_bindir}/*-sqlite3 -%{_mandir}/man1/*-sqlite3.1.* +%{_mandir}/man1/*-sqlite3.1%{ext_man} %files db %defattr(-,root,root) @@ -354,6 +349,6 @@ %{_bindir}/bf_copy %{_bindir}/bf_tar %{_bindir}/*-db -%{_mandir}/man1/*-db.1.* +%{_mandir}/man1/*-db.1%{ext_man} %changelog
