Browse Source

updated 18 packages

bind-9.11.12-1

bison-3.4.2-1

clisp-2.49.93-1

exiv2-0.27.2-1

firefox-68.2.0-1

galera-26.4.3-1

gcr-3.28.1-1

glib2-2.62.2-1

golang-1.13.4-1

incron-0.5.12-3

libgexiv2-0.12.0-1

libsecret-0.18.8-2

mariadb-10.4.10-1

perl-Bit-Vector-7.4-1

perl-Class-Accessor-0.51-1

seahorse-3.34-1

thunderbird-68.2.1-1

wireshark-3.0.6-1

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

+ 5 - 2
b/bind/bind-vl.spec

@@ -7,9 +7,9 @@
 %define sname bind
 %define pname bind
 # example: 9.9.13.P1
-%define pversion 9.11.11
+%define pversion 9.11.12
 # example: 9.9.13-P1
-%define sversion 9.11.11
+%define sversion 9.11.12
 %define bind_epoch 1
 # fixed <BTS:VineLinux:1139>
 %define old_bind_version 1:9.9.2p2-1vl7
@@ -334,6 +334,9 @@ fi
 %{_bindir}/isc-config.sh
 
 %changelog
+* Sat Nov 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.11.12-1
+- updated to 9.11.12.
+
 * Wed Oct 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.11.11-1
 - updated to 9.11.11.
 

+ 26 - 5
b/bison/bison-vl.spec

@@ -1,14 +1,19 @@
+%bcond_without check
+
 Summary: A GNU general-purpose parser generator.
 Summary(ja): GNU 汎用構文解析器生成プログラム
 Name: bison
-Version: 2.7.1
+Version: 3.4.2
 Release: 1%{?_dist_release}
 License: GPL
 Group: Development/Tools
-Source: http://ftp.gnu.org/gnu/bison/bison-%{version}.tar.xz
-URL: http://www.gnu.org/software/bison/
+Source: https://ftp.gnu.org/gnu/bison/bison-%{version}.tar.xz
+URL: https://www.gnu.org/software/bison/
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires: flex
+
 Requires: m4 >= 1.4
 Requires(post): install-info
 Requires(preun): install-info
@@ -52,8 +57,13 @@ bison をインストールして下さい.
 
 %build
 %configure
-make 
+make %{_smp_mflags}
+
+
+%if %{with check}
+%check
 make check
+%endif
 
 
 %install
@@ -65,8 +75,15 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/yacc
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/yacc*
 
+rm -f pkgdoc
+cp -af %{buildroot}%{_docdir}/%{name} ./pkgdoc
+rm -rf %{buildroot}%{_docdir}/%{name}
+rm -f pkgdoc/COPYING
+
 %find_lang %{name}
+%find_lang %{name}-gnulib
 
+cat %{name}-gnulib.lang >> %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,7 +102,8 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS OChangeLog README THANKS TODO
+%license COPYING
+%doc pkgdoc/*
 %{_bindir}/bison
 %{_libdir}/liby.a
 %{_datadir}/bison
@@ -96,6 +114,9 @@ fi
 
 
 %changelog
+* Tue Nov 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.2-1
+- new upstream release.
+
 * Sat Dec 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.7.1-1
 - update to 2.7.1
 

+ 87 - 45
c/clisp/clisp-vl.spec

@@ -1,30 +1,31 @@
-%define year		2002
-%define month		07
-%define day		25
-%define name 		clisp
-%define version		2.49
-%define release         3%{?_dist_release}
-%define clisp_build	vine
-
-Summary:      Common Lisp (ANSI CL) implementation
-Summary(ja):  関数型言語 Common Lisp (ANSI CL) の実装
-Name:         clisp
-Version:      %{version}
-Release:      %{release}
-Icon:         clisp.gif
-License:      GPL
-Group:        Development/Languages
-Source:       ftp://ftp.gnu.org/pub/gnu/clisp/release/%{version}/%{name}-%{version}.tar.bz2
-
-# patch from suse
-# PATCH-FIX-OPENSUSE Correct path for header for System V IPC system calls
-Patch0:       clisp-linux.patch
-# PATCH-FIX-OPENSUSE Glibc got rid of unused __swblk_t type therefore update linux.lisp
-Patch1:       clisp-glibc-fix.patch
-#PATCH-FIX-UPSTREAM  patch#3474660  changeset 15557	4f5985f83127
-Patch2:       clisp-hostname.patch
-
-URL:          http://www.clisp.org/
+%bcond_with check
+
+Summary:        Common Lisp (ANSI CL) implementation
+Summary(ja):    関数型言語 Common Lisp (ANSI CL) の実装
+Name:           clisp
+Version:        2.49.93
+Release:        1%{?_dist_release}
+Group:          Development/Languages
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPL
+URL:            http://www.clisp.org/
+#Source0:         https://ftp.gnu.org/pub/gnu/clisp/release/%{version}/%{name}-%{version}.tar.bz2
+Source0:        clisp-dd40369.tar.xz
+
+# https://sourceforge.net/p/clisp/patches/35/
+Patch0:         %{name}-db.patch
+# https://sourceforge.net/p/clisp/patches/32/
+Patch1:         %{name}-format.patch
+# The encrypt and setkey functions are no longer available from glibc
+Patch2:         %{name}-setkey.patch
+# Adapt to changes in pari 2.11.0
+Patch3:         %{name}-pari.patch
+# The combination of register and volatile is nonsensical
+Patch4:         %{name}-register-volatile.patch
+
 Provides:     clisp, ansi-cl
 BuildRoot:    %{_tmppath}/%{name}-%{version}-root
 BuildRequires:	imake
@@ -52,6 +53,8 @@ BuildRequires:  libpq-devel
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
 
+Requires:  vim-common
+
 %description
 Common Lisp is a high-level, general-purpose, object-oriented, dynamic,
 functional programming language.
@@ -79,21 +82,51 @@ The user interface comes in English, German, French, Spanish, Dutch, Russian
 and Danish, and can be changed at run time.
 
 %prep
-%setup -q 
-%patch0 -p1
-%patch1 -p1 -b .glibc
+%setup -q -n clisp-dd40369
+
+%patch0 -p0
+%patch1 -p0
 %patch2 -p0
-sed -i 's|http://www.lisp.org/HyperSpec/|http://www.lispworks.com/documentation/HyperSpec/|g' \
-    doc/* src/*.d src/*.lisp
+%patch3 -p0
+%patch4 -p0
+
+# Change URLs not affected by the --hyperspec argument to configure
+sed -i.orig 's|lisp.org/HyperSpec/Body/chap-7.html|lispworks.com/documentation/HyperSpec/Body/07_.htm|' \
+    src/clos-package.lisp
+touch -r src/clos-package.lisp.orig src/clos-package.lisp
+rm -f src/clos-package.lisp.orig
+for f in src/_README.*; do
+  sed -i.orig 's|lisp.org/HyperSpec/FrontMatter|lispworks.com/documentation/HyperSpec/Front|' $f
+  touch -r ${f}.orig $f
+  rm -f ${f}.orig
+done
+
+# We only link against libraries in system directories, so we need -L dir in
+# place of -Wl,-rpath -Wl,dir
+cp -p src/build-aux/config.rpath config.rpath.orig
+sed -i -e 's/${wl}-rpath ${wl}/-L/g' src/build-aux/config.rpath
+
+# Fix modules that need access to symbols in libgnu.a
+sed -i 's/\(${GLLIB_A}\) \(${LIBS}\)/-Wl,--whole-archive \1 -Wl,--no-whole-archive \2 -ldl/' src/makemake.in
+
+# Enable firefox to be the default browser for displaying documentation
+sed -i 's/;; \((setq \*browser\* .*)\)/\1/' src/cfgunix.lisp
+
+# Unpack the CLX manual
+tar -C modules/clx -xzf modules/clx/clx-manual.tar.gz
+chmod -R go+r modules/clx/clx-manual
+chmod a-x modules/clx/clx-manual/html/doc-index.cgi
+
 
 %build
-%ifarch ppc ppc64
-%define opt_flags "%{optflags} -DNO_GENERATIONAL_GC -DNO_MULTIMAP_FILE -DNO_SINGLEMAP"
 ulimit -s unlimited
-%else
-%define opt_flags "%{optflags}"
-%endif
+export LC_ALL=C.UTF-8
 
+# Do not need to specify base modules: i18n, readline, regexp, syscalls.
+# The dirkey module currently can only be built on Windows/Cygwin/MinGW.
+# The editor module is not in good enough shape to use.
+# The matlab, netica, and oracle modules require proprietary code to build.
+# The queens module is intended as an example only, not for actual use.
 ./configure --prefix=%{_prefix} \
             --libdir=%{_libdir} \
             --mandir=%{_mandir} \
@@ -106,19 +139,24 @@ ulimit -s unlimited
             --with-module=fastcgi \
             --with-module=gdbm \
             --with-module=gtk2 \
-            --with-module=i18n \
             --with-module=pcre \
             --with-module=postgresql \
             --with-module=rawsock \
-            --with-module=regexp \
-            --with-module=syscalls \
-            --with-module=wildcard \
             --with-module=zlib \
-            --with-readline \
-            --cbc \
-            build CFLAGS=%opt_flags
+            --cbcx \
+            build \
+            CFLAGS="%{optflags} -Wa,--noexecstack" \
+            LDFLAGS="-Wl,--as-needed -Wl,-z,relro -Wl,-z,noexecstack" \
+%if %{with check}
+            %{nil}
+%else
+            ||:
+%endif
+
+make -C build
 
 %install
+ulimit -s unlimited
 rm -rf %{buildroot}
 make -C build DESTDIR=%{buildroot} install
 rm -f %{buildroot}%{_docdir}/clisp-%{version}/doc/clisp.{dvi,1,ps}
@@ -144,13 +182,17 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}
 %{_bindir}/%{name}-link
 %{_mandir}/man1/*
-%{_libdir}/%{name}-%{version}
+%{_libdir}/%{name}-%{version}+
 %{_datadir}/aclocal/*.m4
 %{_datadir}/emacs/site-lisp/*
 %{_sysconfdir}/vim
 %doc %{_docdir}/clisp-%{version}
 
 %changelog
+* Sat Nov 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.49.93-1
+- updated tarball from git (2.49.93+).
+- replaced patches from rawhide.
+
 * Fri Jul 31 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.49-3
 - rebuild with readline-6.3
 - add Patch0,1,2 from suse

+ 13 - 7
e/exiv2/exiv2-vl.spec

@@ -3,14 +3,14 @@
 Name: exiv2
 Summary: Exif and IPTC metadata manipulation library
 Summary(ja): Exif, IPTC メタデータ操作ライブラリ
-Version: 0.27
+Version: 0.27.2
 Release: 1%{?_dist_release}
 
 Group: System Environment/Libraries
 License: GPLv2
-URL: http://www.exiv2.org/
+URL: https://www.exiv2.org/
 
-Source0: %{name}-%{version}.tar.gz
+Source0: https://www.exiv2.org/builds/exiv2-%{version}-Source.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cmake
@@ -77,7 +77,7 @@ exiv2 用ヘッダファイル,ライブラリ,開発用ドキュメント
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-Source
 
 
 %build
@@ -118,7 +118,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING README*
+%license COPYING*
+%doc README*
 %{_bindir}/exiv2
 %{_libdir}/lib*.so.*
 %{_mandir}/man1/*
@@ -126,16 +127,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING*
 #doc doc/index.html doc/include
 #{_bindir}/exiv2-config
 %{_includedir}/exiv2/*
 %{_libdir}/libexiv2.so
+%{_libdir}/*.a
 %{_libdir}/pkgconfig/exiv2.pc
-%{_datadir}/exiv2
+%dir %{_libdir}/cmake
+%{_libdir}/cmake/*
+#{_datadir}/exiv2
 
 
 %changelog
+* Fri Nov 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.27.2-1
+- new upstream release.
+
 * Sat Dec 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.27-1
 - new upstream release.
 - dropprd all patches.

+ 5 - 2
f/firefox/firefox-vl.spec

@@ -1,8 +1,8 @@
 %bcond_with clang
 
 # do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 68.1
-%global geckomajor 68.1
+%global ffmajor 68.2
+%global geckomajor 68.2
 %global ffminor 0
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
@@ -524,6 +524,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Nov 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.2.0-1
+- updated to 68.2.0.
+
 * Sun Sep 29 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.1.0-1
 - updated to 68.1.0.
 - dropped Patch37, 225 and 406-415.

+ 6 - 4
g/galera/galera-vl.spec

@@ -2,7 +2,7 @@
 %bcond_with		python3
 
 %define galera_api_version 26.4
-%define mariadb_version 10.4.7
+%define mariadb_version 10.4.9
 
 %if %{with python3}
 %global scons scons-3
@@ -11,7 +11,7 @@
 %endif
 
 Name:           galera
-Version:        %{galera_api_version}.2
+Version:        %{galera_api_version}.3
 Release:        1%{?_dist_release}
 Summary:        Synchronous multi-master wsrep provider (replication engine)
 
@@ -22,8 +22,7 @@ URL:            http://galeracluster.com/
 # following URL (without macros):
 #   https://mirror.vpsfree.cz/mariadb/mariadb-10.2.13/galera-25.3.23/src/galera-25.3.23.tar.gz
 
-Source0:        http://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/mariadb-%{mariadb_version}/galera-%{version}/src/%{name}-%{version}.tar.gz
-
+Source0:        https://downloads.mariadb.com/MariaDB/mariadb-%{mariadb_version}/galera-%{version}/src/%{name}-%{version}.tar.gz
 
 Source1:        garbd.service
 Source2:        garbd-wrapper
@@ -133,6 +132,9 @@ fi
 
 
 %changelog
+* Wed Nov 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 26.4.3-1
+- new upstream release.
+
 * Fri Aug 30 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 26.4.2-1
 - updated to 26.4.2 for MariaDB-10.4.
 

+ 25 - 20
g/gcr/gcr-vl.spec

@@ -1,28 +1,29 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define _unpackaged_files_terminate_build 1
 
-Summary:	A library for bits of crypto UI and parsing etc.
-Name:		gcr
-Version:	3.28.0
-Release:	1%{?_dist_release}
-License:	GPL/LGPL
-Group:		System Environment/Libraries 
-URL:		http://www.gnome.org 
-
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.20/%{name}-%{version}.tar.xz
-
-BuildRequires:	gtk3-devel 
-BuildRequires:	p11-kit-devel 
-BuildRequires:	libtasn1-devel 
-BuildRequires:	libgcrypt-devel 
-BuildRequires:	libxslt
+Summary:        A library for bits of crypto UI and parsing etc.
+Name:           gcr
+Version:        3.28.1
+Release:        1%{?_dist_release}
+License:        GPL/LGPL
+Group:          System Environment/Libraries 
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+URL:            https://www.gnome.org/
+%define         shortver %(echo %{version} | cut -d. -f1-2)
+Source0:        https://ftp.gnome.org/pub/GNOME/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
+
+BuildRequires:  gtk3-devel 
+BuildRequires:  p11-kit-devel 
+BuildRequires:  libtasn1-devel 
+BuildRequires:  libgcrypt-devel 
+BuildRequires:  vala-devel 
+BuildRequires:  libxslt
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
-
 %description
 GCR is a library for displaying certificates, and crypto UI, accessing
 key stores. It also provides the viewer for crypto files on the GNOME
@@ -115,7 +116,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmock-test-module.so
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING ChangeLog NEWS README
+%license COPYING
+%doc ChangeLog NEWS README
 %{_bindir}/gcr-viewer
 %{_libdir}/libgck-1.so.*
 %{_libdir}/libgcr-3.so.*
@@ -148,6 +150,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmock-test-module.so
 %{_datadir}/gir-1.0/Gck-1.gir
 %{_datadir}/gir-1.0/Gcr-3.gir
 %{_datadir}/gir-1.0/GcrUi-3.gir
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/*
 
 %files docs
 %defattr(-,root,root)

+ 46 - 33
g/glib2/glib2-vl.spec

@@ -1,37 +1,42 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define _unpackaged_files_terminate_build 1
 
-Summary: A library of handy utility functions.
-Name: glib2
-Version: 2.58.3
-Release: 1%{?_dist_release}
-License: LGPLv2+
-Group: System Environment/Libraries
-Source: http://ftp.gnome.org/pub/GNOME/sources/glib/2.48/glib-%{version}.tar.xz
-Source2: glib2.sh
-Source3: glib2.csh
+Summary:        A library of handy utility functions.
+Name:           glib2
+Version:        2.62.2
+Release:        1%{?_dist_release}
+Group:          System Environment/Libraries
 
-BuildRoot: %{_tmppath}/glib-%{version}-root
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       Daisuke SUZUKI <daisuke@linux.or.jp>
+
+License:        LGPLv2+
+URL:            http://www.gtk.org
+%define         shortver %(echo %{version} | cut -d. -f1-2)
+Source:         https://download.gnome.org/sources/glib/%{shortver}/glib-%{version}.tar.xz
+Source2:        glib2.sh
+Source3:        glib2.csh
+
+BuildRoot:      %{_tmppath}/glib-%{version}-root
 
-BuildRequires: pkgconfig >= 0.14
 BuildRequires: dbus-devel
+BuildRequires: docbook-style-xsl
 BuildRequires: gamin-devel
+BuildRequires: libattr-devel
 BuildRequires: libffi-devel
-BuildRequires: zlib-devel
-BuildRequires: python-devel
-BuildRequires: pcre-devel >= 8.13
 BuildRequires: libmount-devel
-BuildRequires: gtk-doc
+BuildRequires: libxslt
+BuildRequires: meson
+BuildRequires: pcre-devel >= 8.13
+BuildRequires: pkgconfig >= 0.14
+BuildRequires: python3-devel
+BuildRequires: zlib-devel
 Obsoletes: glib-gtkbeta
 
 # for gio-querymodules
 Requires(post,postun): libffi
 
-URL: http://www.gtk.org
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: Daisuke SUZUKI <daisuke@linux.or.jp>
 
 %description 
 GLib is the low-level core library that forms the basis
@@ -40,7 +45,7 @@ handling for C, portability wrappers, and interfaces for such runtime
 functionality as an event loop, threads, dynamic loading, and an
 object system.
 
-This package provides version 2.48 of GLib.
+This package provides version %{shortver} of GLib.
 
 %package devel
 Summary: Development files for the GLib library
@@ -55,7 +60,7 @@ Conflicts: glib-devel <= 1.2.8
 
 %description devel
 The glib-devel package includes the header files for 
-version 2.48 of the GLib library. 
+version %{shortver} of the GLib library. 
 
 
 ## to build compat32 for x86_64 architecture support
@@ -70,7 +75,7 @@ handling for C, portability wrappers, and interfaces for such runtime
 functionality as an event loop, threads, dynamic loading, and an
 object system.
 
-This package provides version 2.48 of GLib.
+This package provides version %{shortver} of GLib.
 
 %package -n compat32-%{name}-devel
 Summary: Development files for the GLib library
@@ -82,22 +87,23 @@ Conflicts: glib-devel <= 1.2.8
 
 %description -n compat32-%{name}-devel
 The glib-devel package includes the header files for 
-version 2.48 of the GLib library. 
+version %{shortver} of the GLib library. 
 
 
 %prep
 %setup -q -n glib-%{version}
 
 %build
-NOCONFIGURE=1 ./autogen.sh
-%configure --disable-selinux --enable-static --enable-systemtap
-make %{?_smp_mflags}
+%meson \
+	-Dselinux=disabled \
+	-Dman=true
+
+%meson_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-make install DESTDIR=$RPM_BUILD_ROOT
+%meson_install
 
 ## glib2.sh and glib2.csh
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
@@ -107,6 +113,7 @@ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 #mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
 #ln -sf %{_libdir}/gdbus-2.0/codegen  $RPM_BUILD_ROOT%{python_sitearch}/codegen
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gio/modules
 touch $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -147,7 +154,10 @@ gio-querymodules %{_libdir}/gio/modules
 %{_libdir}/libgmodule-2.0.so.*
 %{_libdir}/libgobject-2.0.so.*
 %{_libdir}/libgio-2.0.so.*
-%{_libdir}/gio/modules/lib*.so
+%dir %{_libdir}/gio
+%dir %{_libdir}/gio/modules
+#%{_libdir}/gio/modules/giomodule.cache
+#%{_libdir}/gio/modules/lib*.so
 %{_sysconfdir}/profile.d/*
 %dir %{_datadir}/bash-completion/completions
 %dir %{_datadir}/bash-completion
@@ -168,7 +178,7 @@ gio-querymodules %{_libdir}/gio/modules
 %{_bindir}/gtester
 %{_bindir}/gtester-report
 %{_libdir}/lib*.so
-%{_libdir}/lib*.a
+#%{_libdir}/lib*.a
 #%{_libdir}/gdbus-2.0/codegen/*
 %{_libdir}/glib-2.0
 %{_libdir}/pkgconfig/*
@@ -194,16 +204,19 @@ gio-querymodules %{_libdir}/gio/modules
 %{_libdir}/libgmodule-2.0.so.*
 %{_libdir}/libgobject-2.0.so.*
 %{_libdir}/libgio-2.0.so.*
-%{_libdir}/gio/modules/lib*.so
+%dir %{_libdir}/gio
+%dir %{_libdir}/gio/modules
 
 %files -n compat32-%{name}-devel
 %defattr(-, root, root)
 %{_libdir}/lib*.so
-%{_libdir}/lib*.a
 %{_libdir}/glib-2.0
 %endif
 
 %changelog
+* Fri Nov 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.62.2-1
+- new upstream release.
+
 * Sat Apr 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.58.3-1
 - new upstream release.
 

+ 13 - 7
g/golang/golang-vl.spec

@@ -75,22 +75,24 @@
 %global gohostarch  386
 %endif
 
-%global go_api 1.10
-%global go_version 1.10.3
+%global go_api 1.13
+%global go_version 1.13.4
 
 Name:           golang
 Version:        %{go_version}
 Release:        1%{?_dist_release}
 Summary:        The Go Programming Language
 Summary(ja):    プログラミング言語 Go
+Group:          Development/Languages
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
 License:        BSD and Public Domain
-Group:          Development/Languages
 URL:            http://golang.org/
-
 # pre-processed by source.sh to make Mark.Twain-Tom.Sawyer.txt free again
-Source0:        https://storage.googleapis.com/golang/go%{go_version}.src.tar.gz
-
+Source0:        https://dl.google.com/go/go%{go_version}.src.tar.gz
 
 # The compiler is written in Go. Needs go(1.4+) compiler for build.
 BuildRequires:  golang > 1.4
@@ -341,7 +343,8 @@ fi
 
 
 %files
-%doc AUTHORS CONTRIBUTORS LICENSE PATENTS
+%license LICENSE
+%doc AUTHORS CONTRIBUTORS PATENTS
 # VERSION has to be present in the GOROOT, for `go install std` to work
 %doc %{goroot}/VERSION
 %dir %{goroot}/doc
@@ -392,6 +395,9 @@ fi
 %endif
 
 %changelog
+* Sat Nov 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.13.4-1
+- new upstream release.
+
 * Tue Jun 26 2018 IWAI, Masaharu <iwaim.sub@gmail.com> 1.10.3-1
 - update to 1.10.3
 - drop patches (Patch0, 212, 215)

+ 6 - 3
i/incron/incron-vl.spec

@@ -1,7 +1,7 @@
 Summary:     Inotify cron system
 Name:        incron
 Version:     0.5.12
-Release:     2%{?_dist_release}
+Release:     3%{?_dist_release}
 
 Group:       System Environment/Base          
 License:     GPLv2
@@ -9,7 +9,7 @@ URL:         https://github.com/ar-/incron
 Source0:     https://github.com/ar-/incron/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:     incrond.init
 Patch0:      incron-0.5.10-gcc.patch
-Patch1:      incron-sigchld.patch
+Patch1:      incron-0.5.12-prevent-zombies.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/chkconfig
@@ -29,7 +29,7 @@ filesystem events rather than time periods.
 %prep
 %setup -q
 %patch0 -p1 -b .gcc
-%patch1 -p1 -b .sigchld
+%patch1 -p1 -b .zombie
 
 %build
 make %{?_smp_mflags} CXXFLAGS="%{optflags}"
@@ -89,6 +89,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Nov 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.5.12-3
+- replaced Patch1.
+
 * Sat Jul  9 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.5.12-2
 - added Patch1.
 

+ 13 - 13
lib/libg/libgexiv2/libgexiv2-vl.spec

@@ -1,22 +1,22 @@
 Name:           libgexiv2
 Summary:        Gexiv2 is a GObject-based wrapper around the Exiv2 library
 Summary(ja):    Exiv2 ライブラリの GObject ベースのラッパー
-Version:        0.10.9
+Version:        0.12.0
 Release:        1%{?_dist_release}
-
 Group:          System Environment/Libraries
-License:        GPLv2
-URL:            https://wiki.gnome.org/Projects/gexiv2
+
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/gexiv2/0.10/gexiv2-%{version}.tar.xz
-Patch0:         replace-single-file-includes.patch
+License:        GPLv2
+URL:            https://wiki.gnome.org/Projects/gexiv2
+
+%define         shortver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
+Source0:        https://ftp.gnome.org/pub/GNOME/sources/gexiv2/%{shortver}/gexiv2-%{version}.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  meson
-BuildRequires:  gtk-doc
 BuildRequires:  exiv2-devel >= 0.19
 BuildRequires:  expat-devel
 BuildRequires:  gobject-introspection-devel
@@ -69,12 +69,9 @@ This package contains the python3 bindings for %{name}
 
 %prep
 %setup -q -n gexiv2-%{version}
-%patch0 -p1
 
 %build
-%meson \
-  -Denable-gtk-doc=true
-
+%meson
 %meson_build
 
 %install
@@ -90,7 +87,8 @@ This package contains the python3 bindings for %{name}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README THANKS
+%license COPYING
+%doc AUTHORS README THANKS
 %{_libdir}/libgexiv2.so.*
 %{_libdir}/girepository-1.0/
 
@@ -100,7 +98,6 @@ This package contains the python3 bindings for %{name}
 %{_libdir}/libgexiv2.so
 %{_libdir}/pkgconfig/gexiv2.pc
 %{_datadir}/gir-1.0/
-%{_datadir}/gtk-doc/
 %{_datadir}/vala/vapi/gexiv2.deps
 %{_datadir}/vala/vapi/gexiv2.vapi
 
@@ -112,6 +109,9 @@ This package contains the python3 bindings for %{name}
 
 
 %changelog
+* Fri Nov 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.12.0-1
+- new upstream release.
+
 * Sat Dec 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.10.9-1
 - update to 0.10.9.
 

+ 12 - 2
lib/libs/libsecret/libsecret-vl.spec

@@ -1,19 +1,21 @@
 Name:           libsecret
 Version:        0.18.8
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        GObject based library for accessing the Secret Service API
 Summary(ja):    シークレットサービス API アクセス用の GObject 基本ライブラリ
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            https://live.gnome.org/Libsecret
-Source0:        http://download.gnome.org/sources/libsecret/0.18/%{name}-%{version}.tar.xz
+%define         shortver %(echo %{version} | cut -d. -f1-2)
+Source0:        https://download.gnome.org/sources/libsecret/%{shortver}/%{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  glib2-devel >= 2.12.0
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  libgcrypt-devel
+BuildRequires:  vala-devel
 BuildRequires:  gtk-doc
 
 Vendor:		Project Vine
@@ -82,6 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README
 %{_bindir}/secret-tool
 %{_libdir}/*.so.*
+%dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/*.typelib
 %{_mandir}/man1/secret-tool.1.gz
 
@@ -90,7 +93,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-1
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+%dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/*.gir
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/*
 
 %files doc
 %defattr(-,root,root,-)
@@ -98,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.18.8-2
+- added vala stuff.
+
 * Sat May 18 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.18.8-1
 - new upstream release.
 

+ 12 - 9
m/mariadb/mariadb-vl.spec

@@ -12,9 +12,9 @@
 %define _unpackaged_files_terminate_build 1
 
 %define mariadb_base_version	10.4
-%define mariadb_version		10.4.7
-%define mroonga_version		9.07
-%define groonga_version		9.0.7
+%define mariadb_version		10.4.10
+%define mroonga_version		9.09
+%define groonga_version		9.0.9
 %define client_version		18
 
 %define galera_api_version	26.4
@@ -30,9 +30,9 @@ Release:	1%{_dist_release}
 
 Group:		Applications/Databases
 License:	GPL2
-URL:		http://www.mariadb.org/
+URL:		https://mariadb.org/
 
-Source:		http://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/mariadb-%{version}/source/mariadb-%{version}.tar.gz
+Source:		https://downloads.mariadb.com/MariaDB/mariadb-%{version}/source/mariadb-%{version}.tar.gz
 # Don't depend on lib::mtr*
 Source998:	perl-requires.sh
 Source1000:	macros.mariadb.in
@@ -126,7 +126,6 @@ columns and also permits defining special columns such as ROWID,
 FILEID, and SERVID.
 
 %package galera
-##Version: %{mroonga_version}
 Version:	%{mariadb_version}
 Summary:	The configuration files and scripts for galera replication
 Group:		Applications/Databases
@@ -134,9 +133,6 @@ Provides:	mariadb-server-galera = %{mariadb_version}-%{release}
 Requires(pre):	mariadb-server = %{mariadb_version}-%{release}
 Requires:	mariadb-server = %{mariadb_version}-%{release}
 Requires:	galera(%{galera_api_version})
-Obsoletes:	MySQL-mroonga < 4.02
-Obsoletes:	mariadb-mroonga < 4.07
-Obsoletes:	mariadb-mroonga-doc < 4.07
 
 %description galera
  This package contains the files for MariaDB Galera Cluster.
@@ -739,6 +735,13 @@ fi
 
 
 %changelog
+* Sat Nov 09 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.4.10-1
+- new upstream release.
+
+* Wed Nov 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.4.9-1
+- new upstream release.
+- replaced patch1000 to update Groonga to v9.0.9.
+
 * Fri Aug 30 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.4.7-1
 - new upstream release.
 - replaced patch1000 to update Groonga to v9.0.7.

+ 26 - 19
p/perl-Bit-Vector/perl-Bit-Vector-vl.spec

@@ -1,21 +1,22 @@
-Summary: Efficient bit vector, set of integers and "big int" math library 
-Name: perl-Bit-Vector
-Version: 7.3
-Release: 1%{?_dist_release}
-License: distributable
-Group: Development/Libraries
-URL: http://search.cpan.org/~stbey/Bit-Vector/
-Source0: http://www.cpan.org/authors/id/STBEY/Bit-Vector-%{version}.tar.gz
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: perl >= 0:5.00503
-BuildRequires: perl(Carp::Clan) >= 5.3
-Requires: perl
-Requires: perl(Carp::Clan) >= 5.3
-Conflicts: perl-Date-Calc < 5.0
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Summary:        Efficient bit vector, set of integers and "big int" math library 
+Name:           perl-Bit-Vector
+Version:        7.4
+Release:        1%{?_dist_release}
+Group:          Development/Libraries
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        distributable
+URL:            https://metacpan.org/pod/distribution/Bit-Vector/Vector.pod
+Source0:        https://cpan.metacpan.org/authors/id/S/ST/STBEY/Bit-Vector-%{version}.tar.gz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  perl
+BuildRequires:  perl(Carp::Clan) >= 5.3
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(Carp::Clan) >= 5.3
+Conflicts:      perl-Date-Calc < 5.0
 
 %description
 Bit::Vector is an efficient C library which allows you to handle
@@ -55,6 +56,8 @@ fi
 install -m 0644 blib/man3/* %{buildroot}%{_mandir}/man3
 find examples -type f | xargs perl -pi -e "s|^#!(\s)?/usr/local/bin/perl|#!%{__perl}|g"
 
+rm -f %{buildroot}%{perl_vendorarch}/auto/Bit/Vector/.packlist
+
 %check
 make test
 
@@ -63,7 +66,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f Bit-Vector-%{version}-filelist
 %defattr(-,root,root)
-%doc CHANGES.txt CREDITS.txt README.txt examples Artistic.txt GNU_GPL.txt GNU_LGPL.txt
+%license Artistic.txt GNU_GPL.txt GNU_LGPL.txt
+%doc CHANGES.txt CREDITS.txt README.txt examples
 %dir %{perl_vendorarch}/auto/Bit
 %dir %{perl_vendorarch}/auto/Bit/Vector
 %dir %{perl_vendorarch}/Bit
@@ -71,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*3pm*
 
 %changelog
+* Thu Oct 31 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4-1
+- new upstream release.
+
 * Sun Jul  6 2014 IWAI, Masaharu <iwaim.sub@gmail.com> 7.3-1
 - build with Perl 5.16
 - update Requires and BuildRequires

+ 7 - 4
p/perl-Class-Accessor/perl-Class-Accessor-vl.spec

@@ -1,11 +1,11 @@
 Name:           perl-Class-Accessor
-Version:        0.34
-Release:        3%{?_dist_release}
+Version:        0.51
+Release:        1%{?_dist_release}
 Summary:        Automated accessor generation
 Group:          Development/Libraries
 License:        GPL or Artistic
-URL:            http://search.cpan.org/dist/Class-Accessor/
-Source0:        http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/Class-Accessor-%{version}.tar.gz
+URL:            https://metacpan.org/pod/Class::Accessor
+Source0:        https://cpan.metacpan.org/authors/id/K/KA/KASEI/Class-Accessor-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildArch:      noarch
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 31 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.51-1
+- new upstream release.
+
 * Sat Oct 25 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.34-3
 - rebuilt with perl-5.16.3
 

+ 48 - 41
s/seahorse/seahorse-vl.spec

@@ -1,47 +1,51 @@
 Summary:	A GNOME3 frontend for GnuPG
 Summary(ja):	GnuPG の GNOME3 フロントエンド
-Name:		seahorse
-Version:	3.20.0
-Release:	1%{?_dist_release}
-License:	GPL
-Group:		Applications/Accessories
-URL:		http://seahorse.sourceforge.net/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.20/%{name}-%{version}.tar.xz
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	libgnome-devel >= 2.32.0
+Name:           seahorse
+Version:        3.34
+Release:        1%{?_dist_release}
+Group:          Applications/Accessories
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPL
+URL:            https://wiki.gnome.org/Apps/Seahorse
+%define         shortver %(echo %{version} | cut -d. -f1-2)
+Source0:        https://ftp.gnome.org/pub/GNOME/sources/seahorse/%{shortver}/%{name}-%{version}.tar.xz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  avahi-glib-devel >= 0.6
+BuildRequires:  dbus-glib-devel >= 0.88
+BuildRequires:	desktop-file-utils
+BuildRequires:	docbook-style-xsl
+BuildRequires:  gcr-devel
 BuildRequires:	gtk3-devel >= 3.0.0
-BuildRequires:	gnupg >= 1.2.4
+BuildRequires:	gnupg2
 BuildRequires:  gpgme-devel >= 1.0.0
-BuildRequires:	openldap-devel
+BuildRequires:	gobject-introspection-devel
+BuildRequires:	libnotify-devel
+BuildRequires:	libpwquality-devel
+BuildRequires:	libsecret-devel
+BuildRequires:	libSM-devel
 BuildRequires:  libsoup-devel >= 2.32.0
+BuildRequires:	libxslt
+BuildRequires:	meson
 BuildRequires:	nautilus >= 2.32.0
-BuildRequires:	libsecret-devel
-BuildRequires:  gcr-devel
-BuildRequires:  avahi-glib-devel >= 0.6
-BuildRequires:  dbus-glib-devel >= 0.88
-BuildRequires:	libnotify-devel
+BuildRequires:	openldap-devel
 BuildRequires:	openssh
 BuildRequires:	openssh-clients
+BuildRequires:	vala-devel
 BuildRequires:	yelp-tools
-BuildRequires:	libSM-devel
-BuildRequires:	docbook-dtds
-BuildRequires:	gobject-introspection-devel
-BuildRequires:	desktop-file-utils
-Requires(postun): glib2
-Requires(posttrans): glib2
 
-Obsoletes:	seahorse-devel < 3.1.4
+Obsoletes:      seahorse-devel < 3.1.4
 
-Obsoletes:	gnome-keyring-manager < 2.21
-Provides:	gnome-keyring-manager < 2.21
+Obsoletes:      gnome-keyring-manager < 2.21
+Provides:       gnome-keyring-manager < 2.21
 
-# for Source1
-BuildRequires:	autoconf
+Requires:       gnupg2
+Requires(postun): glib2
+Requires(posttrans): glib2
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	Takemikaduchi
 
 %description
 Seahorse is a GNOME3 front end for th GNU Privacy Guard (GnuPG).
@@ -60,16 +64,15 @@ Seahorse は GNU Privacy Guard (GnuPG) の GNOME3 フロントエンドです。
 %setup -q
 
 %build
-%configure \
-    --disable-valac
-make %{?_smp_mflags}
+%meson \
+	-Dmanpage=true
+
+%meson_build
 
 %install
 [ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot}
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+%meson_install
 
 %find_lang %{name} --all-name --with-gnome
 
@@ -88,12 +91,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README TODO
 ## %{_sysconfdir}/xdg/autostart/*.desktop
 %{_bindir}/seahorse
-%{_libdir}/seahorse
-%{_datadir}/GConf/gsettings/*.convert
-%{_datadir}/appdata/seahorse.appdata.xml
+%{_libexecdir}/seahorse
+#{_datadir}/GConf/gsettings/*.convert
+%{_datadir}/metainfo/*.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/org.gnome.seahorse.Application.service
 %{_datadir}/glib-2.0/schemas/*.xml
@@ -104,6 +108,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Fri Nov 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.34-1
+- new upstream release.
+
 * Sun Jul 17 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.20.0-1
 - new upstream release
 

+ 62 - 26
t/thunderbird/thunderbird-vl.spec

@@ -36,7 +36,7 @@
 Summary:	Thunderbird Community Edition, Mail/newsgroup client
 Summary(ja):	Thunderbirdコミュニティエディション, メール・ニュースクライアント
 Name:		thunderbird
-Version:	68.1.2
+Version:	68.2.1
 Release:	1%{?_dist_release}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -69,23 +69,39 @@ Source1030:	thunderbird.metainfo.xml
 %define tbversion %{version}
 %define version_internal %{version}
 
+## Firefox patches
+
 # Build patches
-Patch9:         mozilla-build-arm.patch
-Patch226:       rhbz-1354671.patch
-Patch416:       firefox-SIOCGSTAMP.patch
-Patch417:       build-aarch64-user_vfp.patch
-Patch418:       mozilla-1512162.patch
-Patch105:       thunderbird-debug.patch
+# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
+Patch1001:      build-ppc64le-inline.patch
+# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
+Patch1:         no-rust-lto.patch
+Patch2:         rust-network-check.patch
+Patch4:         build-mozconfig-fix.patch
+Patch6:         build-nss-version.patch
+Patch7:         firefox-debugedits-error.patch
+Patch8:         firefox-dont-check-binary.patch
+Patch9:         nss-build-mozilla-1564499.patch
+# Always feel lucky for unsupported platforms:
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
+Patch45:        build-disable-elfhack.patch
+
+# Fedora/RHEL specific patches
+Patch215:        firefox-enable-addons.patch
+Patch219:        rhbz-1173156.patch
+Patch224:        mozilla-1170092.patch
+Patch225:        mozilla-1005640-accept-lang.patch
+
+Patch230:        rhbz-1503632-nss.patch
 
-# PPC fix
-Patch304:       mozilla-1245783.patch
-Patch306:       mozilla-1353817.patch
-Patch307:       build-disable-elfhack.patch
+# Upstream patches
+Patch402:        mozilla-1196777.patch
+Patch413:        mozilla-1353817.patch
+#Removing this patch would lead to losing user saved credentials in profile!
 
-# Fedora specific patches
+## Thunderbird patches
 
-# Upstream patches
-Patch402:       mozilla-526293.patch
+Patch501:        python-encode.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -171,23 +187,40 @@ cd %{tarballdir}
 # Mozilla (XULRunner) patches
 #cd mozilla
 
-# Build patches
-%patch9   -p2 -b .arm
-%patch105 -p1 -b .debug
 
-%patch304 -p1 -b .1245783
+# Firefox patches
+%patch1 -p1 -b .no-rust-lto
+%patch2 -p1 -b .rust-network-check
+%patch7 -p1 -b .debugedits-error
+%ifarch %{ix86} %{arm} ppc
+# binary check fails OOM on 32bit arches
+%patch8 -p1 -b .dont-check-binary
+%endif
+%patch9 -p1 -b .nss-build-mozilla-1564499
+
+%patch45 -p1 -b .elfhack
 
-#ARM run-time patch
-%patch416 -p1 -b .SIOCGSTAMP
-%patch417 -p1 -b .aarch64-user_vfp
-%patch418 -p1 -b .mozbz-1512162
+%patch4  -p1 -b .build-mozconfig-fix
+%patch6  -p1 -b .nss-version
 
-%patch306 -p1 -b .1353817
-%if 0%{?disable_elfhack}
-%patch307 -p1 -b .elfhack
+# Fedora patches
+%patch215 -p1 -b .addons
+%patch219 -p1 -b .rhbz-1173156
+#FIXME %patch224 -p1 -b .1170092
+%patch225 -p1 -b .1005640-accept-lang
+
+# This ensures no migration of certdb to sqlite on the RHEL6 and RHEL7.
+# This needs to stay for the future releases
+%if 0%{?rhel} < 8
+%patch230 -p1 -b .1503632-nss
 %endif
 
-%patch402 -p1 -b .526293
+%patch402 -p1 -b .1196777
+#%patch413 -p1 -b .1353817
+
+# Thunderbird patches
+%patch501 -p1 -b .python-encode
+
 
 # replace source for newer rust
 cp -f %{SOURCE900} ./third_party/rust/cssparser/src/
@@ -446,6 +479,9 @@ fi
 #===============================================================================
 
 %changelog
+* Sun Nov 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.2.1-1
+- new upstream release.
+
 * Sat Oct 12 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.1.2-1
 - new upstream release.
 

+ 44 - 18
w/wireshark/wireshark-vl.spec

@@ -4,7 +4,7 @@
 Summary: 	Network traffic analyzer
 Summary(ja):    ネットワークトラフィック解析プログラム
 Name: 		wireshark
-Version:	3.0.5
+Version:	3.0.6
 Release: 	1%{_dist_release}
 License: 	GPLv2
 Group: 		Applications/System
@@ -48,6 +48,7 @@ BuildRequires:	qt5-linguist
 BuildRequires:	qt5-qtmultimedia-devel
 BuildRequires:	qt5-qtsvg-devel
 
+Requires:		%{name}-cli = %{version}-%{release}
 Requires:		usermode >= 1.37
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -76,6 +77,21 @@ Wireshark は,UNIX 系 OS 用のネットワークトラフィック解析プ
 libpcap を使ったコマンドラインツールと,プラグイン,ドキュメント等が
 収められています.GUI もこのパッケージに収められています.
 
+
+%package cli
+Summary:        Network traffic analyzer for CLI
+Summary(ja):    CLI用ネットワークトラフィック解析プログラム
+Group:          Applications/System
+
+%description cli
+This package contains command-line utilities, plugins, and documentation for
+Wireshark.
+
+%description cli -l ja
+ このパッケージは、Wiresharkのコマンドラインユーティリティ、プラグイン、
+ドキュメントを提供しています。
+
+
 %package devel
 Summary:        Development headers and libraries for wireshark
 Summary(ja):    wiresharkを用いた開発のためのヘッダ・ライブラリ
@@ -185,23 +201,39 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
+%post
+update-desktop-database -q
+
+%postun
+update-desktop-database -q
+
+%pre cli
 getent group wireshark >/dev/null || groupadd -r wireshark
 getent group usbmon >/dev/null || groupadd -r usbmon
 
-%post
+%post cli
 /sbin/ldconfig
 /sbin/udevadm trigger --subsystem-match=usbmon
-update-desktop-database -q
 
-%postun 
+%postun cli
 /sbin/ldconfig
-update-desktop-database -q
 
 %files
+%{_datadir}/appdata/wireshark.appdata.xml
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/mime/packages/wireshark.xml
+%{_datadir}/pixmaps/wireshark.png
+%{_bindir}/wireshark
+%{_sbindir}/wireshark
+%config(noreplace) %{_sysconfdir}/security/console.apps/wireshark
+%config(noreplace) %{_sysconfdir}/pam.d/wireshark
+%{_mandir}/man1/wireshark.*
+
+%files cli
 %defattr(-,root,root)
 %license COPYING
-%doc AUTHORS ChangeLog INSTALL NEWS README* 
+%doc AUTHORS ChangeLog INSTALL NEWS README*
 %{_sbindir}/capinfos
 %{_sbindir}/captype
 %attr(0750, root, wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_sbindir}/dumpcap
@@ -218,8 +250,6 @@ update-desktop-database -q
 %{_libdir}/lib*.so.*
 %{_libdir}/wireshark
 %exclude %{_libdir}/wireshark/cmake
-%config(noreplace) %{_sysconfdir}/pam.d/wireshark
-%config(noreplace) %{_sysconfdir}/security/console.apps/wireshark
 
 %dir %{_datadir}/%{name}
 %config(noreplace) %{_datadir}/%{name}/init.lua
@@ -245,15 +275,7 @@ update-desktop-database -q
 %{_datadir}/%{name}/tpncp
 %{_datadir}/%{name}/wimaxasncp
 %{_datadir}/%{name}/wka
-
-%{_datadir}/icons/hicolor/*/*/*
-
-%{_datadir}/applications/*.desktop
-%{_datadir}/appdata/wireshark.appdata.xml
-%{_datadir}/mime/packages/wireshark.xml
-%{_datadir}/pixmaps/wireshark.png
-%{_bindir}/wireshark
-%{_sbindir}/wireshark
+%exclude %{_mandir}/man1/wireshark.*
 %{_mandir}/man*/*
 
 %files devel
@@ -264,6 +286,10 @@ update-desktop-database -q
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sat Nov 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.6-1
+- new upstream release.
+- added a subpackage "wireshark-cli".
+
 * Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.5-1
 - new upstream release.
 - dropped Patch1.