updated 9 packages

control-center-3.30.3-2

docker-ce-19.03.9-1

docker-compose-1.26.2-1

golang-1.14.6-1

polkit-0.116-2

postfix-3.5.6-1

unbound-1.11.0-1

webkitgtk4-2.28.3-1

zabbix-5.0.2-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12431 ec354946-7b23-47d6-9f5a-488ba84defc7

c/control-center/control-center-vl.spec

@@ -21,20 +21,19 @@ Summary: GNOME Control Center.
 Summary(ja): GNOME コントロールセンター
 Name: control-center
 Version: 3.30.3
-Release: 1%{?_dist_release}
-License: GPLv2+ and GFDL+
+Release: 2%{?_dist_release}
 Group: User Interface/Desktops
-URL: http://www.gnome.org
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: inagaki, daisuke
 
+License: GPLv2+ and GFDL+
+URL: http://www.gnome.org
 Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.30/gnome-control-center-%{version}.tar.xz
-
+Patch0: fix-segv.patch
 # patch for Vine
 Patch1000: 0001-disable-NTP-and-auto-timezone.patch
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: inagaki, daisuke
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Obsoletes: gnome, control-center-devel < 2.0
@@ -73,7 +72,7 @@ BuildRequires: autoconf
 BuildRequires: gettext-devel
 BuildRequires: librsvg2-devel
 BuildRequires: libXScrnSaver-devel
-BuildRequires: libXxf86misc-devel
+#BuildRequires: libXxf86misc-devel
 BuildRequires: libSM-devel
 BuildRequires: unique3-devel
 BuildRequires: polkit-devel
@@ -87,9 +86,7 @@ BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: gnome-online-accounts-devel
 BuildRequires: colord-devel
 BuildRequires: colord-gtk-devel
-BuildRequires: libnm-gtk-devel >= %{nm_version}
-BuildRequires: NetworkManager-glib-devel >= %{nm_version}
-BuildRequires: NetworkManager-libnm-devel
+BuildRequires: NetworkManager-libnm-devel >= %{nm_version}
 BuildRequires: libnma-devel
 BuildRequires: ModemManager-glib-devel >= %{mm_version}
 BuildRequires: libnotify-devel >= %{libnotify_version}
@@ -101,6 +98,7 @@ BuildRequires: libsmbclient-devel
 BuildRequires: eudev-libgudev1-devel
 BuildRequires: gnome-bluetooth-devel
 BuildRequires: libappstream-glib-devel
+BuildRequires: udisks2-devel
 BuildRequires: chrpath
 
 %description
@@ -134,7 +132,7 @@ GNOME コントロールセンターの開発用ファイルが含まれてい
 
 %prep
 %setup -q -n gnome-control-center-%{version}
-%patch1000 -p1
+%autopatch -p1
 
 %build
 %meson \
@@ -225,6 +223,9 @@ fi
 
 
 %changelog
+* Mon Jul 20 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.30.3-2
+- added Patch0 to fix segmentation fault.
+
 * Thu May 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.30.3-1
 - new upstream release.
 - rebuilt with libgtop2-2.40.0.

d/docker-ce/docker-ce-vl.spec

@@ -1,3 +1,4 @@
+%bcond_with systemd
 %bcond_with build_nosrc
 
 %if !%{with build_nosrc}
@@ -5,10 +6,14 @@
 %endif
 
 Name: docker-ce
-Version: 19.03.8
-Release: 1%{?_dist_release}
 Summary: The open-source application container engine
+Version: 19.03.9
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: Development/Tools
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: tomop
+
 License: ASL 2.0
 URL: https://www.docker.com
 Source0: https://download.docker.com/linux/static/stable/x86_64/docker-%{version}.tgz
@@ -18,6 +23,8 @@ Source2: https://github.com/docker/docker-ce/raw/v%{version}/components/cli/LICE
 Source10: docker.init
 Source11: docker.sysconfig
 Source12: docker.conf
+Source100: docker.service
+Source101: docker.socket
 
 %if %{with build_nosrc}
 NoSource: 0
@@ -25,14 +32,13 @@ NoSource: 1
 NoSource: 2
 %endif
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
-
 # required packages on install
 Requires: /bin/sh
 Requires: libcgroup
 Requires: docker-ce-cli = %{version}-%{release}
+%if %{with systemd}
+%{?systemd_requires}
+%endif
 
 Conflicts: docker-ee
 Conflicts: docker-ee-cli
@@ -48,6 +54,7 @@ language, framework or packaging system. That makes them great building blocks
 for deploying and scaling web apps, databases, and backend services without
 depending on a particular stack or provider.
 
+
 %package cli
 Summary: clients for Docker
 Group: Development/Tools
@@ -67,27 +74,32 @@ depending on a particular stack or provider.
 %prep
 %setup -q -c -n docker
 
+
 %build
 
+
 # %check
 # cli/build/docker -v
 
+
 %install
 # install binary
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_localstatedir}/lib/docker
 install -d %{buildroot}%{_localstatedir}/run/docker
-install -d %{buildroot}%{_initdir}
-install -d %{buildroot}%{_sysconfdir}/sysconfig
-install -d %{buildroot}%{_sysconfdir}/rsyslog.d
 
 for f in docker/*; do
   install -p -m 755 $f %{buildroot}%{_bindir}/
 done
 
-install -p -m 755 %{SOURCE10} %{buildroot}%{_initdir}/docker
-install -p -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/sysconfig/docker
-install -p -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/rsyslog.d/docker
+%if %{with systemd}
+install -D -p -m 644 %{SOURCE100} %{buildroot}%{_unitdir}/docker.service
+install -D -p -m 755 %{SOURCE101} %{buildroot}%{_unitdir}/docker.socket
+%else
+install -D -p -m 755 %{SOURCE10} %{buildroot}%{_initdir}/docker
+install -D -p -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/sysconfig/docker
+install -D -p -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/rsyslog.d/docker
+%endif
 
 install -p -m 644 %{SOURCE1} ./
 install -p -m 644 %{SOURCE2} ./
@@ -96,19 +108,35 @@ install -p -m 644 %{SOURCE2} ./
 %clean
 rm -rf %{buildroot}
 
-%post
+%pre
 if ! getent group docker > /dev/null; then
     groupadd --system docker
 fi
+
+%post
+%if %{with systemd}
+%systemd_post docker.service
+%else
 if [ $1 -eq 1 ]; then
   /sbin/chkconfig --add docker
 fi
+%endif
 
 %preun
-if [ $1 -eq 0 ]; then
+%if %{with systemd}
+%systemd_preun docker.service
+%else
+if [ $1 -eq 0 -o -x /bin/systemctl ]; then
   /sbin/chkconfig docker off
   /sbin/chkconfig --del docker
 fi
+%endif
+
+%if %{with systemd}
+%postun
+%systemd_postun_with_restart docker.service
+%endif
+
 
 # list files owned by the package here
 %files
@@ -123,9 +151,14 @@ fi
 %{_bindir}/dockerd
 %dir %{_localstatedir}/run/docker
 %dir %{_localstatedir}/lib/docker
+%if %{with systemd}
+%{_unitdir}/docker.service
+%{_unitdir}/docker.socket
+%else
 %{_initdir}/docker
 %config(noreplace) %{_sysconfdir}/sysconfig/docker
 %config(noreplace) %{_sysconfdir}/rsyslog.d/docker
+%endif
 
 %files cli
 %defattr(-,root,root,-)
@@ -134,7 +167,12 @@ fi
 %{_bindir}/docker
 %{_bindir}/runc
 
+
 %changelog
+* Sun Jul 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 19.03.09-1
+- new upstream release.
+- added systemd support (disabled as default).
+
 * Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 19.03.08-1
 - new upstream release.
 

d/docker-compose/docker-compose-vl.spec

@@ -6,7 +6,7 @@
 
 Name: docker-compose
 Summary: Define and run multi-container applications with Docker
-Version: 1.25.4
+Version: 1.26.2
 Release: 1%{?_dist_release}
 Group: Development/Tools
 License: ASL 2.0
@@ -51,6 +51,9 @@ install -p -m 755 %{SOURCE2} ./
 %{_bindir}/docker-compose
 
 %changelog
+* Sun Jul 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.26.2-1
+- new upstream release.
+
 * Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.25.4-1
 - new upstream release.
 

g/golang/golang-vl.spec

@@ -76,7 +76,7 @@
 %endif
 
 %global go_api 1.14
-%global go_version 1.14.1
+%global go_version 1.14.6
 
 Name:           golang
 Version:        %{go_version}
@@ -177,6 +177,10 @@ Summary:        Golang shared object libraries
 %{summary}.
 %endif
 
+
+%debug_package
+
+
 %prep
 %setup -q -n go
 
@@ -395,6 +399,9 @@ fi
 %endif
 
 %changelog
+* Sat Jul 25 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.6-1
+- new upstream release.
+
 * Sat Mar 21 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.1-1
 - new upstream release.
 

p/polkit/polkit-vl.spec

@@ -1,14 +1,23 @@
+%bcond_with systemd
+
 Summary: PolicyKit Authorization Framework
 Summary(ja): PolicyKit 認証フレームワーク
 Name: polkit
 Version: 0.116
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Group: System Environment/Libraries
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: LGPLv2+
-URL: http://www.freedesktop.org/wiki/Software/polkit
-Source0: http://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.gz
+URL: https://www.freedesktop.org/wiki/Software/polkit
+Source0: https://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.gz
 Patch0: polkit-0.115-elogind.patch
+Patch1: polkit-0.116-pkttyagent-sigttou-bg-job.patch
+Patch2: pkttyagent-tcsaflush-batch-erase.patch
+Patch3: jsauthority-memleak.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Group: System Environment/Libraries
 BuildRequires: elogind-devel
 BuildRequires: glib2-devel
 BuildRequires: expat-devel
@@ -26,8 +35,9 @@ Provides: PolicyKit = 0.11
 Obsoletes: polkit-desktop-policy < 0.103
 Provides: polkit-desktop-policy = 0.103
 
-Vendor: Project Vine
-Distribution: Vine Linux
+%if %{with systemd}
+%{?systemd_requires}
+%endif
 
 %description
 PolicyKit is a toolkit for defining and handling authorizations.
@@ -59,7 +69,13 @@ Development documentation for PolicyKit.
 
 %prep
 %setup -q
+%if !%{with systemd}
 %patch0 -p1
+%endif
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
 
 %build
 autoreconf -vif
@@ -71,11 +87,16 @@ export CXXFLAGS="%{optflags} -std=gnu++11"
 	--disable-static \
 	--libexecdir=%{_libexecdir}/polkit-1 \
 	--enable-introspection \
+%if %{with systemd}
+	--enable-libsystemd-login=yes \
+%else
 	--enable-libelogind=yes \
+%endif
 	--enable-examples
 
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -89,22 +110,41 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/*.la
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre
 groupadd -g 27 -r polkitd 2>&1 > /dev/null || :
 useradd -u 27 -g polkitd -r -d '/' -s /sbin/nologin -c "User for polkitd" polkitd 2>&1 > /dev/null || :
 exit 0
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+%if %{with systemd}
+%systemd_post polkit.service
+%endif
+
+%if %{with systemd}
+%preun
+%systemd_preun polkit.service
+%endif
+
+%postun
+/sbin/ldconfig
+%if %{with systemd}
+%systemd_postun_with_restart polkit.service
+%endif
 
-%postun -p /sbin/ldconfig
 
 %files -f polkit-1.lang
 %defattr(-,root,root,-)
-%doc COPYING NEWS README
+%license COPYING
+%doc NEWS README
 %{_libdir}/lib*.so.*
 %{_datadir}/man/man1/*
 %{_datadir}/man/man8/*
 %{_datadir}/dbus-1/system-services/*
+%if %{with systemd}
+%{_unitdir}/polkit.service
+%endif
 %dir %{_datadir}/polkit-1/
 %dir %{_datadir}/polkit-1/actions
 %attr(0700,polkitd,root) %dir %{_datadir}/polkit-1/rules.d
@@ -141,7 +181,12 @@ exit 0
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/*
 
+
 %changelog
+* Sat Jul 25 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.116-2
+- added systemd support (disabled as default).
+- imported Patch1-3 from rawhide.
+
 * Tue Mar 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.116-1
 - new upstream release.
 

p/postfix/postfix-vl.spec

@@ -32,7 +32,7 @@
 Summary:        Postfix Mail Transport Agent
 Summary(ja):    Postfix メールトランスポートエージェント
 Name:           postfix
-Version:        3.5.4
+Version:        3.5.6
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          System Environment/Daemons
 Vendor:         Project Vine
@@ -556,6 +556,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/postfix/postfix-files.d/pcre
 
 %changelog
+* Mon Jul 27 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.6-1
+- new upstream release.
+
 * Sun Jun 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.4-1
 - new upstream release.
 

u/unbound/unbound-vl.spec

@@ -1,4 +1,4 @@
-%bcond_with systemd
+ %bcond_with systemd
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %global with_munin 0
@@ -11,7 +11,7 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.10.1
+Version: 1.11.0
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: System Environment/Daemons
 Distribution: Vine Linux
@@ -360,6 +360,8 @@ fi
 
 
 %changelog
+* Mon Jul 27 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.11.0-1
+
 * Tue May 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.1-1
 - updated to 1.10.1.
 

w/webkitgtk4/webkitgtk4-vl.spec

@@ -8,7 +8,7 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk4
-Version:        2.28.2
+Version:        2.28.3
 Release:        1%{?_dist_release}
 Summary:        GTK+ Web content engine library
 Group:          System Environment/Libraries
@@ -121,6 +121,7 @@ rm -rf Source/ThirdParty/leveldb/
 rm -rf Source/ThirdParty/gtest/
 rm -rf Source/ThirdParty/qunit/
 
+
 %build
 # binutils-2.23 doesn't support "reduce-memory-overheads"
 # Use linker flags to reduce memory consumption
@@ -163,6 +164,7 @@ popd
 
 ninja -C %{_target_platform}
 
+
 %install
 DESTDIR=%{buildroot} ninja -C %{_target_platform} install
 
@@ -183,11 +185,13 @@ DESTDIR=%{buildroot} ninja -C %{_target_platform} install
 %add_to_license_files Source/WTF/wtf/dtoa/COPYING
 %add_to_license_files Source/WTF/wtf/dtoa/LICENSE
 
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 %post jsc -p /sbin/ldconfig
 %postun jsc -p /sbin/ldconfig
 
+
 %files -f WebKit2GTK-4.0.lang
 %license _license_files/*
 %{_libdir}/libwebkit2gtk-4.0.so.*
@@ -221,7 +225,11 @@ DESTDIR=%{buildroot} ninja -C %{_target_platform} install
 %{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc
 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
 
+
 %changelog
+* Sun Jul 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.28.3-1
+- new upstream release.
+
 * Thu Jul 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.28.2-1
 - new upstream release.
 

z/zabbix/zabbix-vl.spec

@@ -16,8 +16,8 @@
 
 Summary: The Enterprise-class Monitoring Solution for Everyone
 Name: zabbix
-Version: 4.0.19
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Version: 5.0.2
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: Applications/Services
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -25,7 +25,8 @@ Packager: iwaim
 
 License: GPLv2
 URL: https://www.zabbix.com/
-Source0: https://cdn.zabbix.com/stable/%{version}/%{name}-%{version}.tar.gz
+%global shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+Source0: https://cdn.zabbix.com/zabbix/sources/stable/%{shortver}/%{name}-%{version}.tar.gz
 Source1: zabbix_server.init
 Source2: zabbix_proxy.init
 Source3: zabbix_agentd.init
@@ -43,8 +44,6 @@ Source14:       %{name}-server-mysql.service
 Source15:       %{name}-server-pgsql.service
 Source17:       %{name}-tmpfiles-zabbixsrv.conf
 
-Patch1: 0001-change-the-font-for-Vine-Linux.patch
-Patch2: 0002-modified-config-files-for-Vine-Linux.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 %if %{with server}%{with proxy}
 BuildRequires: libpq-devel
@@ -57,6 +56,8 @@ BuildRequires: net-snmp-devel
 BuildRequires: OpenIPMI-devel
 BuildRequires: unixODBC-devel
 BuildRequires: libssh2-devel
+BuildRequires: openssl-devel
+
 Requires(pre): glibc-common
 Requires(pre): shadow-utils
 %if %{with systemd}
@@ -66,6 +67,7 @@ BuildRequires:   systemd
 %description
 The Enterprise-class Monitoring Solution for Everyone.
 
+
 %if %{with server}
 %package server-common
 Summary: common files for Zabbix Server
@@ -80,6 +82,7 @@ Requires(preun,postun): initscripts
 %description server-common
 This package include common files for Zabbix Server.
 
+
 %package server-mysql
 Summary: Zabbix Server for MySQL/MariaDB
 Provides: %{name}-server
@@ -88,6 +91,7 @@ Requires: %{name}-server-common == %{version}-%{release}
 %description server-mysql
 Zabbix Server for MySQL/MariaDB
 
+
 %package server-postgresql
 Summary: Zabbix Server for PostgreSQL
 Provides: %{name}-server
@@ -98,6 +102,7 @@ Zabbix Server for PostgreSQL
 
 %endif
 
+
 %if %{with agent}
 %package agent
 Summary: Zabbix Agent
@@ -114,6 +119,7 @@ Zabbix Agent
 
 %endif
 
+
 %if %{with proxy}
 %package proxy-common
 Summary: common files for Zabbix Proxy
@@ -128,6 +134,7 @@ Requires(preun,postun): initscripts
 %description proxy-common
 This package include common files for Zabbix Proxy
 
+
 %package proxy-mysql
 Summary: Zabbix Proxy for MySQL/MariaDB
 Provides: %{name}-proxy
@@ -136,6 +143,7 @@ Requires: %{name}-proxy-common == %{version}-%{release}
 %description proxy-mysql
 Zabbix Proxy for MySQL/MariaDB
 
+
 %package proxy-postgresql
 Summary: Zabbix Proxy for PostgreSQL
 Provides: %{name}-proxy
@@ -146,6 +154,7 @@ Zabbix Proxy for PostgreSQL
 
 %endif
 
+
 %if %{with frontend}
 %package frontend-php
 Summary: Zabbix web frontend with PHP
@@ -156,6 +165,7 @@ Requires: TrueType-vlgothic
 %description frontend-php
 Zabbix web frontend with PHP.
 
+
 %package frontend-php-mysql
 Summary: Zabbix web frontend with PHP and MySQL/MariaDB
 Group: Applications/Internet
@@ -165,6 +175,7 @@ Requires: php74-mysql
 %description frontend-php-mysql
 Zabbix web frontend with PHP and MySQL/MariaDB.
 
+
 %package frontend-php-postgresql
 Summary: Zabbix web frontend with PHP and PostgreSQL
 Group: Applications/Internet
@@ -176,27 +187,20 @@ Zabbix web frontend with PHP and PostgreSQL.
 
 %endif
 
+
 %prep
 %setup -q -T -a 0 -c -n zabbix-%{version}
 mv zabbix-%{version} zabbix_mysql
-pushd zabbix_mysql
-%patch1 -p 1
-%patch2 -p 1
-popd
 
 %if %{with server}%{with proxy}
 %setup -q -D -T -a 0 -n zabbix-%{version}
 mv zabbix-%{version} zabbix_pgsql
-pushd zabbix_pgsql
-%patch1 -p 1
-%patch2 -p 1
-popd
 %endif
 
-%if %{with systemd}
-# Specific
 for v in mysql pgsql; do
 pushd zabbix_$v
+sed -i -e 's/DejaVuSans/VL-Gothic-Regular/g' ./ui/include/defines.inc.php
+
 sed -i \
     -e '\|^# PidFile=.*|a PidFile=/run/zabbix/zabbix_agentd.pid' \
     -e 's|^LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|' \
@@ -214,10 +218,8 @@ sed -i \
 popd
 done
 
-%endif
 
 %build
-
 Build()
 {
 perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
@@ -234,6 +236,7 @@ perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
            --with-net-snmp \
            --with-unixodbc \
            --with-ssh2 \
+           --with-openssl \
            $@
 
 %__make
@@ -253,6 +256,7 @@ Build
 popd
 %endif
 
+
 %install
 %__rm -rf %{buildroot}
 pushd zabbix_mysql
@@ -318,7 +322,7 @@ install -m 0644 -p %{SOURCE9} %{buildroot}%{_prefix}/lib/tmpfiles.d/zabbix.conf
 %if %{with frontend}
 # frontend-php
 %__mkdir_p %{buildroot}%{_datadir}/zabbix-frontend
-%__cp -a frontends/php %{buildroot}%{_datadir}/zabbix-frontend/
+%__cp -a ui %{buildroot}%{_datadir}/zabbix-frontend/php
 %__rm -f %{buildroot}%{_datadir}/zabbix-frontend/php/assets/fonts/DejaVuSans.ttf
 
 ln -s /usr/share/fonts/TrueType-vlgothic/VL-Gothic-Regular.ttf \
@@ -341,9 +345,11 @@ install -m755 src/zabbix_proxy/zabbix_proxy %{buildroot}%{_sbindir}/zabbix_proxy
 popd
 %endif
 
+
 %clean
 %__rm -rf %{buildroot}
 
+
 %pre
 getent group zabbix >/dev/null || groupadd -r zabbix
 getent passwd zabbix >/dev/null || \
@@ -454,8 +460,8 @@ fi
 
 %if %{with agent}
 %preun agent
-%systemd_preun zabbix-agent.service
 %if %{with systemd}
+%systemd_preun zabbix-agent.service
 %else
 if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
         /sbin/service zabbix_agentd stop >/dev/null 2>&1
@@ -514,12 +520,12 @@ fi
 
 %endif
 
+
 %files
 %defattr(-,root,root,-)
 %license zabbix_mysql/COPYING
 %doc zabbix_mysql/AUTHORS zabbix_mysql/ChangeLog zabbix_mysql/NEWS zabbix_mysql/README
 %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/%{name}
-%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/%{name}
 %dir %{_datadir}/zabbix
 %if %{with server}%{with proxy}
 %{_datadir}/zabbix/mysql
@@ -528,6 +534,7 @@ fi
 %if %{with systemd}
 %{_prefix}/lib/tmpfiles.d/zabbix.conf
 %endif
+%{_bindir}/zabbix_js
 
 %if %{with server}
 %files server-common
@@ -618,7 +625,12 @@ fi
 
 %endif
 
+
 %changelog
+* Thu Jul 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.0.2-1
+- new upstream release.
+- dropped all patches: made to get the same effect by another method.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.19-2
 - rebuilt with libevent-2.1.11.