updated 11 packages

chrony-3.5.1-2

dnsmasq-2.82-1

epiphany-3.36.4-2

filezilla-3.50.0-1

gnutls-3.6.15-1

libfilezilla-0.24.1-1

nettle-3.6-1

rdesktop-1.9.0-2

tigervnc-1.10.1-2

webkitgtk4-2.28.4-1

wxGTK3-3.0.5-1

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

c/chrony/chrony-vl.spec

@@ -2,9 +2,9 @@
 
 Name:           chrony
 Version:        3.5.1
-Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Release:        2%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        An NTP client/server
-Group:          System Environment/Daemons
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Packager:       tomop
@@ -54,6 +54,9 @@ in permanently connected environments. It can use also hardware reference
 clocks, system real-time clock or manual input as time references.
 
 
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
 %patch2 -p1 -b .service-helper
@@ -202,7 +205,11 @@ fi
 %ghost %attr(-,chrony,chrony) %{_localstatedir}/lib/chrony/rtc
 %dir %attr(-,chrony,chrony) %{_localstatedir}/log/chrony
 
+
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.1-2
+- rebuilt with nettle-3.6.
+
 * Thu Aug 27 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.1-1
 - new upstream release.
 

d/dnsmasq/dnsmasq-vl.spec

@@ -1,11 +1,11 @@
 %bcond_with systemd
 
 Name:           dnsmasq
-Version:        2.81
+Version:        2.82
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        A lightweight DHCP/caching DNS server
 Summary(ja):    軽量 DHCP/DNSキャッシュサーバ
-Group:          System Environment/Daemons
+Group:          servers
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -44,6 +44,9 @@ static and dynamic DHCP leases and BOOTP for network booting of diskless
 machines.
 
 
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{version}
 %if !%{with systemd}
@@ -128,6 +131,7 @@ install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre
 %if %{with systemd}
 #precreate users so that rpm can install files owned by that user
@@ -206,7 +210,11 @@ fi
 %{_bindir}/dhcp_*
 %{_mandir}/man1/dhcp_*
 
+
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.82-1
+- new upstream release.
+
 * Sat May 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.81-1
 - new upstream release.
 - added systemd support (disabled as default).

e/epiphany/epiphany-vl.spec

@@ -6,7 +6,7 @@ Summary: GNOME web browser based on WebKit
 Summary(ja): WebKit レンダリングエンジンベースの GNOME ウェブブラウザ
 Name: epiphany
 Version: 3.36.4
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: internet,desktop-gnome
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -58,6 +58,9 @@ epiphany は WebKit レンダリングエンジンベースのシンプルな GN
 ウェブブラウザです。
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
@@ -111,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.4-2
+- rebuilt with nettle-3.6.
+
 * Sat Aug 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.4-1
 - new upstream release.
 

f/filezilla/filezilla-vl.spec

@@ -1,13 +1,16 @@
-Name:           filezilla
-Version:        3.45.1
-Release:        1%{?_dist_release}
 Summary:        FileZilla is a cross-platform graphical FTP, FTPS and SFTP client
 Summary(ja):    FileZilla - クロスプラットフォームのグラフィカルな FTP/FTPS/SFTP クライアント
+Name:           filezilla
+Version:        3.50.0
+Release:        1%{?_dist_release}
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Group:          Applications/Internet
+Group:          internet
 License:        GPLv2+
-URL:            http://filezilla-project.org/
-Source0:        http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2
+URL:            https://filezilla-project.org/
+Source0:        https://download.filezilla-project.org/client/FileZilla_%{version}_src.tar.bz2
+
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
 
 ## Needed if autogen.sh is invoked
@@ -32,7 +35,6 @@ BuildRequires:  sqlite3-devel >= 3.7
 
 Requires:  xdg-utils
 
-
 %description
 FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features.
 - Supports FTP, FTP over SSL/TLS (FTPS) and SSH File Transfer Protocol (SFTP)
@@ -58,6 +60,10 @@ FileZilla は多くの機能を備えた Linux のための FTP/FTPS/SFTP クラ
 - ファイルネームフィルタ
 - ネットワーク設定ウィザード
 
+
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -103,9 +109,11 @@ desktop-file-install --vendor "vine" \
 
 %find_lang %{name}
 
+
 %check
 make check
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -137,6 +145,9 @@ fi || :
 
 
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.50.0-1
+- new upstream release.
+
 * Sat Oct 12 2019 Toshiaki Ara <ara_t@384.jp> - 3.45.1-1
 - new upstream release
 

g/gnutls/gnutls-vl.spec

@@ -6,13 +6,13 @@
 Summary:	GNU TLS Library
 Summary(ja):	GNU TLS ライブラリ
 Name:		gnutls
-Version:	3.6.14
+Version:	3.6.15
 Release:	1%{?_dist_release}
-# The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
-Group:		System Environment/Libraries
+Group:		system
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
+# The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License:	GPLv3+ and LGPLv2+
 URL:		https://www.gnutls.org/
 %global		shortver %(echo "%{version}" | sed -e 's/\.[0-9]*$//')
@@ -30,19 +30,19 @@ Patch2:	gnutls-3.6.7-no-now-guile.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	libtasn1-devel >= 4.13
-Requires:		libtasn1 >= 4.13
+Requires:	libtasn1 >= 4.13
 BuildRequires:	libunistring-devel
 BuildRequires:	datefudge >= 1.22
 BuildRequires:	gmp-devel
 BuildRequires:	gettext readline-devel libtool
 BuildRequires:	guile-devel >= 1.8.6
 BuildRequires:	p11-kit-devel >= 0.21.3
-BuildRequires:	nettle-devel >= 3.4
-Requires:		nettle >= 3.4
+BuildRequires:	nettle-devel >= 3.6
+Requires:	nettle >= 3.6
 BuildRequires:	texinfo, autogen
 BuildRequires:	unbound-devel unbound-libs
 BuildRequires:	zlib-devel
-Requires:		zlib
+Requires:	zlib
 # for tests
 BuildRequires:	net-tools
 
@@ -55,10 +55,11 @@ layer, over a reliable transport layer. Currently the GnuTLS library implements
 the proposed standards by the IETF's TLS working group.
 #'
 
+
 %package devel
 Summary:	Development files for the GnuTLS package.
 Summary(ja):	GnuTLS の開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 Requires:	libgcrypt-devel, zlib-devel, pkgconfig
 Requires:	libtasn1-devel, nettle-devel
@@ -75,10 +76,11 @@ This package contains files needed for developing applications with the GnuTLS
 library.
 #'
 
+
 %package utils
 Summary:	Command line tools for TLS protocol.
 Summary(ja):	GnuTLS のコマンドラインツール
-Group:		Applications/System
+Group:		system
 Requires:	%{name} = %{version}-%{release}
 
 %description utils
@@ -90,9 +92,10 @@ This package contains command line TLS client and server and certificate
 manipulation tools.
 #'
 
+
 %package guile
 Summary: Guile bindings for the GNUTLS library
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: guile
 
@@ -103,9 +106,10 @@ the proposed standards by the IETF's TLS working group.
 This package contains Guile bindings for the library.
 #'
 
+
 %package c++
 Summary: The C++ interface to GnuTLS
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description c++
@@ -115,10 +119,11 @@ the proposed standards by the IETF's TLS working group.
 This package contains the C++ interface for the GnuTLS library.
 #'
 
+
 %package -n compat32-%{name}
 Summary:	GNU TLS Library
 Summary(ja):	GNU TLS ライブラリ
-Group:		System Environment/Libraries
+Group:		system
 Requires:	%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -127,10 +132,11 @@ layer, over a reliable transport layer. Currently the GnuTLS library implements
 the proposed standards by the IETF's TLS working group.
 #'
 
+
 %package -n compat32-%{name}-devel
 Summary:	Development files for the GnuTLS package.
 Summary(ja):	GnuTLS の開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	compat32-%{name} = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	compat32-libgcrypt-devel, compat32-zlib-devel
@@ -145,9 +151,10 @@ This package contains files needed for developing applications with the GnuTLS
 library.
 #'
 
+
 %package -n compat32-%{name}-guile
 Summary: Guile bindings for the GNUTLS library
-Group: Development/Libraries
+Group: system
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-guile = %{version}-%{release}
 
@@ -158,6 +165,10 @@ the proposed standards by the IETF's TLS working group.
 This package contains Guile bindings for the library.
 #'
 
+
+%debug_package
+
+
 %prep
 %autosetup -p1
 
@@ -167,6 +178,7 @@ rm -f src/libopts/*.c src/libopts/*.h src/libopts/compat/*.c src/libopts/compat/
 
 echo "SYSTEM=NORMAL" >> tests/system.prio
 
+
 %build
 export LDFLAGS="-Wl,--no-add-needed"
 # autoreconf -fi
@@ -190,6 +202,7 @@ export LDFLAGS="-Wl,--no-add-needed"
 make %{?_smp_mflags}
 # cp lib/COPYING COPYING.LIB
 
+
 %install
 %__rm -rf %{buildroot}
 # makeinstall macro causes build error, why?
@@ -205,14 +218,16 @@ rm -rf %{buildroot}%{_docdir}/gnutls
 
 %find_lang gnutls
 
+
 %check
 make check %{?_smp_mflags}
 
+
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %post devel
@@ -226,17 +241,15 @@ if [ $1 = 0 -a -f %{_infodir}/gnutls.info.gz ]; then
 fi
 
 %post guile -p /sbin/ldconfig
-
 %postun guile -p /sbin/ldconfig
 
 %post -n compat32-%{name} -p /sbin/ldconfig
-
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
 %post -n compat32-%{name}-guile -p /sbin/ldconfig
-
 %postun -n compat32-%{name}-guile -p /sbin/ldconfig
 
+
 %files -f gnutls.lang
 %defattr(-,root,root,-)
 %{_libdir}/libgnutls.so.30*
@@ -287,7 +300,6 @@ fi
 %defattr(-,root,root,-)
 #%{_libdir}/libgnutls*.a
 %{_libdir}/libgnutls*.so
-%{_libdir}/pkgconfig/*.pc
 
 %files -n compat32-%{name}-guile
 %defattr(-,root,root,-)
@@ -296,7 +308,11 @@ fi
 %{_libdir}/guile/%{guile_shortver}/site-ccache/gnutls/extra.go
 %endif
 
+
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.15-1
+- new upstream release.
+
 * Thu Jun 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.14-1
 - new upstream release.
 

lib/libf/libfilezilla/libfilezilla-vl.spec

@@ -1,46 +1,61 @@
+Summary: C++ Library for FileZilla
 Name: libfilezilla
-Version: 0.18.2
+Version: 0.24.1
 Release: 1%{?_dist_release}
-URL: http://lib.filezilla-project.org/
-Summary: C++ Library for FileZilla
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPLv2+
-Source0: http://download.sourceforge.net/sourceforge/filezilla/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+URL: https://lib.filezilla-project.org/
+Source0: https://download.filezilla-project.org/%{name}/%{name}-%{version}.tar.bz2
 
-BuildRequires: nettle-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: gettext
 BuildRequires: gnutls-devel
-
-%package devel
-Summary: Development files for C++ Library for FileZilla
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
+BuildRequires: nettle-devel
 
 %description
 libfilezilla is a small and modern C++ library, offering some basic
 functionality to build high-performing, platform-independent programs.
 
+
+%package devel
+Summary: Development files for C++ Library for FileZilla
+Group: programming
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
 %description devel
 libfilezilla is a small and modern C++ library, offering some basic
 functionality to build high-performing, platform-independent programs.
 
 This package contains files needed to compile code using libfilezilla.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
 
+
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%post -p /sbin/ldconfig
+%find_lang %{name}
+
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files
+
+%files -f %{name}.lang
 %license COPYING
 %doc AUTHORS ChangeLog NEWS README
 %{_libdir}/*.so.*
@@ -51,7 +66,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_includedir}/*
 %{_libdir}/pkgconfig/libfilezilla.pc
 
+
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.24.1-1
+- new upstream release.
+
 * Sat Oct 12 2019 Toshiaki Ara <ara_t@384.jp> - 0.18.2-1
 - new upstream release
 - add BuildRequires: nettle-devel

n/nettle/nettle-vl.spec

@@ -1,72 +1,69 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-Name:           nettle
-Version:        3.4.1
-Release:        1%{?_dist_release}
 Summary:        A low-level cryptographic library
 Summary(ja):    低レベル暗号化ライブラリ
+Name:           nettle
+Version:        3.6
+Release:        1%{?_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Group:          System Environment/Libraries
-License:        LGPLv2+
+License:        LGPLv3+ or GPLv2+
 URL:            http://www.lysator.liu.se/~nisse/nettle/
 Source0:        http://www.lysator.liu.se/~nisse/archive/%{name}-%{version}.tar.gz
+Patch0:         nettle-3.4-annocheck.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  gettext-devel
 BuildRequires:  gmp-devel
 BuildRequires:  m4
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
+%description
+Nettle is a cryptographic library that is designed to fit easily in more
+or less any context: In crypto toolkits for object-oriented languages
+(C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in
+kernel space.
+
 
 %package devel
 Summary:        Development headers for a low-level cryptographic library
 Summary(ja):    低レベル暗号化ライブラリの開発ヘッダ
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       gmp-devel
 
-#%package static
-#Summary:        Static libraries for a low-level cryptographic library
-#Group:          Development/Libraries
-#Requires:       %{name}-devel = %{version}-%{release}
+%description devel
+Nettle is a cryptographic library that is designed to fit easily in more
+or less any context: In crypto toolkits for object-oriented languages
+(C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in
+kernel space.  This package contains kernel headers.
+
 
 %if %{build_compat32}
 %package -n compat32-%{name}
 Summary:        A low-level cryptographic library
 Summary(ja):    低レベル暗号化ライブラリ
-Group:          System Environment/Libraries
+Group:          system
 Requires:	%{name} = %{version}-%{release}
 
-%package -n compat32-%{name}-devel
-Summary:        Development headers for a low-level cryptographic library
-Summary(ja):    低レベル暗号化ライブラリの開発ヘッダ
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       compat32-%{name} = %{version}-%{release}
-Requires:       compat32-gmp-devel
-%endif
-
-%description
+%description -n compat32-%{name}
 Nettle is a cryptographic library that is designed to fit easily in more
 or less any context: In crypto toolkits for object-oriented languages
 (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in
 kernel space.
 
-%description devel
-Nettle is a cryptographic library that is designed to fit easily in more
-or less any context: In crypto toolkits for object-oriented languages
-(C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in
-kernel space.  This package contains kernel headers.
 
-%if %{build_compat32}
-%description -n compat32-%{name}
-Nettle is a cryptographic library that is designed to fit easily in more
-or less any context: In crypto toolkits for object-oriented languages
-(C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in
-kernel space.
+%package -n compat32-%{name}-devel
+Summary:        Development headers for a low-level cryptographic library
+Summary(ja):    低レベル暗号化ライブラリの開発ヘッダ
+Group:          programming
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       compat32-%{name} = %{version}-%{release}
+Requires:       compat32-gmp-devel
 
 %description -n compat32-%{name}-devel
 Nettle is a cryptographic library that is designed to fit easily in more
@@ -75,26 +72,24 @@ or less any context: In crypto toolkits for object-oriented languages
 kernel space.  This package contains compat libraries.
 %endif
 
-#%description static
-#Nettle is a cryptographic library that is designed to fit easily in more
-#or less any context: In crypto toolkits for object-oriented languages
-#(C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in
-#kernel space.  This package contains a static library.
+
+%debug_package
+
 
 %prep
-%setup -q
+%autosetup -p1
+
 
 %build
-%configure --enable-shared
+autoreconf -ifv
+%configure --enable-shared --enable-fat
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 make install-shared DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-#/usr/bin/iconv -f iso8859-1 -t utf-8 README > README.conv && /bin/mv -f README.conv README
-#/usr/bin/iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog
-#/usr/bin/iconv -f iso8859-1 -t utf-8 nettle.info > nettle.info.conv && /bin/mv -f nettle.info.conv nettle.info
 mkdir -p $RPM_BUILD_ROOT%{_infodir}
 install -p -m 644 nettle.info $RPM_BUILD_ROOT%{_infodir}/
 
@@ -104,15 +99,17 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/libnettle.so.*
 rm -rf %{buildroot}/%{_libdir}/*.a
 rm -rf %{buildroot}/%{_infodir}/dir
 
+
 %check
 make check
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
-
 %license COPYING*
 %doc AUTHORS ChangeLog NEWS README TODO
 %{_infodir}/nettle.info.gz
@@ -130,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libhogweed.so
 %{_libdir}/libnettle.so
 %{_includedir}/nettle
-%{_libdir}/pkgconfig/
+%{_libdir}/pkgconfig/*
 
 # compat32
 %if %{build_compat32}
@@ -143,14 +140,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root, 0755)
 %{_libdir}/libhogweed.so
 %{_libdir}/libnettle.so
-%{_libdir}/pkgconfig/
 %endif
 
-#%files static
-#%defattr(-,root,root,-)
-#%doc COPYING
-#%{_libdir}/libhogweed.a
-#%{_libdir}/libnettle.a
 
 %post
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
@@ -165,11 +156,15 @@ fi
 
 %if %{build_compat32}
 %post -n compat32-%{name} -p /sbin/ldconfig
-
 %postun -n compat32-%{name} -p /sbin/ldconfig
 %endif
 
+
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6-1
+- new upstream release.
+- imported Patch0 from rawhide.
+
 * Sun May 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.1-1
 - new upstream release.
 

r/rdesktop/rdesktop-vl.spec

@@ -2,9 +2,8 @@ Summary:        A Remote Desktop Protocol Client
 Summary(ja):    リモートデスクトッププロトコルクライアント
 Name:           rdesktop
 Version:        1.9.0
-Release:        1%{?_dist_release}
-Group:          User Interface/Desktops
-
+Release:        2%{?_dist_release}
+Group:          network
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -12,6 +11,7 @@ License:        GPLv3
 URL:            http://www.rdesktop.org/
 Source0:        https://github.com/rdesktop/rdesktop/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Patch1:         %{name}-libao.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  gnutls-devel
 BuildRequires:  libX11-devel
@@ -38,6 +38,9 @@ rdesktop は Windows NT ターミナルサーバ、Windows 20000 ターミナル
 サーバ拡張は必要ありません。
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %patch1 -p1 -b .ao
@@ -63,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.0-2
+- rebuilt with nettle-3.6.
+
 * Sat Oct 26 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.0-1
 - new upstream release.
 

t/tigervnc/tigervnc-vl.spec

@@ -1,28 +1,36 @@
+%bcond_with systemd
+
 Name:           tigervnc
 Version:        1.10.1
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        A TigerVNC remote display system
-Group:          User Interface/Desktops
-
+Group:          network
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        GPLv2+
 URL:            http://www.tigervnc.com
-
 Source0:        https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        vncserver.service.upstart
 Source2:        vncserver.sysconfig.upstart
 Source3:        10-libvnc.conf
 Source6:        vncviewer.desktop
+Source11:       xvnc.service
+Source12:       xvnc.socket
 
 #[ad-hoc] xorg-x11-server-source: has no hw/xfree86/Xorg.sh.in
 Source1000:     Xorg.sh.in
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+Patch1:         tigervnc-manpages.patch
+Patch2:         tigervnc-getmaster.patch
+Patch3:         tigervnc-shebang.patch
+Patch4:         tigervnc-xstartup.patch
+Patch5:         tigervnc-utilize-system-crypto-policies.patch
+Patch7:         tigervnc-passwd-crash-with-malloc-checks.patch
 
-Provides:	vnc = 4.1.3, vnc-libs = 4.1.3, vnc-server = 4.1.3
-Obsoletes:	vnc < 4.1.3, vnc-libs < 4.1.3, vnc-server < 4.1.3
+Patch1000:      xorg-server-1.20.7-ddxInputThreadInit.patch
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:	libX11-devel, automake, autoconf, libtool, gettext
 BuildRequires:	libXext-devel, xorg-x11-server-source, libXi-devel
@@ -41,18 +49,17 @@ BuildRequires:	fltk-devel >= 1.3.3
 
 Requires(post):	coreutils
 Requires(postun):coreutils
+%if %{with systemd}
+%{?systemd_requires}
+%else
+Requires(post): chkconfig, /sbin/service
+Requires(preun): chkconfig, /sbin/service
+Requires(postun): /sbin/service
+%endif
 
 Requires:	hicolor-icon-theme
-
-Patch1:         tigervnc-manpages.patch
-Patch2:         tigervnc-getmaster.patch
-Patch3:         tigervnc-shebang.patch
-Patch4:         tigervnc-xstartup.patch
-Patch5:         tigervnc-utilize-system-crypto-policies.patch
-Patch7:         tigervnc-passwd-crash-with-malloc-checks.patch
-
-#Patch100:       tigervnc-xserver120.patch
-
+Provides:	vnc = 4.1.3, vnc-libs = 4.1.3, vnc-server = 4.1.3
+Obsoletes:	vnc < 4.1.3, vnc-libs < 4.1.3, vnc-server < 4.1.3
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -62,9 +69,10 @@ from a wide variety of machine architectures.
 This package contains a client which will allow you to connect to 
 other desktops running a VNC server.
 
+
 %package server
 Summary:	A TigerVNC server
-Group:		User Interface/X
+Group:		servers
 Provides:	vnc = 4.1.3, vnc-libs = 4.1.3, vnc-server = 4.1.3
 Obsoletes:	vnc < 4.1.3, vnc-libs < 4.1.3, vnc-server < 4.1.3
 Requires:	perl
@@ -84,6 +92,9 @@ This package includes the following components:
  - x0vncserver program: It can export your active X session
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
@@ -93,8 +104,7 @@ pushd unix/xserver
 for all in `find . -type f -perm -001`; do
 	chmod -x "$all"
 done
-#patch100 -p1 -b .xserver116-rebased
-patch -p1 < ../xserver119.patch
+patch -p1 < ../xserver120.patch
 popd
 
 # Synchronise manpages and --help output (bug #980870).
@@ -110,14 +120,18 @@ popd
 %patch4 -p1 -b .xstartup
 
 # Utilize system-wide crypto policies
-%patch5 -p1 -b .utilize-system-crypto-policies
+#patch5 -p1 -b .utilize-system-crypto-policies
 
 %patch7 -p1 -b .tigervnc-passwd-crash-with-malloc-checks
 
+%patch1000 -p1
+
+
 %build
 #export CFLAGS="$RPM_OPT_FLAGS -fpic"
+export CFLAGS="$RPM_OPT_FLAGS -fpic -I%{_includedir}/libdrm"
+
 #export CXXFLAGS="$CFLAGS"
-export CFLAGS="$RPM_OPT_FLAGS -fpic"
 export CXXFLAGS="$CFLAGS -std=c++11"
 
 %{cmake} .
@@ -160,11 +174,21 @@ pushd unix/xserver/hw/vnc
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vncservers
+
+
+%if %{with systemd}
+mkdir -p %{buildroot}%{_unitdir}
+#make -C unix/vncserver install DESTDIR=%{buildroot}
+# Install systemd unit file
+install -m644 %{SOURCE11} %{buildroot}%{_unitdir}/xvnc@.service
+install -m644 %{SOURCE12} %{buildroot}%{_unitdir}/xvnc.socket
+%else
 # Install init stuff
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/vncserver
-install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vncservers
+%endif
 
 # Install desktop stuff
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps
@@ -188,9 +212,11 @@ rm -f  $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libvnc.la
 mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
 install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-libvnc.conf
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 touch -c %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -204,12 +230,37 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 %post server
+%if %{with systemd}
+%systemd_post xvnc.service
+%systemd_post xvnc.socket
+%else
 /sbin/chkconfig --add vncserver
+%endif
+
+%preun server
+%if %{with systemd}
+%systemd_preun xvnc.service
+%systemd_preun xvnc.socket
+%else
+if [ "$1" = 0 -o -x /bin/systemctl ]; then
+  /sbin/service vncserver stop 2>&1 ||:
+  /sbin/chkconfig --del vncserver 2>&1 ||:
+fi
+%endif
+
+%postun server
+%if %{with systemd}
+%systemd_postun xvnc.service
+%systemd_postun xvnc.socket
+%else
+  /sbin/service vncserver condrestart 2>&1 ||:
+%endif
 
 %triggerun -- vnc-server < 4.1.3
 /sbin/service vncserver stop &>/dev/null || :
 /sbin/chkconfig --del vncserver >/dev/null 2>&1 || :
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %license LICENCE.TXT
@@ -222,7 +273,6 @@ fi
 %files server
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/sysconfig/vncservers
-%config(noreplace) %{_sysconfdir}/init.d/vncserver
 %{_bindir}/x0vncserver
 %{_bindir}/vncserver
 %{_bindir}/vncconfig
@@ -235,9 +285,19 @@ fi
 %{_mandir}/man1/vncconfig.1*
 %{_libdir}/xorg/modules/extensions/libvnc.so
 %config %{_sysconfdir}/X11/xorg.conf.d/10-libvnc.conf
-
+%if %{with systemd}
+#%{_unitdir}/vncserver@.service
+%{_unitdir}/xvnc@.service
+%{_unitdir}/xvnc.socket
+%else
+%config(noreplace) %{_sysconfdir}/init.d/vncserver
+%endif
 
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.1-2
+- rebuilt with nettle-3.6.
+- added systemd support (disabled as default).
+
 * Mon Mar 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.1-1
 - new upstream release.
 - replaced all patches.

w/webkitgtk4/webkitgtk4-vl.spec

@@ -7,11 +7,11 @@
         mkdir -p _license_files ; \
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
+Summary:        GTK+ Web content engine library
 Name:           webkitgtk4
-Version:        2.28.3
+Version:        2.28.4
 Release:        1%{?_dist_release}
-Summary:        GTK+ Web content engine library
-Group:          System Environment/Libraries
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -83,9 +83,10 @@ GTK+ platform.
 
 This package contains WebKitGTK+ for GTK+ 3.
 
+
 %package        devel
 Summary:        Development files for %{name}
-Group:			Development/Libraries
+Group:			programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-jsc-devel = %{version}-%{release}
 
@@ -93,16 +94,18 @@ Requires:       %{name}-jsc-devel = %{version}-%{release}
 The %{name}-devel package contains libraries, build data, and header
 files for developing applications that use %{name}.
 
+
 %package        jsc
 Summary:        JavaScript engine from %{name}
-Group:			System Environment/Libraries
+Group:			system
 
 %description    jsc
 This package contains JavaScript engine from %{name}.
 
+
 %package        jsc-devel
 Summary:        Development files for JavaScript engine from %{name}
-Group:			Development/Libraries
+Group:			programming
 Requires:       %{name}-jsc = %{version}-%{release}
 
 %description    jsc-devel
@@ -227,6 +230,9 @@ DESTDIR=%{buildroot} ninja -C %{_target_platform} install
 
 
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.28.4-1
+- new upstream release.
+
 * Sun Jul 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.28.3-1
 - new upstream release.
 

w/wxGTK3/wxGTK3-vl.spec

@@ -4,16 +4,16 @@
 
 %global gtkver 3
 
+Summary:        GTK port of the wxWidgets GUI library
 Name:           %{wxgtkname}
-Version:        3.0.4
+Version:        3.0.5
 Release:        1%{?_dist_release}
-Summary:        GTK port of the wxWidgets GUI library
-License:        wxWidgets
-Group:          System Environment/Libraries
-URL:            http://www.wxwidgets.org/
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
+License:        wxWidgets
+URL:            http://www.wxwidgets.org/
 Source0:        https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/wxWidgets-%{version}.tar.bz2
 Source10:       wx-config
 
@@ -27,11 +27,10 @@ BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-turbo-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  expat-devel
-BuildRequires:  SDL-devel
-BuildRequires:  libgnomeprintui-devel
+BuildRequires:  SDL2-devel
 BuildRequires:  libGLU-devel
 BuildRequires:  libSM-devel
-BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  gstreamer1-plugins-base-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  gettext
 BuildRequires:  cppunit-devel
@@ -48,8 +47,8 @@ ranging from networking to HTML display and image manipulation.
 
 
 %package        devel
-Group:          Development/Libraries
 Summary:        Development files for the wxGTK3 library
+Group:          programming
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{wxbasename} = %{version}-%{release}
 Requires:       gtk%{gtkver}-devel
@@ -66,7 +65,7 @@ ranging from networking to HTML display and image manipulation.
 
 %package -n     %{wxbasename}
 Summary:        Non-GUI support classes from the wxWidgets library
-Group:          System Environment/Libraries
+Group:          system
 
 %description -n %{wxbasename}
 Every wxWidgets application must link against this library. It contains
@@ -87,6 +86,9 @@ libraries or the X Window System.
 #This package provides documentation for the %{srcname} library.
 
 
+%debug_package
+
+
 %prep
 %setup -q -n %{srcname}-%{version}
 
@@ -196,6 +198,9 @@ popd
 #%doc html
 
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0.5-1
+- new upstream release.
+
 * Sun Oct 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0.4-1
 - new upstream release.