Browse Source

updated 11 packages

libxml2-2.9.10-4

newt-0.52.21-2

python-docutils-0.16-2

python-inotify-0.9.6-3

python-lxml-4.5.2-2

python-pykf-0.3.4-8

python-2.7.18-1

rhpxl-1.9-10

rrdtool-1.7.2-3

system-config-date-1.9.61-3

system-config-network-1.6.2-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12477 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 3 years ago
parent
commit
aad7127f1b

+ 7 - 1
lib/libx/libxml2/libxml2-vl.spec

@@ -2,7 +2,7 @@ Summary: Library providing XML and HTML support
 Summary(ja): XML や HTML サポートを提供するライブラリ
 Name: libxml2
 Version: 2.9.10
-Release: 3%{_dist_release}
+Release: 4%{_dist_release}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -246,6 +246,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/
 #(cd doc/examples ; make clean ; rm -rf .deps Makefile)
 gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz
 
+chmod -x python/tests/*.py
+chmod -x doc/*.py
+
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -324,6 +327,9 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz
 
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9.10-4
+- fixed dependency.
+
 * Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9.10-3
 - rebuilt with python-3.8.
 

+ 47 - 16
n/newt/newt-vl.spec

@@ -5,9 +5,13 @@ Summary: A development library for text mode user interfaces.
 Summary(ja): テキストモードインターフェースのための開発ライブラリ
 Name: newt
 Version: 0.52.21
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 License: LGPLv2
-Group: System Environment/Libraries
 URL: https://pagure.io/newt
 Source: https://pagure.io/releases/newt/newt-%{version}.tar.gz
 
@@ -18,19 +22,16 @@ Patch1: newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch
 Patch10: newt-python_memory_allocation.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: python3-devel, popt-devel, slang-devel
+BuildRequires: popt-devel, slang-devel
+BuildRequires: python-rpm-macros
+BuildRequires: python3-devel
 BuildRequires: python3-rpm-macros
 %if %{with python2}
 BuildRequires: python-devel
-BuildRequires: python-rpm-macros
+BuildRequires: python2-rpm-macros
 %endif
 Provides: snack = %{version}-%{release}
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
-
 %description
 Newt is a programming library for color text mode, widget based user
 interfaces.  Newt can be used to add stacked windows, entry widgets,
@@ -44,8 +45,8 @@ slang library.
 %package devel
 Summary: Newt windowing toolkit development files.
 Summary(ja): Newt ウィンドウツールキット開発ファイル集
+Group: programming
 Requires: slang-devel %{name} = %{version}
-Group: Development/Libraries
 
 
 %description devel
@@ -58,13 +59,31 @@ Install newt-devel if you want to develop applications which will use
 newt.
 
 
+%if %{with python2}
+%package -n python-newt
+Summary: Python 2 bindings for newt
+Group: programming
+%{?python_provide:%python_provide python-newt}
+# Remove before F30
+Provides: %{name}-python = %{version}-%{release}
+Provides: %{name}-python%{?_isa} = %{version}-%{release}
+Provides: snack = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description -n python-newt
+The python-newt package contains the Python 2 bindings for the newt library
+providing a python API for creating text mode interfaces.
+%endif
+
+
 %package -n python3-newt
+Summary: Python 3 bindings for newt
+Group: programming
 %{?python_provide:%python_provide python3-newt}
 # Remove before F30
 Provides: %{name}-python3 = %{version}-%{release}
 Provides: %{name}-python3%{?_isa} = %{version}-%{release}
 Provides: snack = %{version}-%{release}
-Summary: Python 3 bindings for newt
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description -n python3-newt
@@ -75,7 +94,7 @@ providing a python API for creating text mode interfaces.
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary: A development library for text mode user interfaces.
-Group: System Environment/Libraries
+Group: system
 %description -n compat32-%{name}
 Newt is a programming library for color text mode, widget based user
 interfaces.  Newt can be used to add stacked windows, entry widgets,
@@ -85,9 +104,10 @@ shared library needed by programs built with newt, as well as a
 /usr/bin/dialog replacement called whiptail.  Newt is based on the
 slang library.
 
+
 %package -n compat32-%{name}-devel
 Summary: Newt windowing toolkit development files.
-Group: Development/Libraries
+Group: programming
 Requires: compat32-%{name} = %{version}
 %description -n compat32-%{name}-devel
 The newt-devel package contains the header files and libraries
@@ -104,6 +124,7 @@ newt.
 %patch1 -p1 -b .fix-wstrlen-for-non-utf8-strings
 %patch10 -p1 -b .python_memory_allocation
 
+
 %build
 SLANG_CFLAGS=$(pkg-config --cflags slang)
 export CFLAGS="%{optflags} $SLANG_CFLAGS"
@@ -126,8 +147,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 %find_lang %{name}
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %if %{build_compat32}
@@ -135,17 +156,17 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %postun -n compat32-%{name} -p /sbin/ldconfig
 %endif
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files -f %{name}.lang
 %defattr (-,root,root)
 %license COPYING
 %doc AUTHORS CHANGES README
 %{_libdir}/libnewt.so.*
 %{_bindir}/whiptail
-%{python_sitearch}/*.py*
-%{python_sitearch}/*.so
 %{_mandir}/man1/whiptail.1*
 
 %files devel
@@ -156,6 +177,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libnewt.so
 %{_libdir}/pkgconfig/libnewt.pc
 
+%if %{with python2}
+%files -n python-newt
+%{python2_sitearch}/*.py*
+%{python2_sitearch}/*.so
+%endif
+
 %files -n python3-newt
 %doc peanuts.py popcorn.py
 %{python3_sitearch}/*.so
@@ -174,6 +201,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.52.21-2
+- rebuilt with python-3.8.
+- moved python2 bindings to "python-newt".
+
 * Sun Sep 15 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.52.21-1
 - updated to 0.52.21.
 - added python3 support.

+ 5 - 2
p/python-docutils/python-docutils-vl.spec

@@ -6,7 +6,7 @@ Summary: an open-source text processing system written in Python
 Summary(ja): Pythonで書かれたテキスト処理システム
 Name: python-%{srcname}
 Version: 0.16
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -103,8 +103,8 @@ rm test/test_writers/test_odt.py
 
 
 %build
-%py3_build
 %py2_build
+%py3_build
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
@@ -197,6 +197,9 @@ fi
 
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.16-2
+- fixed dependency.
+
 * Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.16-1
 - new upstream release.
 

+ 8 - 5
p/python-inotify/python-inotify-vl.spec

@@ -4,7 +4,7 @@
 Summary:       Monitor filesystem events with Python under Linux
 Name:          python-inotify
 Version:       0.9.6
-Release:       2%{?_dist_release}
+Release:       3%{?_dist_release}
 Group:         programming
 Vendor:        Project Vine
 Distribution:  Vine Linux
@@ -76,6 +76,10 @@ popd
 %install
 %{__rm} -rf %{buildroot}
 
+%py2_install
+%{__install} -D -m 0755 -p %{SOURCE1} %{buildroot}%{_bindir}/python2-%{oname}
+%{__chmod} 0755 %{buildroot}%{python_sitelib}/%{oname}.py
+
 %if 0%{?with_python3}
 pushd %{py3dir}
 %py3_install
@@ -86,10 +90,6 @@ ln -sf python3-%{oname} %{buildroot}%{_bindir}/%{oname}
 %{__chmod} 0755 %{buildroot}%{python3_sitelib}/%{oname}.py
 %endif
 
-%py2_install
-%{__install} -D -m 0755 -p %{SOURCE1} %{buildroot}%{_bindir}/python2-%{oname}
-%{__chmod} 0755 %{buildroot}%{python_sitelib}/%{oname}.py
-
 # examples
 %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{oname}
 %{__cp} -a python2/examples/* %{buildroot}%{_datadir}/%{oname}
@@ -123,6 +123,9 @@ ln -sf python3-%{oname} %{buildroot}%{_bindir}/%{oname}
 
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.6-3
+- fixed dependency.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.6-2
 - rebuilt with python-3.8.
 

+ 9 - 2
p/python-lxml/python-lxml-vl.spec

@@ -2,9 +2,9 @@
 Summary: lxml is a Pythonic binding for the libxml2 and libxslt libraries
 Summary(ja): lxml は libxml2 と libxslt の Python バインディングです
 Name: python-%{_lxml}
-Group: programming
 Version: 4.5.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -21,6 +21,7 @@ BuildRequires: python-rpm-macros
 BuildRequires: python-devel >= 2.3
 BuildRequires: python2-rpm-macros
 BuildRequires: python-pyrex
+Requires: python(abi) = %{python_version}
 
 BuildRequires: python3-devel
 BuildRequires: python3-rpm-macros
@@ -37,6 +38,7 @@ information about background and goals.
 Summary: lxml is a Pythonic binding for the libxml2 and libxslt libraries
 Summary(ja): lxml は libxml2 と libxslt の Python バインディングです
 Group: programming
+Requires: python(abi) = %{python3_version}
 
 %description -n python3-lxml
 lxml is a Pythonic binding for the libxml2_ and libxslt_ libraries.  It is
@@ -60,6 +62,8 @@ rm -rf $RPM_BUILD_ROOT
 %py2_install
 %py3_install
 
+find doc/ -type f | xargs chmod -x
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.5.2-2
+- fixed dependency.
+
 * Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.5.2-1
 - new upstream release.
 

+ 24 - 15
p/python-pykf/python-pykf-vl.spec

@@ -1,50 +1,59 @@
-%define python_platlib %(python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)') 
+Summary: Python kanji-code module
+Summary(ja): Python 漢字コード変換モジュール
 Name: python-pykf
 Version: 0.3.4
-Release: 7%{?_dist_release}
+Release: 8%{?_dist_release}
+Group: programming
+Distribution: Vine Linux
+Vendor: Project Vine
+Packager: owa
+
 License: BSD like
 URL: http://www.gembook.jp/tsum/page.pys?wiki=PyKf
 Source0: http://www.gembook.jp/html/download/pykf-%{version}.tgz
 BuildRequires: python-devel
+BuildRequires: python-setuptools
+BuildRequires: python-rpm-macros
+BuildRequires: python2-rpm-macros
 BuildRequires: nkf
 Requires(pre): nkf
 Requires: python >= 2.3
-Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Distribution: Vine Linux
-Vendor: Project Vine
-Packager: owa
-
-#----------------------------------------------------------------------
-Summary: Python kanji-code module
-Summary(ja): Python 漢字コード変換モジュール
-Group: Development/Libraries
 
 %description
 pykf is a japanese code exchange filter for python.
 %description -l ja
 pykf は ShiftJIS, EUC-JP, JISコードを相互に変換するためのモジュールです.
 
+
 %prep
 %setup -n pykf-%{version}
 nkf -e readme.sjis > readme.euc
 
+
 %build
-python setup.py build
+%py2_build
+
 
 %install
-python setup.py install --root=$RPM_BUILD_ROOT
+%py2_install
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root)
-%{python_platlib}/*.so
-%{python_platlib}/*.egg-info
+%{python2_sitearch}/*.so
+%{python2_sitearch}/*.egg-info
 %doc readme.euc
 
+
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.3.4-8
+- rebuilt with current environment.
+
 * Sun Jan 12 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.3.4-7
 - rebuild with VineSeed environment
 

+ 30 - 12
p/python/python-vl.spec

@@ -11,12 +11,14 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向言語 Python インタプリタ
 Name: python
-Version: %{pybasever}.17
+Version: %{pybasever}.18
 Release: 1%{?_dist_release}
+Group: programming
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: PSF
-Group: Development/Languages
 URL: https://www.python.org/%{pybasever}/
-
 Source0: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
 Source1: https://docs.python.org/2/archives/python-%{version}-docs-html.tar.bz2
 Source2: https://python-doc-ja.googlecode.com/files/python-doc-%{pybasever}ja1-html.zip
@@ -55,6 +57,13 @@ Patch107: python-2.7-lib64-test_install.patch
 
 Patch200: python-2.7-recvfrom_into_buffer_overflow_2.7.patch
 
+# 00351 #
+# Avoid infinite loop when reading specially crafted TAR files using the tarfile module
+# (CVE-2019-20907).
+# See: https://bugs.python.org/issue39017
+Patch351: 00351-cve-2019-20907-fix-infinite-loop-in-tarfile.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: python2 
 Obsoletes: python27 < %{version}-%{release}
 Provides: python27
@@ -88,11 +97,7 @@ BuildRequires: tix
 BuildRequires: findutils
 BuildRequires: pkgconfig
 BuildRequires: nkf
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-Vendor: Project Vine
-Distribution: Vine Linux
-
+BuildRequires: git
 
 %description
 Python is an interpreted, interactive, object-oriented programming
@@ -111,10 +116,11 @@ set for Tk and RPM.
 Note that documentation for Python is provided in the python-docs
 package.
 
+
 %package devel
 Summary: The libraries and header files needed for Python development.
 Summary(ja): Python での開発に必要なライブラリやヘッダファイル
-Group: Development/Libraries
+Group: programming
 Obsoletes: python2-devel
 Obsoletes: python27-devel < %{version}-%{release}
 
@@ -129,10 +135,11 @@ python package will also need to be installed.  You'll probably also
 want to install the python-docs package, which contains Python
 documentation.
 
+
 %package tools
 Summary: A collection of development tools included with Python.
 Summary(ja): Python に含まれる開発ツール一式
-Group: Development/Tools
+Group: programming
 Requires: %{name} = %{version}
 Requires: tkinter = %{version}
 Obsoletes: python2-tools
@@ -147,10 +154,11 @@ Install python-tools if you want to use these tools to develop
 Python programs.  You will also need to install the python and
 tkinter packages.
 
+
 %package docs
 Summary: Documentation for the Python programming language.
 Summary(ja): Python プログラミング言語のドキュメント
-Group: Applications/Documentation
+Group: documentation
 Obsoletes: python2-docs
 Obsoletes: python27-docs < %{version}-%{release}
 
@@ -163,10 +171,11 @@ Install the python-docs package if you'd like to use the documentation
 for the Python language.
 #'
 
+
 %package -n tkinter
 Summary: A graphical user interface for the Python scripting language.
 Summary(ja): Python スクリプト言語のグラフィカルインターフェイス
-Group: Development/Languages
+Group: programming
 Obsoletes: tkinter2
 Requires: %{name} = %{version}-%{release}
 Requires: tix
@@ -182,6 +191,9 @@ user interface for Python programming.
 #'
 
 
+%debug_package
+
+
 %prep
 %setup -q -n Python-%{version} -a 1
 %patch0 -p1 -b .Setup
@@ -219,6 +231,8 @@ user interface for Python programming.
 %endif
 
 %patch200 -p1 -b .CVE-2014-1912
+# Patch 351 adds binary file for testing. We need to apply it using Git.
+git apply %{PATCH351}
 
 ## shm module
 cp %{SOURCE6} Modules
@@ -479,6 +493,10 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.7.18-1
+- new upstream release.
+- imported Patch351 from rawhide to fix CVE-2019-20907.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.7.17-1
 - new upstream release.
 

+ 11 - 10
r/rhpxl/rhpxl-vl.spec

@@ -1,28 +1,26 @@
 Summary: Python library for configuring and running X
 Summary(ja): X の設定と実行のための Python ライブラリ
 Name: rhpxl
-URL: http://fedoraproject.org/wiki/rhpxl
 Version: 1.9
-Release: 9%{?_dist_release}
+Release: 10%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
 
+License: GPLv2
+URL: http://fedoraproject.org/wiki/rhpxl
 Source0: https://fedorahosted.org/releases/r/h/%{name}/%{name}-%{version}.tar.gz
 Patch10: rhpxl-1.9-pmac.patch
 Patch20: rhpxl-1.9-nokbd.patch
 
-License: GPLv2
-Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel, gettext, libXrandr-devel, libX11-devel
 BuildRequires: libXrender-devel
 ExcludeArch: s390 s390x
-Requires: python, rhpl >= 0.216-4, newt, hwdata
+Requires: python, rhpl >= 0.216-4, python-newt, hwdata
 Requires: pyxf86config >= 0.3.31, xorg-x11-server-Xorg
 
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 The rhpxl (pronounced 'rapunzel') package contains a Python library for
 configuring and running X.
@@ -51,6 +49,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/*egg-info
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9-10
+- changed R:newt to R:python-newt.
+
 * Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.9-9
 - rebuild with python-2.7.2
 

+ 13 - 6
r/rrdtool/rrdtool-vl.spec

@@ -4,7 +4,7 @@ Name:		rrdtool
 Summary:	RRDtool - Round Robin Database tool
 Summary(ja):	RRDtool - ラウンドロビンデータベースツール
 Version:	1.7.2
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 Group:		admin-tools,graphics
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -88,6 +88,7 @@ Summary:	Python RRDTool bindings
 Summary(ja):	RRDTool の Python バインディング
 Group:		programming
 Requires:	%{name} = %{version}-%{release}
+Requires:	python(abi) = %{python_version}
 
 %description -n python-rrdtool
 RDTool bindings for python.
@@ -97,10 +98,11 @@ RDTool bindings for python.
 Summary:	Python3 RRDTool bindings
 Summary(ja):	RRDTool の Python3 バインディング
 Group:		programming
-BuildRequires: python3-devel
-BuildRequires: python3-rpm-macros
-BuildRequires: python3-setuptools
+BuildRequires:	python3-devel
+BuildRequires:	python3-rpm-macros
+BuildRequires:	python3-setuptools
 Requires:	%{name} = %{version}-%{release}
+Requires:	python(abi) = %{python3_version}
 
 %description -n python3-rrdtool
 RDTool bindings for python3.
@@ -176,6 +178,8 @@ mv docs_to_be_included/html/RRD*.html docs_perl/html/
 %{__rm} -f ${RPM_BUILD_ROOT}%{perl_archlib}/perllocal.pod
 %{__rm} -f ${RPM_BUILD_ROOT}%{perl_vendorarch}/auto/*/.packlist
 
+chmod -x ${RPM_BUILD_ROOT}%{_datadir}/rrdtool/examples/*.py
+
 %find_lang %{name}
 
 
@@ -231,14 +235,14 @@ mv docs_to_be_included/html/RRD*.html docs_perl/html/
 %files -n python-rrdtool
 %defattr(-,root,root)
 %license bindings/python/COPYING
-%doc bindings/python/AUTHORS bindings/python/README
+%doc bindings/python/README*
 %{python_sitearch}/rrdtool-*-py*.egg-info
 %{python_sitearch}/rrdtool.so
 
 %files -n python3-rrdtool
 %defattr(-,root,root)
 %license bindings/python/COPYING
-%doc bindings/python/AUTHORS bindings/python/README
+%doc bindings/python/README*
 %{python3_sitearch}/rrdtool-*-py*.egg-info
 %{python3_sitearch}/rrdtool.*.so
 %{_datadir}/rrdtool/examples/*.py
@@ -250,6 +254,9 @@ mv docs_to_be_included/html/RRD*.html docs_perl/html/
 
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.2-3
+- fixed dependency.
+
 * Mon Aug 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.2-2
 - rebuilt with python-3.8.
 

+ 12 - 9
s/system-config-date/system-config-date-vl.spec

@@ -1,18 +1,18 @@
 Summary: A graphical interface for modifying system date and time
 Summary(ja): システムの時刻と日付を設定するグラフィカルインタフェース
-
 Name: system-config-date
+Group: admin-tools
 Version: 1.9.61
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
+
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
-ExclusiveOS: Linux
-Group: System Environment/Base
 Source0: %{name}-%{version}.tar.bz2
 Patch100: system-config-date-vine.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
+ExclusiveOS: Linux
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Obsoletes: timetool
 Obsoletes: dateconfig
 Obsoletes: timeconfig
@@ -28,7 +28,7 @@ Requires: gnome-python
 Requires: usermode-gtk
 Requires: chkconfig
 Requires: rhpl
-Requires: newt
+Requires: python-newt
 Requires: yelp
 Requires: python-slip
 Requires(post): hicolor-icon-theme
@@ -77,7 +77,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING
+%license COPYING
 %{_bindir}/system-config-date
 %{_datadir}/system-config-date
 %{_datadir}/applications/system-config-date.desktop
@@ -91,6 +91,9 @@ fi
 %{python_sitelib}/scdate-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.61-3
+- changed R:newt to R:python-newt.
+
 * Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.9.61-2
 - rebuild with python-2.7.2
 
@@ -334,7 +337,7 @@ fi
 * Mon Sep 13 2004 Nils Philippsen <nphilipp@redhat.com>
 - get widget sensitivity correct on startup (#132431)
 
-* Thu Sep 03 2004 Nils Philippsen <nphilipp@redhat.com> 1.7.5-1
+* Fri Sep 03 2004 Nils Philippsen <nphilipp@redhat.com> 1.7.5-1
 - actually display time zone map (#131641)
 - put NTP stuff into own tab to better accommodate firstboot (#131314)
 - add accelerators to Date & Time tab
@@ -698,7 +701,7 @@ fi
 - added i18n stuff
 * Wed Jul 04 2001 Karsten Hopp <karsten@redhat.de>
 - fix install-path (INSTROOT)
-* Tue Jun 27 2001 Tammy Fox <tfox@redhat.com>
+* Wed Jun 27 2001 Tammy Fox <tfox@redhat.com>
 - added help and help button
 * Sun Jun 24 2001 Brent Fox <bfox@redhat.com>
 - got starting and stopping of ntpd working

+ 12 - 10
s/system-config-network/system-config-network-vl.spec

@@ -3,11 +3,14 @@ Summary: The GUI of the Network Adminstration Tool
 Summary(ja): ネットワーク管理ツール(GUI)
 Name: system-config-network
 Version: 1.6.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: admin-tools
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 URL: http://fedoraproject.org/wiki/SystemConfig/network
 License: GPLv2+
-Group: Applications/System 
-
 Source0: %{name}-%{version}.tar.bz2
 Source1: %{name}-ja-help-image.tar.bz2
 Patch0: %{name}-1.5.97-fix-crash-on-saving.patch
@@ -21,10 +24,6 @@ Requires: %{name}-tui = %{version}-%{release}
 Requires: pygtk2-libglade, pygtk2, gnome-python, usermode-gtk, xdg-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 This is the GUI of the network configuration tool,
 supporting Ethernet, Wireless, TokenRing, ADSL, ISDN and PPP.
@@ -32,8 +31,8 @@ supporting Ethernet, Wireless, TokenRing, ADSL, ISDN and PPP.
 %package tui
 Summary: The Network Adminstration Tool
 Summary(ja): ネットワーク管理ツール
-Group: Applications/System 
-Requires: initscripts >= 8.80.0, usermode , python, rpm-python, newt
+Group: admin-tools
+Requires: initscripts >= 8.80.0, usermode , python, rpm-python, python-newt
 Requires: pciutils, dbus-python
 Requires: python-ethtool, python-iwlib
 
@@ -48,7 +47,7 @@ supporting Ethernet, Wireless, TokenRing, ADSL, ISDN and PPP.
 %patch2 -p1
 
 %build
-autoreconf
+autoreconf -fiv
 %configure
 
 %install
@@ -115,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/system-config-network-cmd
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.2-2
+- changed R:newt to R:python-newt.
+
 * Sat Apr 23 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.6.2-1
 - update to 1.6.2
 - remove R: rhpl, kudzu