updated 3 packages

chrony-3.5.1-1

oniguruma-6.9.5.rev1-2

python-virtualenv-20.0.31-1

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

c/chrony/chrony-vl.spec

@@ -1,8 +1,8 @@
 %bcond_with systemd
 
 Name:           chrony
-Version:        3.5
-Release:        2%{?_dist_release}%{?with_systemd:.systemd}
+Version:        3.5.1
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        An NTP client/server
 Group:          System Environment/Daemons
 Vendor:         Project Vine
@@ -27,9 +27,13 @@ Patch2:         chrony-service-helper.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libcap-devel readline-devel ncurses-devel bison
+BuildRequires:  libseccomp-devel
+BuildRequires:  gcc gcc-c++ bison gnupg2 net-tools
+BuildRequires:  gnutls-devel gnutls-utils
 
 Requires(pre):  shadow-utils
 %if %{with systemd}
+BuildRequires:  systemd
 %{?systemd_requires}
 %else
 Requires(post): chkconfig
@@ -42,7 +46,6 @@ Obsoletes:      ntp < 4.2.6p5
 %endif
 Obsoletes: networkmanager-dispatcher-chrony
 
-
 %description
 A client/server for the Network Time Protocol, this program keeps your
 computer's clock accurate. It was specially designed to support
@@ -50,6 +53,7 @@ systems with intermittent internet connections, but it also works well
 in permanently connected environments. It can use also hardware reference
 clocks, system real-time clock or manual input as time references.
 
+
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
 %patch2 -p1 -b .service-helper
@@ -59,6 +63,7 @@ echo '# Keys used by chronyd for command and NTP authentication' > chrony.keys
 # regenerate the file from getdate.y
 rm -f getdate.c
 
+
 %build
 #CFLAGS="$RPM_OPT_FLAGS"
 #%ifarch %{sparc}
@@ -71,6 +76,8 @@ rm -f getdate.c
 
 %configure \
 	--docdir=%{_docdir} \
+	--enable-ntp-signd \
+	--enable-scfilter \
 	--with-user=chrony \
 	--with-sendmail=%{_sbindir}/sendmail \
 %if %{with systemd}
@@ -80,6 +87,7 @@ rm -f getdate.c
 	--enable-forcednsretry
 make %{?_smp_mflags} all docs
 
+
 %install
 rm -rf %{buildroot}
 
@@ -121,9 +129,11 @@ install -m 755 -p %{SOURCE4} %{buildroot}%{_initrddir}/chronyd
 
 touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc}
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %pre
 getent group chrony > /dev/null || /usr/sbin/groupadd -r chrony
 getent passwd chrony > /dev/null || /usr/sbin/useradd -r -g chrony \
@@ -144,7 +154,7 @@ getent passwd chrony > /dev/null || /usr/sbin/useradd -r -g chrony \
 %if %{with systemd}
 %systemd_preun chronyd.service chrony-wait.service
 %else
-if [ "$1" -eq 0 ]; then
+if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
         /sbin/service chronyd stop &> /dev/null
         /sbin/chkconfig --del chronyd
 fi
@@ -161,6 +171,7 @@ fi
 :
 %endif
 
+
 %files
 %defattr(-,root,root,-)
 %license COPYING
@@ -192,6 +203,9 @@ fi
 %dir %attr(-,chrony,chrony) %{_localstatedir}/log/chrony
 
 %changelog
+* Thu Aug 27 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.1-1
+- new upstream release.
+
 * Mon Apr 06 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5-2
 - added systemd stuff (disabled as default).
 - updated Source2.

o/oniguruma/oniguruma-vl.spec

@@ -1,14 +1,16 @@
-%define srcname onig
+%define srcname	onig
+%global ver	6.9.5
+%global rev	rev1
 
 Summary:	Oniguruma - A regular expressions library
 Summary(ja):	鬼車 - 正規表現ライブラリ
 Name:		oniguruma
-Version:	6.9.4
-Release:	1%{?_dist_release}
+Version:	%{ver}%{?rev:.}%{?rev}
+Release:	2%{?_dist_release}
 License:	BSD
-Group:		System Environment/Libraries
+Group:		system
 URL:		https://github.com/kkos/oniguruma
-Source0:	https://github.com/kkos/oniguruma/releases/download/v%{version}/%{srcname}-%{version}.tar.gz
+Source0:	https://github.com/kkos/oniguruma/releases/download/v%{ver}%{?rev:_}%{?rev}/%{srcname}-%{ver}%{?rev:-}%{?rev}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -26,10 +28,11 @@ for every regular expression object can be specified.
 このライブラリの特長は、それぞれの正規表現オブジェクトごとに
 異なる文字エンコーディングを指定できることです。
 
+
 %package devel
 Summary:	Libraries/include files for Oniguruma
 Summary(ja):	鬼車の開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
@@ -48,13 +51,20 @@ applications with Oniguruma.
 このパッケージには、鬼車を使ったアプリケーションの開発に必要な
 ライブラリ及びヘッダファイルが含まれています。
 
+
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n %{srcname}-%{ver}
+
 
 %build
-%configure
+%configure \
+	--enable-posix-api \
+	--disable-silent-rules \
+	--disable-static
+
 %__make %{?_smp_mflags}
 
+
 %install
 %__rm -rf %{buildroot}
 %makeinstall
@@ -63,14 +73,14 @@ applications with Oniguruma.
 %__rm -f %{buildroot}%{_libdir}/libonig.a
 %__rm -f %{buildroot}%{_libdir}/libonig.la
 
+
 %clean
 %__rm -rf %{buildroot}
 
-%post
-/sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -87,6 +97,12 @@ applications with Oniguruma.
 %{_includedir}/onig*.h
 
 %changelog
+* Fri Aug 21 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.9.5.rev1-2
+- enabled POSIX API.
+
+* Fri Aug 21 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.9.5.rev1-1
+- new upstream release.
+
 * Wed Dec 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.9.4-1
 - new upstream release.
 

p/python-virtualenv/python-virtualenv-vl.spec

@@ -3,33 +3,33 @@
 Summary:        Tool to create isolated Python environments
 Summary(ja):    隔離されたPython環境を構築するためのツール
 Name:           python-%{oname}
-Version:        15.1.0
+Version:        20.0.31
 Release:        1%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       yasumichi
 
-Group:          Development/Languages
 License:        MIT
-URL:            http://pypi.python.org/pypi/%{oname}
-Source0:        http://pypi.python.org/packages/source/v/%{oname}/%{oname}-%{version}.tar.gz
-# virtualenv -p "/usr/bin/python3" venv fails if there are not packages installed
-# under /usr/local/lib/pythonX.Y/site-packages. Check if exec_dir exists before
-# listing it's content.
-Patch0:         check-exec_dir.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch:      noarch
+URL:            https://pypi.python.org/pypi/%{oname}
+Source0:        https://pypi.python.org/packages/source/v/%{oname}/%{oname}-%{version}.tar.gz
+# Add /usr/share/python-wheels to extra_search_dir
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	yasumichi
+BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  python-rpm-macros
-BuildRequires:  python3-rpm-macros
 
+BuildRequires:  python2-rpm-macros
 BuildRequires:  python-devel
-Requires:       python-devel
-
 BuildRequires:  python-setuptools
+Requires:       python-devel
 Requires:       python-setuptools
 
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-devel
+
 
 %description
 virtualenv is a tool to create isolated Python environments. virtualenv
@@ -41,7 +41,7 @@ licensed under an MIT-style permissive license.
 %package -n     python3-virtualenv
 Summary:        Tool to create isolated Python environments
 Summary(ja):    隔離されたPython環境を構築するためのツール
-
+Group:          programming
 Requires:       python3-setuptools
 Requires:       python3-devel
 
@@ -54,28 +54,34 @@ licensed under an MIT-style permissive license
 
 %prep
 %setup -q -n %{oname}-%{version}
-%{__sed} -i -e "1s|#!/usr/bin/env python||" virtualenv.py 
+%{__sed} -i -e "1s|#!/usr/bin/env python||" tasks/update_embedded.py
+
+# Remove the wheels provided by RPM packages
+rm src/virtualenv/seed/wheels/embed/pip-*
+rm src/virtualenv/seed/wheels/embed/setuptools-*
+rm src/virtualenv/seed/wheels/embed/wheel-*
+
+test ! -f src/virtualenv/seed/embed/wheels/*.whl
 
-%patch0 -p1
 
 %build
 # Build code
-%{py_build}
+%{py2_build}
 %{py3_build}
 
+
 %install
 rm -rf %{buildroot}
-%{py3_install}
-# rename binaries to use python3
-mv %{buildroot}/%{_bindir}/virtualenv %{buildroot}/%{_bindir}/py3-virtualenv
-# The versioned 3.x script was removed from upstream. Add it back.
-cp %{buildroot}/%{_bindir}/py3-virtualenv %{buildroot}/%{_bindir}/virtualenv-%{python3_version}
-cp %{buildroot}/%{_bindir}/py3-virtualenv %{buildroot}/%{_bindir}/virtualenv-3
-
-%{py_install}
+%{py2_install}
 # The versioned 2.x script was removed from upstream. Add it back.
 cp %{buildroot}/%{_bindir}/virtualenv %{buildroot}/%{_bindir}/virtualenv-%{python_version}
 cp %{buildroot}/%{_bindir}/virtualenv %{buildroot}/%{_bindir}/virtualenv-2
+rm %{buildroot}/%{_bindir}/virtualenv
+
+%{py3_install}
+# The versioned 3.x script was removed from upstream. Add it back.
+cp %{buildroot}/%{_bindir}/virtualenv %{buildroot}/%{_bindir}/virtualenv-%{python3_version}
+cp %{buildroot}/%{_bindir}/virtualenv %{buildroot}/%{_bindir}/virtualenv-3
 
 
 %clean
@@ -84,25 +90,27 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%license LICENSE.txt
-%doc docs/*rst PKG-INFO AUTHORS.txt
-%{python_sitelib}/*
-%{_bindir}/virtualenv
+%license LICENSE
+%doc docs/*rst README*
 %{_bindir}/virtualenv-2
 %{_bindir}/virtualenv-%{python_version}
+%{python_sitelib}/*
 
 %files -n python3-virtualenv
-%license LICENSE.txt
-%doc docs/*rst PKG-INFO AUTHORS.txt
-%{_bindir}/py3-virtualenv
+%license LICENSE
+%doc docs/*rst README*
+%{_bindir}/virtualenv
 %{_bindir}/virtualenv-3
 %{_bindir}/virtualenv-%{python3_version}
-%{python3_sitelib}/virtualenv.py
-%{python3_sitelib}/virtualenv_support/
+%{python3_sitelib}/virtualenv
 %{python3_sitelib}/virtualenv-*.egg-info/
-%{python3_sitelib}/__pycache__/*
 
 %changelog
+* Sat Aug 22 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.0.31-1
+- new upstream release.
+- made python3 primary (/usr/bin/virtualenv).
+- dropped Patch0.
+
 * Mon Dec 18 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 15.1.0-1
 - new upstream release.
 - added Patch0.