updated 3 packages

dovecot-2.3.14-1

php74-7.4.16-1

php80-8.0.3-1

d/dovecot/dovecot-vl.spec

@@ -7,7 +7,7 @@
 
 # pigeonhole
 %define build_pigeonhole 1
-%define pigeonholever 0.5.13
+%define pigeonholever 0.5.14
 
 # pop before smtp (drac)
 %define build_drac 0
@@ -15,7 +15,7 @@
 Summary: Dovecot Secure imap server
 Summary(ja): Dovecot セキュア IMAP サーバ
 Name: dovecot
-Version: 2.3.13
+Version: 2.3.14
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: servers
 Vendor: Project Vine
@@ -93,6 +93,9 @@ BuildRequires: openldap-devel
 BuildRequires: dracd
 %endif
 
+%global __provides_exclude_from %{_docdir}
+%global __requires_exclude_from %{_docdir}
+
 %define docdir %{_docdir}/%{name}
 %define ssldir %{_sysconfdir}/pki/%{name}
 
@@ -201,8 +204,9 @@ cp %{SOURCE110} .
 %build
 # rm -f ./configure
 # autoreconf -i -f
-%configure                           \
+%configure                       \
     INSTALL_DATA="install -c -p -m644" \
+    --docdir=%{_docdir}/%{name}  \
     --disable-static             \
 %if %{build_postgres}
     --with-pgsql                 \
@@ -221,9 +225,10 @@ cp %{SOURCE110} .
     --with-libwrap               \
     --with-zlib                  \
 %if %{build_ldap}
-    --with-ldap=plugin		 \
+    --with-ldap=plugin           \
 %endif
 %if %{with systemd}
+    --with-rundir=%{_rundir}/%{name} \
     --with-systemdsystemunitdir=%{_unitdir} \
 %endif
     --with-docs
@@ -266,6 +271,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 popd
 %endif
 
+rm -rf pkgdoc
+mkdir -p pkgdoc
+mv -f %{buildroot}%{_pkgdocdir}/* pkgdoc/
+
 %if %{build_drac}
 pushd dovecot2-drac
 install -m 755 drac_plugin.so $RPM_BUILD_ROOT/%{_libdir}/dovecot/
@@ -319,19 +328,12 @@ pushd dovecot-2.3-pigeonhole-%{pigeonholever}
 install -p -m 644 doc/example-config/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d
 popd
 
-# Install some of our own documentation
-# install -p -m644 %{SOURCE7} $RPM_BUILD_ROOT%{docdir}/REDHAT-FAQ.txt
-
-# Install the licensing files into the documentation area
-install -p -m644 COPYING* $RPM_BUILD_ROOT%{docdir}
-
-mkdir -p $RPM_BUILD_ROOT%{docdir}/examples/
 install -p -m755 doc/mkcert.sh $RPM_BUILD_ROOT%{_libexecdir}/%{name}/mkcert.sh
+#mkdir -p pkgdoc/examples/
 # for f in `cd doc; echo *.conf`; do
-#      install -p -m644 doc/$f $RPM_BUILD_ROOT%{docdir}/examples/$f;
+#      install -p -m644 doc/$f pkgdoc/examples/$f;
 # done
 
-mv $RPM_BUILD_ROOT%{docdir} $RPM_BUILD_ROOT%{docdir}-%{version}
 mkdir -p $RPM_BUILD_ROOT/var/lib/dovecot
 
 #remove the libtool archives
@@ -416,8 +418,8 @@ fi
 %files -f libs.filelist
 %defattr(-,root,root,-)
 %license COPYING COPYING.LGPL COPYING.MIT
-%doc doc/* AUTHORS ChangeLog NEWS README
-# %doc AUTHORS ChangeLog NEWS README doc/*.txt
+%doc AUTHORS ChangeLog NEWS README
+%doc pkgdoc/*
 
 %dir %{_sysconfdir}/dovecot
 %dir %{_sysconfdir}/dovecot/conf.d
@@ -537,7 +539,11 @@ fi
 %{_datadir}/aclocal/dovecot-pigeonhole.m4
 %endif
 
+
 %changelog
+* Thu Mar 04 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.14-1
+- new upstream release.
+
 * Tue Jan 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.13-1
 - new upstream release.
 

p/php74/php74-vl.spec

@@ -21,7 +21,7 @@
 
 %global php_confdir %{_sysconfdir}/%{_name}
 
-%if %{?_dist_release} == "vl6"
+%if "%{?_dist_release}" == "vl6"
 %define gd_name gd21
 %else
 %define gd_name gd
@@ -40,7 +40,7 @@
 %global apache2_cgidir %{apache2_contentdir}/cgi-bin
 %global apache2_fcgidir %{apache2_contentdir}/fcgi-bin
 
-%if %{?_dist_release} == "vl6"
+%if "%{?_dist_release}" == "vl6"
 %define www_user apache
 %define www_group apache
 %define fpm_user nobody
@@ -55,7 +55,7 @@
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 7.4.15
+Version: 7.4.16
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: programming
 Vendor: Project Vine
@@ -99,7 +99,7 @@ BuildRequires: bison
 BuildRequires: bzip2
 BuildRequires: bzip2-devel
 BuildRequires: curl-devel
-%if %{?_dist_release} == "vl6"
+%if "%{?_dist_release}" == "vl6"
 BuildRequires: db4-devel
 %else
 BuildRequires: libdb-devel
@@ -133,9 +133,7 @@ BuildRequires: zlib-devel
 BuildRequires: libicu-devel >= 3.6
 BuildRequires: libXpm-devel
 BuildRequires: libzip-devel
-%if %{?_dist_release} != "vl4"
 BuildRequires: krb5-devel
-%endif
 %if %{with systemd}
 BuildRequires: systemd-devel
 BuildRequires:  systemd-units
@@ -147,7 +145,7 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 %endif
 
-%if %{?_dist_release} != "vl6"
+%if "%{?_dist_release}" != "vl6"
 BuildRequires: www-common
 Requires: www-common
 %endif
@@ -366,7 +364,7 @@ databases.
 Summary: A PostgreSQL database module for PHP.
 Group: programming
 BuildRequires: openssl-devel
-%if %{?_dist_release} == "vl6"
+%if "%{?_dist_release}" == "vl6"
 BuildRequires: postgresql-devel
 %else
 BuildRequires: libpq-devel
@@ -925,7 +923,7 @@ fi
 
 %if %{with apache2}
 %post apache2
-%if %{?_dist_release} == "vl6"
+%if "%{?_dist_release}" == "vl6"
 chown root:apache %{_localstatedir}/%{_name}/session 2>/dev/null || true
 
 MPM=`file /etc/alternatives/apache2 | sed -e 's/^.*apache2\.\([a-z]*\).*$/\1/'`
@@ -1056,6 +1054,9 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Fri Mar 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.16-1
+- new upstream release.
+
 * Thu Feb 04 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.15-1
 - new upstream release.
 

p/php80/php80-vl.spec

@@ -21,11 +21,7 @@
 
 %global php_confdir %{_sysconfdir}/%{_name}
 
-%if %{?_dist_release} == "vl6"
-%define gd_name gd21
-%else
 %define gd_name gd
-%endif
 
 %{!?_without_pear:%global _with_pear 1}
 %global with_pear %{?_with_pear:1}%{!?_with_pear:0}
@@ -40,22 +36,15 @@
 %global apache2_cgidir %{apache2_contentdir}/cgi-bin
 %global apache2_fcgidir %{apache2_contentdir}/fcgi-bin
 
-%if %{?_dist_release} == "vl6"
-%define www_user apache
-%define www_group apache
-%define fpm_user nobody
-%define fpm_group nobody
-%else
 %define www_user www-data
 %define www_group www-data
 %define fpm_user www-data
 %define fpm_group www-data
-%endif
 
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 8.0.2
+Version: 8.0.3
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: programming
 Vendor: Project Vine
@@ -99,11 +88,7 @@ BuildRequires: bison
 BuildRequires: bzip2
 BuildRequires: bzip2-devel
 BuildRequires: curl-devel
-%if %{?_dist_release} == "vl6"
-BuildRequires: db4-devel
-%else
 BuildRequires: libdb-devel
-%endif
 BuildRequires: coreutils
 BuildRequires: flex
 BuildRequires: freetype2-devel
@@ -134,9 +119,7 @@ BuildRequires: zlib-devel
 BuildRequires: libicu-devel >= 3.6
 BuildRequires: libXpm-devel
 BuildRequires: libzip-devel
-%if %{?_dist_release} != "vl4"
 BuildRequires: krb5-devel
-%endif
 %if %{with systemd}
 BuildRequires: systemd-devel
 BuildRequires:  systemd-units
@@ -147,11 +130,8 @@ Requires(postun): systemd-units
 Requires(post): chkconfig
 Requires(preun): chkconfig
 %endif
-
-%if %{?_dist_release} != "vl6"
 BuildRequires: www-common
 Requires: www-common
-%endif
 
 Requires(post,preun): alternatives
 %{?_with_pear:Requires: %{name}-pear = %{version}-%{release}}
@@ -378,11 +358,7 @@ databases.
 Summary: A PostgreSQL database module for PHP.
 Group: programming
 BuildRequires: openssl-devel
-%if %{?_dist_release} == "vl6"
-BuildRequires: postgresql-devel
-%else
 BuildRequires: libpq-devel
-%endif
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-pdo
 Provides: %{name}_database
@@ -925,23 +901,6 @@ fi
 
 %if %{with apache2}
 %post apache2
-%if %{?_dist_release} == "vl6"
-chown root:apache %{_localstatedir}/%{_name}/session 2>/dev/null || true
-
-MPM=`file /etc/alternatives/apache2 | sed -e 's/^.*apache2\.\([a-z]*\).*$/\1/'`
-if [ "$MPM" != "prefork" ]; then
-  cat <<EOF
-
- Apache2 is configured to use $MPM MPM. But php%{majorver}-apache2 requires
-prefork MPM. Run the following command as root to switch MPM:
-
-    /sbin/update-alternatives --config apache2
-
-EOF
-fi
-
-%else
-
 MPM=`/usr/sbin/apache2ctl -V | grep "Server MPM:" | sed -e 's/^.*: *//'`
 if [ "$MPM" != "prefork" ]; then
   cat <<EOF
@@ -952,8 +911,6 @@ via FastCGI.
 
 EOF
 fi
-
-%endif
 %endif
 
 
@@ -1056,6 +1013,9 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Fri Mar 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.0.3-1
+- new upstream release.
+
 * Thu Feb 04 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.0.2-1
 - new upstream release.