Hello community,
here is the log from the commit of package mailman for openSUSE:Factory checked
in at 2017-11-29 10:53:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mailman (Old)
and /work/SRC/openSUSE:Factory/.mailman.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailman"
Wed Nov 29 10:53:34 2017 rev:38 rq:546090 version:2.1.23
Changes:
--------
--- /work/SRC/openSUSE:Factory/mailman/mailman.changes 2017-07-01
14:05:35.383717468 +0200
+++ /work/SRC/openSUSE:Factory/.mailman.new/mailman.changes 2017-11-29
10:53:38.330519373 +0100
@@ -1,0 +2,12 @@
+Mon Nov 27 17:16:32 UTC 2017 - dmuel...@suse.com
+
+- remove distributable flag (which is always true):
+ drops SuSEconfig.mailman-SuSE, mailman-SuSE.patch, mailman-SuSE2.patch
+
+-------------------------------------------------------------------
+Thu Nov 23 13:43:14 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+
+-------------------------------------------------------------------
Old:
----
SuSEconfig.mailman-SuSE
mailman-SuSE.patch
mailman-SuSE2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mailman.spec ++++++
--- /var/tmp/diff_new_pack.WHldBF/_old 2017-11-29 10:53:40.594437238 +0100
+++ /var/tmp/diff_new_pack.WHldBF/_new 2017-11-29 10:53:40.594437238 +0100
@@ -16,6 +16,11 @@
#
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+ %define _fillupdir /var/adm/fillup-templates
+%endif
+
Name: mailman
#!BuildIgnore: sendmail
BuildRequires: krb5
@@ -24,7 +29,6 @@
BuildRequires: pwdutils
BuildRequires: python-devel
BuildRequires: python-dnspython
-%define DISTRIBUTABLE 1
Url: http://www.gnu.org/software/mailman/mailman.html
Requires: cron
Requires: logrotate
@@ -48,11 +52,7 @@
Source14: %{name}.keyring
Source1: README.SUSE
Source2: mailman-2.1-manpages.tgz
-%if %DISTRIBUTABLE
Source4: mailman-generate-sysconfig
-%else
-Source4: SuSEconfig.mailman-SuSE
-%endif
Source5: rcmailman
Source6: aliases
Source7: sysconfig.mailman
@@ -61,10 +61,6 @@
Source11: logrotate.mailman
Source12: mm-text.png
Patch1: mailman-wrapper.patch
-%if %DISTRIBUTABLE
-%else
-Patch2: mailman-SuSE.patch
-%endif
Patch3: mailman-2.1.14-python.dif
Patch5: mailman-2.1.14-editarch.patch
Patch6: mailman-2.1.14-misc-PACKAGES.diff
@@ -73,10 +69,6 @@
Patch11: mailman-2.1.4-notavaliduser.patch
Patch17: mailman-weak-password.diff
Patch18: mailman-2.1.5-no_extra_asian.dif
-%if %DISTRIBUTABLE
-%else
-Patch20: mailman-SuSE2.patch
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define m_uid 72
%define m_gid 67
@@ -99,10 +91,6 @@
%prep
%setup -q
%patch1
-%if %DISTRIBUTABLE
-%else
-%patch2
-%endif
%patch3
%patch5 -p1
%patch6 -p1
@@ -111,10 +99,6 @@
%patch11 -p1
%patch17 -p1
%patch18
-%if %DISTRIBUTABLE
-%else
-%patch20
-%endif
cp -av %{S:1} .
# ----------------------------------------------------------------------------
@@ -131,7 +115,7 @@
# ----------------------------------------------------------------------------
%install
-install -d
$RPM_BUILD_ROOT/{usr/sbin,etc/{mailman,sysconfig,init.d,logrotate.d},var/adm/fillup-templates,sbin/conf.d}/
+install -d
$RPM_BUILD_ROOT/{usr/sbin,etc/{mailman,sysconfig,init.d,logrotate.d},%{_fillupdir},bin/conf.d}/
make DESTDIR=$RPM_BUILD_ROOT install
# add a hint to the crontab
cat <<EOF > $RPM_BUILD_ROOT/usr/lib/mailman/cron/crontab
@@ -149,7 +133,7 @@
getent group $MAILMAN_CGI_GID | cut -d: -f3 >
$RPM_BUILD_ROOT/%{mailman_confd}/mailman.cgi-gid
echo %{m_gid} > $RPM_BUILD_ROOT/%{mailman_confd}/mailman.mail-gid
# SuSEconfig stuff:
-install -m 644 %{S:7} $RPM_BUILD_ROOT/var/adm/fillup-templates/
+install -m 644 %{S:7} $RPM_BUILD_ROOT%{_fillupdir}/
install -m 755 %{S:4} $RPM_BUILD_ROOT/usr/lib/mailman/bin/
install -m 644 %{S:8} %{buildroot}/usr/lib/mailman/sgidlist
# start script:
@@ -170,10 +154,6 @@
install -d $RPM_BUILD_ROOT%{_mandir}/man8/
tar xz -C $RPM_BUILD_ROOT%{_mandir}/man8/ -f %SOURCE2
install -m 644 %{S:11} $RPM_BUILD_ROOT/etc/logrotate.d/mailman
-%if %DISTRIBUTABLE
-%else
-cp %SOURCE12 $RPM_BUILD_ROOT/usr/lib/mailman/icons/
-%endif
# ----------------------------------------------------------------------------
%clean
@@ -253,7 +233,7 @@
%config(noreplace) %attr(-, root, mailman) /var/lib/mailman/data/[^a]*
%config(noreplace) %attr(-, mailman, mailman) /var/lib/mailman/data/aliases
%ghost %attr(0664, mailman, mailman) /var/lib/mailman/data/aliases.db
-/var/adm/fillup-templates/*
+%{_fillupdir}/*
/usr/sbin/*
/etc/init.d/*
%dir /etc/apache2
