updated 4 packages

NetworkManager-1.20.2-1

newt-0.52.21-1

popt-1.16-3

slang-2.3.2-1

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

N/NetworkManager/NetworkManager-vl.spec

@@ -10,18 +10,17 @@
 %define ppp_version 2.4.7
 %define mm_version 1.10.4
 
-%global major_minor 1.20
-
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
-Version: %{major_minor}.0
+Version: 1.20.2
 Release: 1%{?snapshot}%{?_dist_release}
 Group: System Environment/Base
 License: GPLv2+
-URL: http://www.gnome.org/projects/NetworkManager/
+URL: https://www.gnome.org/projects/NetworkManager/
 
-Source: https://download.gnome.org/sources/NetworkManager/%{major_minor}/%{name}-%{version}.tar.xz
+%global shortver %(echo "%{version}" | sed -e 's/\.[0-9]*$//')
+Source: https://download.gnome.org/sources/NetworkManager/%{shortver}/%{name}-%{version}.tar.xz
 Source2: nm-system-settings.conf
 
 Source1000: NetworkManager.init
@@ -154,6 +153,20 @@ NetworkManager functionality from applications.  This is the new NetworkManager
 See also NetworkManager-glib-devel.
 
 
+%package tui
+Summary: NetworkManager curses-based UI
+Summary(ja): cursesベースのNetworkManagerユーザインタフェース
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libnm%{?_isa} = %{version}-%{release}
+BuildRequires: newt-devel
+
+%description tui
+This adds a curses-based "TUI" (Text User Interface) to
+NetworkManager, to allow performing some of the operations supported
+by nm-connection-editor and nm-applet in a non-graphical environment.
+
+
 %prep
 %setup -q
 
@@ -286,6 +299,7 @@ done
 %{_libdir}/NetworkManager/%{version}-%{release}
 %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
 %{_mandir}/man1/*
+%exclude %{_mandir}/man1/nmtui*
 %{_mandir}/man5/*
 %{_mandir}/man7/*
 %{_mandir}/man8/*
@@ -355,8 +369,19 @@ done
 %dir %{_datadir}/gtk-doc/html/libnm
 %{_datadir}/gtk-doc/html/libnm/*
 
+%files tui
+%{_bindir}/nmtui
+%{_bindir}/nmtui-edit
+%{_bindir}/nmtui-connect
+%{_bindir}/nmtui-hostname
+%{_mandir}/man1/nmtui*
+
 
 %changelog
+* Sun Sep 15 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.2-1
+- new upstream release.
+- added nmtui*.
+
 * Sun Sep 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.0-1
 - new upstream release.
 - dropped the subpackages devel, glib and glib-devel: deprecated in upstream.

n/newt/newt-vl.spec

@@ -1,16 +1,16 @@
+%bcond_without python2
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: A development library for text mode user interfaces.
 Summary(ja): テキストモードインターフェースのための開発ライブラリ
 Name: newt
-Version: 0.52.17
+Version: 0.52.21
 Release: 1%{?_dist_release}
-License: LGPL
+License: LGPLv2
 Group: System Environment/Libraries
-URL: https://fedorahosted.org/newt/
+URL: https://pagure.io/newt
+Source: https://pagure.io/releases/newt/newt-%{version}.tar.gz
 
-Source: https://fedorahosted.org/releases/n/e/newt/newt-%{version}.tar.gz
 # patches from mdv
 Patch1: newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch
 
@@ -18,7 +18,12 @@ Patch1: newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch
 Patch10: newt-python_memory_allocation.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: python-devel, popt-devel, slang-devel
+BuildRequires: python3-devel, popt-devel, slang-devel
+BuildRequires: python3-rpm-macros
+%if %{with python2}
+BuildRequires: python-devel
+BuildRequires: python-rpm-macros
+%endif
 Provides: snack = %{version}-%{release}
 
 Vendor: Project Vine
@@ -53,6 +58,20 @@ Install newt-devel if you want to develop applications which will use
 newt.
 
 
+%package -n python3-newt
+%{?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
+The python3-newt package contains the Python 3 bindings for the newt library
+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.
@@ -86,21 +105,24 @@ newt.
 %patch10 -p1 -b .python_memory_allocation
 
 %build
+SLANG_CFLAGS=$(pkg-config --cflags slang)
+export CFLAGS="%{optflags} $SLANG_CFLAGS"
+
 %if %{build_compat32}
 export CC='gcc -m32'
 %configure --without-tcl
-make CC='gcc -m32'
+make %{?_smp_mflags} CC='gcc -m32'
 #make CC='gcc -m32' shared
 %else
 %configure --without-tcl
-make
+make %{?_smp_mflags} all
-make shared
+#make shared
 %endif
 chmod 0644 peanuts.py popcorn.py
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make instroot=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %find_lang %{name}
 
@@ -118,7 +140,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr (-,root,root)
-%doc CHANGES COPYING
+%license COPYING
+%doc AUTHORS CHANGES README
 %{_libdir}/libnewt.so.*
 %{_bindir}/whiptail
 %{python_sitearch}/*.py*
@@ -133,6 +156,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libnewt.so
 %{_libdir}/pkgconfig/libnewt.pc
 
+%files -n python3-newt
+%doc peanuts.py popcorn.py
+%{python3_sitearch}/*.so
+%{python3_sitearch}/*.py*
+
 %if %{build_compat32}
 %files -n compat32-%{name}
 %defattr (-,root,root)
@@ -146,6 +174,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 15 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.52.21-1
+- updated to 0.52.21.
+- added python3 support.
+
 * Tue Jul 15 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 0.52.17-1
 - update to 0.52.17
 

p/popt/popt-vl.spec

@@ -3,12 +3,18 @@ Summary:	C library for parsing command line parameters
 Summary(ja):    コマンドラインパラメータを文法解析するためのCライブラリ
 Name:		popt
 Version:	1.16
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 License:	MIT
 Group:		System Environment/Libraries
 URL:		http://www.rpm5.org/
 Source0:	http://www.rpm5.org/files/%{name}/%{name}-%{version}.tar.gz
-BuildRequires:	gettext, doxygen, graphviz
+Patch0:		popt-1.16-pkgconfig.patch
+Patch1:		popt-1.16-execfail.patch
+Patch2:		popt-1.16-man-page.patch
+Patch3:		popt-1.16-help.patch
+Patch4:		popt-1.16-nextarg-memleak.patch
+Patch5:		popt-1.16-glob-error.patch
+BuildRequires:	gettext
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 Vendor: Project Vine
@@ -96,17 +102,16 @@ for developing programs which use the popt C library. It contains the
 API documentation of the popt library, too.
 
 %prep
-%setup -q
+%autosetup
 sed -i "s|libdir=@libdir@|libdir=@prefix@@libdir@|" popt.pc.in
 %ifarch x86_64
-sed -i "s|/lib/pkgconfig|/lib64/pkgconfig|" Makefile.am
+#sed -i "s|/lib/pkgconfig|/lib64/pkgconfig|" Makefile.am
-sed -i "s|/lib/pkgconfig|/lib64/pkgconfig|" Makefile.in
+#sed -i "s|/lib/pkgconfig|/lib64/pkgconfig|" Makefile.in
 %endif
 
 %build
 %configure --libdir=/%{_lib}
 make %{?_smp_mflags}
-doxygen
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -120,11 +125,16 @@ ln -sf ../../%{_lib}/$(ls libpopt.so.?.?.?) $RPM_BUILD_ROOT%{_libdir}/libpopt.so
 popd
 mv -f $RPM_BUILD_ROOT/%{_lib}/libpopt.a $RPM_BUILD_ROOT%{_libdir}/libpopt.a
 
+mv -f $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir}/
+
 # Multiple popt configurations are possible
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/popt.d
 
 %find_lang %{name}
 
+%check
+make check
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -138,13 +148,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc CHANGES COPYING
+%license COPYING
+%doc CHANGES
 %{_sysconfdir}/popt.d
 /%{_lib}/libpopt.so.*
 
 %files devel
 %defattr(-,root,root)
-%doc README doxygen/html
+%doc README
 %{_libdir}/libpopt.so
 %{_libdir}/pkgconfig/popt.pc
 %{_includedir}/popt.h
@@ -166,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 15 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16-3
+- imported Patch0-5 from rawhide.
+
 * Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.16-2
 - rebuild with VineSeed environment
 

s/slang/slang-vl.spec

@@ -3,21 +3,25 @@
 Summary: The shared library for the S-Lang extension language
 Summary(ja): S-Lang 拡張言語ライブラリ
 Name: slang
-Version: 2.1.4
+Version: 2.3.2
-Release: 5%{?_dist_release}
+Release: 1%{?_dist_release}
 
 License: GPLv2+
 Group: System Environment/Libraries
-URL: http://www.jedsoft.org/slang/
+URL: https://www.jedsoft.org/slang/
 
 Source: ftp://space.mit.edu/pub/davis/slang/v2.1/%{name}-%{version}.tar.bz2
-Patch1: slang-2.1.4-makefile.patch
+
-Patch2: slang-nointerlibc2.patch
+# don't use memcpy() on overlapping buffers
+Patch1:		slang-getkey-memmove.patch
+# disable test that fails with SIGHUP ignored (e.g. in koji)
+Patch2:		slang-sighuptest.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libpng-devel
 BuildRequires: oniguruma-devel
 BuildRequires: pcre-devel
+BuildRequires: zlib-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -115,17 +119,28 @@ based on the S-Lang extension language.
 
 %prep
 %setup -q
-%patch1 -p1 -b .makefile
+%patch1 -p1 -b .getkey-memmove
-%patch2 -p1 -b .nointerlibc2
+%patch2 -p1 -b .sighuptest
+
+# fix permissions of installed modules
+sed -i '/^INSTALL_MODULE=/s/_DATA//' configure
+
+# disable test failing on 32-bit archs
+sed -i '/TEST_SCRIPTS_SLC = /s/array //' src/test/Makefile
 
 %build
-%configure --includedir=%{_includedir}/slang
+%configure \
-make %{?_smp_mflags} install_doc_dir=%{_docdir}/%{name}-%{version}
+	--includedir=%{_includedir}/slang \
+	--with-{pcre,png,z,onig}lib=%{_libdir} \
+	--with-{pcre,png,z,onig}inc=%{_includedir} \
+;
+
+make RPATH="" install_doc_dir=%{_docdir}/%{name}-%{version} all
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-make install-all INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
+make install-all INSTALL="install -p" RPATH="" DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_docdir}/{slang,slsh}
 
 %clean
@@ -158,6 +173,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %doc doc/*/cslang*.txt doc/*/cref.txt
 %{_libdir}/libslang*.so
+%{_libdir}/pkgconfig/slang.pc
 %{_libdir}/libslang*.a
 %{_includedir}/slang
 
@@ -174,6 +190,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Sun Sep 15 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.2-1
+- new upstream release.
+- dropped Patch1 and 2.
+- imported Patch1 and 2 from rawhide.
+
 * Sun Dec 29 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.4-5
 - rebuild with VineSeed environment