updated 8 packages

apr-1.7.0-1

busybox-1.30.1-1

file-5.37-1

libgsf-1.14.46-1

libsndfile-1.0.28-2

subversion-1.12.2-1

uClibc-ng-1.0.32-1

wireshark-3.0.5-1

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

a/apr/apr-vl.spec

@@ -6,20 +6,18 @@
 Name: apr
 Summary: Apache Portable Runtime library
 Summary(ja): Apache ポータブルランタイムライブラリ
-Version: 1.6.5
+Version: 1.7.0
 Release: 1%{?_dist_release}
 
 Group: System Environment/Libraries
 License: Apache Software License
-URL: http://apr.apache.org/
+URL: https://apr.apache.org/
 
 Vendor: Project Vine
 Distribution: Vine Linux
 
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://ftp.tsukuba.wide.ad.jp/software/apache//apr/%{name}-%{version}.tar.bz2
 Source1: apr-wrapper.h
-Patch1: apr-1.6.3-r1834495.patch
-Patch3: apr-1.2.2-locktimeout.patch
 Patch4: apr-1.2.2-libdir.patch
 Patch5: apr-1.3.3-pkgconf.patch
 
@@ -54,8 +52,6 @@ C data structures and routines.
 
 %prep
 %setup -q
-%patch1 -p1 -b .r1834495
-%patch3 -p1 -b .locktimeout
 %patch4 -p1 -b .libdir
 %patch5 -p1 -b .pkgconf
 
@@ -126,7 +122,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES LICENSE NOTICE
+%license LICENSE
+%doc CHANGES NOTICE
 %{_libdir}/libapr-%{aprver}.so.*
 
 %files devel
@@ -144,6 +141,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.0-1
+- updated to 1.7.0.
+- dropped Patch1 and 3: fixed in upstream.
+
 * Sun Nov 18 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.5-1
 - updated to 1.6.5.
 - dropped Patch2.

b/busybox/busybox-vl.spec

@@ -1,22 +1,18 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
-Version: 1.20.2
+Version: 1.30.1
 Release: 1%{?_dist_release}
-License: GPLv2
 Group: System Environment/Shells
-Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
+License: GPLv2
+URL: https://www.busybox.net/
+Source: https://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
 Source10: busybox-static.config
 Source11: busybox-anaconda.config
-Patch1: busybox-1.15.1-uname.patch
-Patch12: busybox-1.2.2-ls.patch
-Patch16: busybox-1.10.1-hwclock.patch
-URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: uClibc-devel
+BuildRequires: uClibc-ng-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: daisuke
 
 %description 
 Busybox is a single binary which includes versions of a large number
@@ -38,10 +34,6 @@ normal use.
 
 %prep
 %setup -q
-%patch1 -b .uname -p1
-%patch12 -b .ls -p1
-%patch16 -b .ia64 -p1
-
 
 %build
 # create static busybox
@@ -52,10 +44,18 @@ yes "" | make oldconfig
 # nor startfiles (i.e. crtXXX.o files)
 if test "$arch"; then \
     mv .config .config1 && \
-    grep -v ^CONFIG_SELINUX .config1 >.config && \
+    grep -v \
+        -e ^CONFIG_SELINUX \
+        -e ^CONFIG_FEATURE_HAVE_RPC \
+        -e ^CONFIG_FEATURE_MOUNT_NFS \
+        -e ^CONFIG_FEATURE_INETD_RPC \
+        .config1 >.config && \
+    echo "# CONFIG_FEATURE_HAVE_RPC is not set" >>.config && \
+    echo "# CONFIG_FEATURE_MOUNT_NFS is not set" >>.config && \
+    echo "# CONFIG_FEATURE_INETD_RPC is not set" >>.config && \
     yes "" | make oldconfig && \
     cat .config && \
-    make V=1 \
+    make V=1 %{_smp_mflags} \
         EXTRA_CFLAGS="-isystem %{_includedir}/uClibc" \
         CFLAGS_busybox="-static -nostartfiles -L%{_libdir}/uClibc %{_libdir}/uClibc/crt1.o %{_libdir}/uClibc/crti.o %{_libdir}/uClibc/crtn.o"; \
 else \
@@ -68,9 +68,17 @@ cp docs/busybox.1 docs/busybox.static.1
 # create busybox optimized for anaconda 
 make clean
 # 
-cp %{SOURCE11} .config
+grep -v \
+    -e ^CONFIG_SELINUX \
+    -e ^CONFIG_FEATURE_HAVE_RPC \
+    -e ^CONFIG_FEATURE_MOUNT_NFS \
+    -e ^CONFIG_FEATURE_INETD_RPC \
+    %{SOURCE11} >.config && \
+echo "# CONFIG_FEATURE_HAVE_RPC is not set" >>.config && \
+echo "# CONFIG_FEATURE_MOUNT_NFS is not set" >>.config && \
+echo "# CONFIG_FEATURE_INETD_RPC is not set" >>.config && \
 yes "" | make oldconfig
-make CONFIG_DEBUG=y CC="gcc $RPM_OPT_FLAGS"
+make %{_smp_mflags} CONFIG_DEBUG=y CC="gcc $RPM_OPT_FLAGS"
 cp busybox busybox.anaconda
 cp docs/busybox.1 docs/busybox.anaconda.1
 
@@ -88,17 +96,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README
+%license LICENSE
+%doc README
 /sbin/busybox
 %{_mandir}/man1/busybox.1.gz
 
 %files anaconda
 %defattr(-,root,root,-)
-%doc LICENSE README
+%license LICENSE
+%doc README
 /sbin/busybox.anaconda
 %{_mandir}/man1/busybox.anaconda.1.gz
 
 %changelog
+* Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.30.1-1
+- new upstream release.
+- dropped all patches.
+
 * Mon Nov 26 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.20.2-1
 - update to 1.20.2
 - Patch1: change uname -p behavior to coreutils's uname
@@ -167,7 +181,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Sep  1 2005 Ivana Varekova <varekova@redhat.com> - 1.01-1
 - update to 1.01
  
-* Tue May 11 2005 Ivana Varekova <varekova@redhat.com> - 1.00-5
+* Wed May 11 2005 Ivana Varekova <varekova@redhat.com> - 1.00-5
 - add debug files to debug_package
 
 * Mon Mar  7 2005 Ivana Varekova <varekova@redhat.com> - 1.00-4
@@ -254,7 +268,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Jan 6 2003 Dan Walsh <dwalsh@redhat.com> 0.60.5-4
 - Upstream developers wanted to eliminate the use of floats
 
-* Thu Jan 3 2003 Dan Walsh <dwalsh@redhat.com> 0.60.5-3
+* Fri Jan 3 2003 Dan Walsh <dwalsh@redhat.com> 0.60.5-3
 - Fix free to work on large memory machines.
 
 * Sat Dec 28 2002 Jeremy Katz <katzj@redhat.com> 0.60.5-2

f/file/file-vl.spec

@@ -1,37 +1,31 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define __libtoolize :
 
-Summary: A utility for determining file types.
-Summary(ja): ファイルの種類を判別するユーティリティー
-Name: file
-Version: 5.28
-Release: 1%{?_dist_release}
-License: BSD
-Group: Applications/System
-Obsoletes: file-static
+Summary:        A utility for determining file types.
+Summary(ja):    ファイルの種類を判別するユーティリティー
+Name:           file
+Version:        5.37
+Release:        1%{?_dist_release}
+Group:          Applications/System
+License:        BSD
 
-Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
+URL:            http://www.darwinsys.com/file/
+# master site is toooooooooooooooooo slow
+# Source0:        ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
+%define         altver %(echo %{version} | sed -e 's/\\./_/')
+Source0:        https://github.com/file/file/archive/FILE%{altver}.tar.gz#/file-FILE%{altver}.tar.gz
 
 # Addtional magic file for Vine
 Source10: magic.printer-j
 
 # Upstream says it's up to distributions to add a way to support local-magic.
 Patch0: file-localmagic.patch
-# sent upstream
-Patch1: file-5.10-strength.patch
+
+# not yet upstream
 Patch3: file-4.17-rpm-name.patch
 Patch4: file-5.04-volume_key.patch
-Patch5: file-5.04-man-return-code.patch
-Patch6: file-5.04-generic-msdos.patch
-Patch7: file-5.14-x86boot.patch
-Patch8: file-5.14-perl.patch
-Patch14: file-5.19-cafebabe.patch
-Patch15: file-5.22-awk-perl.patch
-Patch17: file-5.24-varied.patch
 
-# https://github.com/file/file/pull/8
-Patch100: file-5.28-compress-sigsegv.patch
+# fix double free on read error (#1685217)
+Patch14: file-5.37-double-free.patch
 
 # Vine
 Patch1000: file-5.14-magicbuild-fix.patch
@@ -43,6 +37,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root
 #BuildRequires: automake
 #BuildRequires: autoconf
 BuildRequires: zlib-devel
+Obsoletes: file-static
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -77,7 +72,10 @@ necessary for developing programs using libmagic.
 %package -n python-magic
 Summary: Python bindings for the libmagic API
 Group:   Development/Libraries
-BuildRequires: python-devel python-setuptools
+BuildRequires: python-devel
+BuildRequires: python-setuptools
+BuildRequires: python-rpm-macros
+
 Requires: %{name} = %{version}-%{release}
 
 %description -n python-magic
@@ -85,23 +83,29 @@ This package contains the Python bindings to allow access to the
 libmagic API. The libmagic library is also used by the familiar
 file(1) command.
 
+%package -n python3-magic
+Summary: Python bindings for the libmagic API
+Group:   Development/Libraries
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-rpm-macros
+
+Requires: %{name} = %{version}-%{release}
+
+%description -n python3-magic
+This package contains the Python bindings to allow access to the
+libmagic API. The libmagic library is also used by the familiar
+file(1) command.
+
 
 %prep
-%setup -q
+%setup -q -n file-FILE%{altver}
+autoreconf -ivf
 # Don't use -b -- it will lead to problems when compiling magic file!
 %patch0 -p1
-%patch1 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 %patch14 -p1
-%patch15 -p1
-%patch17 -p1
-
-%patch100 -p1
 
 # Vine
 %patch1000 -p1
@@ -126,7 +130,8 @@ export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{name}-%{version}/src/.libs
 make
 
 cd python
-CFLAGS="%{optflags}" %{__python} setup.py build
+%py_build
+%py3_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -145,7 +150,9 @@ ln -s misc/magic ${RPM_BUILD_ROOT}%{_datadir}/magic
 ln -s ../magic ${RPM_BUILD_ROOT}%{_datadir}/file/magic
 
 cd python
-%{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}
+%py_install
+%py3_install
+
 %{__install} -d ${RPM_BUILD_ROOT}%{_datadir}/%{name}
 
 
@@ -173,7 +180,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc COPYING ChangeLog README
+%license COPYING
+%doc ChangeLog README
 %{_bindir}/*
 %{_libdir}/libmagic.so.*
 %{_datadir}/file/*
@@ -189,14 +197,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n python-magic
 %defattr(-, root, root, -)
-%doc python/README COPYING python/example.py
+%license python/LICENSE
+%doc python/README* python/example.py
 %{python_sitelib}/magic.py
 %{python_sitelib}/magic.pyc
 %{python_sitelib}/magic.pyo
 %{python_sitelib}/*egg-info
 
+%files -n python3-magic
+%defattr(-, root, root, -)
+%license python/LICENSE
+%doc python/README* python/example.py
+%{python3_sitelib}/*
+
 
 %changelog
+* Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.37-1
+- new upstream release.
+- added python3 support.
+- updated Patch0.
+- dropped Patch1, 5-17 and 100: fixed in upstream.
+- imported Patch14 from rawhide.
+
 * Thu Jul 28 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.28-1
 - new upstream release.
 - dropped Patch200: fixed in upstream.

lib/libg/libgsf/libgsf-vl.spec

@@ -2,13 +2,14 @@ Summary: GNOME Structured File library
 Summary(ja): GNOME 構造化ファイルライブラリ
 
 Name: libgsf
-Version: 1.14.39
+Version: 1.14.46
 Release: 1%{?_dist_release}
 Group: System Environment/Libraries
 License: GPL
 
-Source: libgsf-%{version}.tar.xz
-URL: http://ftp.gnome.org/pub/gnome/sources/libgsf/
+URL: https://ftp.gnome.org/pub/gnome/sources/libgsf/
+%define shortver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
+Source: https://ftp.gnome.org/pub/gnome/sources/libgsf/%{shortver}/libgsf-%{version}.tar.xz
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel >= 2.26.0
@@ -21,7 +22,6 @@ BuildRequires: popt-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: Takemikaduchi
 
 %description
 A library for reading and writing structured files (eg MS OLE and Zip)
@@ -73,7 +73,8 @@ if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.LIB ChangeLog README
+%license COPYING COPYING.LIB
+%doc AUTHORS ChangeLog NEWS README
 %attr(755, root, root) %{_bindir}/gsf
 %attr(755, root, root) %{_bindir}/gsf-office-thumbnailer
 %attr(755, root, root) %{_bindir}/gsf-vba-dump
@@ -91,6 +92,9 @@ if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi
 %{_datadir}/gtk-doc/html/gsf
 
 %changelog
+* Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.46-1
+- new upstream release.
+
 * Sun Jul 17 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.14.39-1
 - new upstream release
 

lib/libs/libsndfile/libsndfile-vl.spec

@@ -4,7 +4,7 @@ Summary:        A library to handle various audio file formats.
 Summary(ja):    さまざまなフォーマットの音声ファイルを扱うライブラリ
 Name:           libsndfile
 Version:        1.0.28
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -148,7 +148,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
-# compat32
 %if %{build_compat32}
 %post -n compat32-%{name} -p /sbin/ldconfig
 
@@ -187,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.28-2
+- removed a comment in %%postun script.
+
 * Thu Oct 17 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.28-1
 - new upstream release.
 - dropped Patch100-101.

s/subversion/subversion-vl.spec

@@ -3,7 +3,7 @@
 %define apache_version 2.4
 %define apache_dir /usr
 
-%define swigdirs swig_pydir=%{python_sitearch}/libsvn swig_pydir_extra=%{python_sitearch}/svn
+%define swigdirs swig_pydir=%{python3_sitearch}/libsvn swig_pydir_extra=%{python3_sitearch}/svn
 
 # set to zero to avoid running test suite
 %define make_check 0
@@ -11,22 +11,22 @@
 Summary: Modern Version Control System
 Summary(ja): モダンなバージョン管理システム
 Name: subversion
-Version: 1.10.4
+Version: 1.12.2
 Release: 1%{?_dist_release}
 License: ASL 2.0 
 Group: Development/Tools
-URL: http://subversion.apache.org/
+URL: https://subversion.apache.org/
 
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: iwaim, daisuke
 
-SOURCE0: subversion-%{version}.tar.bz2
+SOURCE0: http://ftp.jaist.ac.jp/pub/apache/subversion/subversion-%{version}.tar.bz2
 SOURCE1: subversion.conf
 SOURCE2: httpd.davcheck.conf
 SOURCE3: filter-requires.sh
-Patch1: subversion-1.10.0-rpath.patch
-Patch2: subversion-1.10.0-pie.patch
+Patch1: subversion-1.12.0-linking.patch
+Patch2: subversion-1.12.2-py3tests.patch
 Patch4: subversion-1.8.0-rubybind.patch
 Patch5: subversion-1.8.5-swigplWall.patch
 
@@ -39,8 +39,6 @@ BuildRequires: gdbm-devel
 BuildRequires: libtool >= 1.4.2
 BuildRequires: neon-devel >= %{neon_version}
 BuildRequires: openssl-devel
-BuildRequires: python
-BuildRequires: python-devel
 BuildRequires: swig >= %{swig_version}
 BuildRequires: texinfo
 BuildRequires: zlib-devel
@@ -117,22 +115,27 @@ Requires: ruby >= 2.0
 %description ruby
 This package includes the Ruby bindings to the Subversion libraries.
 
-%package python
+%package -n python3-subversion
 Group: Development/Libraries
 Summary: Python bindings to the Subversion libraries
-Requires: subversion = %{version}-%{release}, python
+BuildRequires: python3
+BuildRequires: python3-devel
+BuildRequires: python3-rpm-macros
+Requires: subversion = %{version}-%{release}, python3
 
-%description python
+%description -n python3-subversion
 This package includes the Python bindings to the Subversion libraries.
 
 %prep
 %setup -q
-%patch1 -p1 -b .rpath
-%patch2 -p1 -b .pie
+%patch1 -p1 -b .link
+%patch2 -p1 -b .python3
 %patch4 -p1 -b .rubybind
 %patch5 -p1 -b .swigplWall
 
 %build
+export LANG=ja_JP.UTF-8
+
 # Regenerate the buildsystem, so that:
 #  1) patches applied to configure.in take effect
 #  2) the swig bindings are regenerated using the system swig
@@ -140,13 +143,16 @@ This package includes the Python bindings to the Subversion libraries.
 # swig version
 # This PATH order makes the fugly test for libtoolize work...
 mv build-outputs.mk build-outputs.mk.old
-#export PYTHON=%{__python3}
+export PYTHON=%{__python3}
 
 PATH=/usr/bin:$PATH ./autogen.sh --release
 
 # fix shebang lines, #111498
 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
 
+# fix python executable
+perl -pi -e 's|/usr/bin/env python.*|%{svn_python}|' subversion/tests/cmdline/svneditor.py
+
 # override weird -shrext from ruby
 export svn_cv_ruby_link="%{__cc} -shared"
 export svn_cv_ruby_sitedir_libsuffix=""
@@ -191,7 +197,7 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d
 
 # Remove unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_includedir}/subversion-*/*.txt \
-       $RPM_BUILD_ROOT%{python_sitearch}/*/*.{a,la} \
+       $RPM_BUILD_ROOT%{python3_sitearch}/*/*.{a,la} \
        $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # The SVN build system is broken w.r.t. DSO support; it treats
@@ -258,9 +264,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun ruby -p /sbin/ldconfig
 
-%post python -p /sbin/ldconfig
+%post -n python3-subversion -p /sbin/ldconfig
 
-%postun python -p /sbin/ldconfig
+%postun -n python3-subversion -p /sbin/ldconfig
 
 %post tools -p /sbin/ldconfig
 
@@ -269,7 +275,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%license LICENSE subversion/LICENSE
+%license LICENSE
 %doc BUGS CHANGES COMMITTERS NOTICE INSTALL README
 %{_bindir}/*
 %{_libdir}/libsvn_*.so.*
@@ -311,14 +317,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libsvn_swig_ruby*
 %{rarchdir}/svn
 
-%files python
+%files -n python3-subversion
 %defattr(-,root,root,-)
 %{_libdir}/libsvn_swig_py*
-%{python_sitearch}/libsvn
-%{python_sitearch}/svn
+%{python3_sitearch}/*
 
 
 %changelog
+* Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.2-1
+- new upstream release.
+- dropped Patch1 and 2.
+- imported Patch1 and 2 from rawhide.
+- switched to python3.
+
 * Sat May 18 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.4-1
 - new upstream release.
 - rebuilt with perl-5.26.

u/uClibc-ng/uClibc-ng-vl.spec

@@ -0,0 +1,113 @@
+Name:           uClibc-ng
+Summary:        C library for embedded Linux
+Summary(ja):    組み込みLinux用のCライブラリ
+Version:        1.0.32
+Release:        1%{?_dist_release}
+Group:          Development/Libraries
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        LGPLv2
+URL:            https://uclibc-ng.org/
+Source0:        https://downloads.uclibc-ng.org/releases/1.0.32/%{name}-%{version}.tar.xz
+Source1:        uClibc-ng.config
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires:  kernel-headers
+
+%global debug_package %{nil}
+# This package only contains a static library
+
+%description
+ uClibc-ng is a small C library for developing embedded Linux systems. 
+It is much smaller than the GNU C Library, but nearly all applications
+supported by glibc also work perfectly with uClibc-ng.
+
+%package devel
+Summary: Header files and libraries for uClibc-ng library
+Summary(ja): Header files and libraries for uClibc-ng library
+Group: Development/Libraries
+Provides: uClibc = %{version}-%{release}
+Provides: uClibc-static = %{version}-%{release}
+Obsoletes: uClibc-devel < 1.0.0
+
+%description devel
+ uClibc-ng is a small C library for developing embedded Linux systems. 
+It is much smaller than the GNU C Library, but nearly all applications
+supported by glibc also work perfectly with uClibc-ng.
+
+ This package contains the header files and libraries
+needed for uClibc-ng package.
+
+%prep
+%setup -q -n %{name}-%{version}
+
+iconv -f windows-1252 -t utf-8 README >README.pom
+mv README.pom README
+
+mkdir kernel-include
+cp -a /usr/include/asm kernel-include
+cp -a /usr/include/asm-generic kernel-include
+cp -a /usr/include/linux kernel-include
+
+%build
+arch=`uname -m | sed -e 's/i.86/i386/'`
+echo "TARGET_$arch=y" >.config
+echo "TARGET_ARCH=\"$arch\"" >>.config
+cat %{SOURCE1} >>.config
+
+yes "" | make oldconfig %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/lib
+make install PREFIX="%{buildroot}/"
+make install_headers PREFIX="%{buildroot}/" DEVEL_PREFIX=""
+cp -a kernel-include/* %{buildroot}/include/
+
+# move libraries to proper subdirectory
+mkdir -p %{buildroot}/%{_libdir}/uClibc
+mv  %{buildroot}/lib/*  %{buildroot}/%{_libdir}/uClibc/
+rm -rf  %{buildroot}/lib/
+
+# move the header files to /usr subdirectory
+mkdir -p %{buildroot}/%{_includedir}/uClibc
+mv  %{buildroot}/include/*  %{buildroot}/%{_includedir}/uClibc
+rm -rf  %{buildroot}/include/
+
+%clean
+rm -rf %{buildroot}
+
+%files devel
+%defattr(-,root,root,-)
+%license COPYING.LIB*
+%doc README MAINTAINERS
+%doc docs/Glibc_vs_uClibc_Differences.txt docs/uClibc_vs_SuSv3.txt docs/porting.txt
+%{_includedir}/uClibc
+%{_libdir}/uClibc
+
+%changelog
+* Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.32
+- initial build of uClibc-ng.
+
+* Mon Nov 26 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.9.33.2-1
+- update to 0.9.33.2
+- update config
+
+* Mon May 23 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.9.32-1.rc3
+- initial build for Vine Linux
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.32-0.2.rc2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Feb  7 2011 Tom Callaway <spot@fedoraproject.org> - 0.9.32-0.1.rc2
+- update config for 0.9.32-rc2, busybox
+- patch getutent
+
+* Tue Nov  9 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 0.9.31-2
+- update to 0.9.31
+
+* Fri Jun  5 2009 Ivana Varekova <varekova@redhat.com> - 0.9.30.1-2
+- initial build for Red Hat

w/wireshark/wireshark-vl.spec

@@ -4,34 +4,35 @@
 Summary: 	Network traffic analyzer
 Summary(ja):    ネットワークトラフィック解析プログラム
 Name: 		wireshark
-Version:	2.4.5
+Version:	3.0.5
 Release: 	1%{_dist_release}
 License: 	GPLv2
 Group: 		Applications/System
 URL: 		http://www.wireshark.org/
-Source0:	http://www.wireshark.org/download/src/%{name}-%{version}.tar.xz
+Source0:	https://1.as.dl.wireshark.org/src/%{name}-%{version}.tar.xz
 Source1:	wireshark.pam
 Source2:	wireshark.console
 Source4:	90-wireshark-usbmon.rules
-Patch1:		wireshark-0001-enable-Lua-support.patch
 Patch2:		wireshark-0002-Customize-permission-denied-error.patch
 Patch3:		wireshark-0003-fix-string-overrun-in-plugins-profinet.patch
 Patch4:		wireshark-0004-Restore-Fedora-specific-groups.patch
 Patch5:		wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
 Patch6:		wireshark-0006-Move-tmp-to-var-tmp.patch
+Patch7:		wireshark-0007-cmakelists.patch
 
 Patch1000:	wireshark-2.0.5-path.patch
 
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
 
+BuildRequires:	cmake
+BuildRequires:	ninja
 BuildRequires:	libcap-devel
 BuildRequires: 	net-snmp-devel >= 5.0
 BuildRequires: 	net-snmp-utils >= 5.0
 BuildRequires: 	zlib-devel, bzip2-devel
 BuildRequires:  openssl-devel
-BuildRequires:	glib2-devel, gtk3-devel
 BuildRequires:  libelf-devel
-BuildRequires:  python-devel, python-rpm-macros
+BuildRequires:  python3-devel, python3-rpm-macros
 BuildRequires:  pcre-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  desktop-file-utils, automake, libtool
@@ -40,6 +41,12 @@ BuildRequires:  git
 BuildRequires:  krb5-devel
 BuildRequires:	libpcap-devel
 BuildRequires:	lua-devel
+BuildRequires:	libnl3-devel
+BuildRequires:	glib2-devel
+BuildRequires:	qt5-qtbase-devel
+BuildRequires:	qt5-linguist
+BuildRequires:	qt5-qtmultimedia-devel
+BuildRequires:	qt5-qtsvg-devel
 
 Requires:		usermode >= 1.37
 Requires(post):	desktop-file-utils
@@ -69,6 +76,17 @@ Wireshark は，UNIX 系 OS 用のネットワークトラフィック解析プ
 libpcap を使ったコマンドラインツールと，プラグイン，ドキュメント等が
 収められています．GUI もこのパッケージに収められています．
 
+%package devel
+Summary:        Development headers and libraries for wireshark
+Summary(ja):    wiresharkを用いた開発のためのヘッダ・ライブラリ
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release} glibc-devel glib2-devel
+
+%description devel
+The wireshark-devel package contains the header files, developer
+documentation, and libraries required for development of wireshark scripts
+and plugins.
+
 %prep
 %autosetup -S git
 
@@ -85,44 +103,37 @@ export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS -D_LARGEFILE64_SOURCE"
 export LDFLAGS="$LDFLAGS -pie -fPIC"
 export PATH="$PATH:/usr/kerberos/bin"
 
-autoreconf -ivf
-
-%configure \
-   --bindir=%{_sbindir} \
-   --disable-usr-local \
-   --with-plugins=%{_libdir}/%{name}/plugins/%{version} \
-   --with-gnu-ld \
-   --with-pic \
-   --disable-warnings-as-errors \
-   --disable-static \
-   --enable-wireshark \
-   --enable-ipv6 \
-   --with-krb5 \
-   --with-lua \
-   --with-pcap \
-   --with-pcre \
-   --with-ssl \
-   --without-qt \
-   --with-gtk=3 \
-   --disable-randpktdump
-
-#remove rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-time make %{?_smp_mflags}
+mkdir build
+pushd build
+
+%cmake -G Ninja \
+  -DCMAKE_INSTALL_BINDIR=%{_sbindir} \
+  -DDISABLE_WERROR=ON \
+  -DBUILD_wireshark=ON \
+  -DENABLE_LUA=ON \
+  -DBUILD_mmdbresolve=OFF \
+  -DBUILD_randpktdump=OFF \
+  -DBUILD_androiddump=OFF \
+  -DENABLE_SMI=ON \
+  -DENABLE_PLUGINS=ON \
+  -DENABLE_NETLINK=ON \
+  -DBUILD_dcerpcidl2wrs=OFF \
+  -DBUILD_sdjournal=ON \
+  ..
+
+popd
+
+%ninja_build -C build
 
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=%{buildroot} install
+%ninja_install -C build
 
 # Install python stuff.
-mkdir -p %{buildroot}%{python_sitelib}
-install -m 644 tools/wireshark_be.py tools/wireshark_gen.py  %{buildroot}%{python_sitelib}
+mkdir -p %{buildroot}%{python3_sitelib}
+install -m 644 tools/wireshark_be.py tools/wireshark_gen.py  %{buildroot}%{python3_sitelib}
 
-mv %{buildroot}%{_sbindir}/wireshark-gtk %{buildroot}%{_sbindir}/wireshark
-rm -f %{buildroot}%{_datadir}/applications/wireshark-gtk.desktop %{buildroot}%{_datadir}/applications/wireshark-gtk.desktop
 desktop-file-validate %{buildroot}%{_datadir}/applications/wireshark.desktop
 mkdir -p %{buildroot}/%{_datadir}/pixmaps
 install -m 644 image/wsicon48.png %{buildroot}/%{_datadir}/pixmaps/wireshark.png
@@ -139,7 +150,7 @@ mkdir -p "${IDIR}/epan/wmem"
 mkdir -p "${IDIR}/wiretap"
 mkdir -p "${IDIR}/wsutil"
 mkdir -p %{buildroot}%{_udevrulesdir}
-install -m 644 config.h register.h      "${IDIR}/"
+install -m 644 build/config.h epan/register.h "${IDIR}/"
 install -m 644 cfile.h file.h           "${IDIR}/"
 install -m 644 ws_symbol_export.h       "${IDIR}/"
 install -m 644 epan/*.h                 "${IDIR}/epan/"
@@ -151,8 +162,7 @@ install -m 644 epan/wmem/*.h            "${IDIR}/epan/wmem"
 install -m 644 wiretap/*.h              "${IDIR}/wiretap"
 install -m 644 wsutil/*.h               "${IDIR}/wsutil"
 install -m 644 ws_diag_control.h        "${IDIR}/"
-install -m 644 %{SOURCE4} %{buildroot}%{_udevrulesdir}
-
+install -m 644 %{SOURCE4}               %{buildroot}%{_udevrulesdir}
 
 # install support files for usermode, gnome and kde
 mkdir -p %{buildroot}%{_sysconfdir}/pam.d
@@ -163,14 +173,14 @@ mkdir -p %{buildroot}%{_bindir}
 ln -s consolehelper %{buildroot}%{_bindir}/wireshark
 
 # Remove libtool archives and static libs
-find %{buildroot} -type f -name "*.la" -delete
+#find %{buildroot} -type f -name "*.la" -delete
 
 # Remove idl2wrs
-rm -f %{buildroot}%{_sbindir}/idl2wrs
+#rm -f %{buildroot}%{_sbindir}/idl2wrs
 
-rm -f %{buildroot}%{_mandir}/man1/androiddump.*
-rm -f %{buildroot}%{_mandir}/man1/udpdump.*
-rm -f %{buildroot}%{_mandir}/man4/extcap.*
+mkdir -p html
+cp -f %{buildroot}%{_datadir}/doc/%{name}/* ./html/
+rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -190,10 +200,10 @@ update-desktop-database -q
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README* 
+%license COPYING
+%doc AUTHORS ChangeLog INSTALL NEWS README* 
 %{_sbindir}/capinfos
 %{_sbindir}/captype
-%{_sbindir}/dftest
 %attr(0750, root, wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_sbindir}/dumpcap
 %{_sbindir}/editcap
 %{_sbindir}/mergecap
@@ -204,23 +214,14 @@ update-desktop-database -q
 %{_sbindir}/text2pcap
 %{_sbindir}/tshark
 %{_udevrulesdir}/90-wireshark-usbmon.rules
-%{python_sitelib}/*
-%{_libdir}/lib*
-%{_mandir}/man1/capinfos.*
-%{_mandir}/man1/dftest.*
-%{_mandir}/man1/dumpcap.*
-%{_mandir}/man1/editcap.*
-%{_mandir}/man1/mergecap.*
-%{_mandir}/man1/rawshark.*
-%{_mandir}/man1/randpkt.*
-%{_mandir}/man1/reordercap.*
-%{_mandir}/man1/text2pcap.*
-%{_mandir}/man1/tshark.*
-%{_mandir}/man4/wireshark-filter.*
+%{python3_sitelib}/*
+%{_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
 %{_datadir}/%{name}/AUTHORS-SHORT
 %{_datadir}/%{name}/COPYING
@@ -233,6 +234,7 @@ update-desktop-database -q
 %{_datadir}/%{name}/diameter
 %{_datadir}/%{name}/dtd_gen.lua
 %{_datadir}/%{name}/dtds
+%{_datadir}/%{name}/enterprises.tsv
 %{_datadir}/%{name}/help
 %{_datadir}/%{name}/manuf
 %{_datadir}/%{name}/pdml2html.xsl
@@ -242,6 +244,7 @@ update-desktop-database -q
 %{_datadir}/%{name}/smi_modules
 %{_datadir}/%{name}/tpncp
 %{_datadir}/%{name}/wimaxasncp
+%{_datadir}/%{name}/wka
 
 %{_datadir}/icons/hicolor/*/*/*
 
@@ -251,12 +254,23 @@ update-desktop-database -q
 %{_datadir}/pixmaps/wireshark.png
 %{_bindir}/wireshark
 %{_sbindir}/wireshark
-%{_mandir}/man1/wireshark.*
+%{_mandir}/man*/*
 
+%files devel
+%doc doc/README.* ChangeLog
 %{_includedir}/wireshark
+%{_libdir}/lib*.so
+%{_libdir}/wireshark/cmake
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.5-1
+- new upstream release.
+- dropped Patch1.
+- updated Patch2-3 and 6.
+- imported Patch7 from rawhide.
+- switched buildsystem to cmake and ninja.
+
 * Sat Mar 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.5-1
 - new upstream release.
 - dropped Patch5.