Browse Source

updated 6 packages

gnu-efi-3.0.13-1

ninja-1.10.2-1

perl-Crypt-PasswdMD5-1.41-1

plymouth-0.9.5-1

syslinux-6.04-1

wireshark-3.4.4-1
Tomohiro "Tomo-p" KATO 4 years ago
parent
commit
b9739ffab7

+ 31 - 18
g/gnu-efi/gnu-efi-vl.spec

@@ -1,18 +1,14 @@
 Summary:        Building EFI Applications Using the GNU Toolchain
 Summary:        Building EFI Applications Using the GNU Toolchain
 Name:           gnu-efi
 Name:           gnu-efi
-Version:        3.0.2
+Version:        3.0.13
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-
+Group:          system
-Group:          System Environment/Libraries
-License:        BSD
-URL:            http://sourceforge.net/projects/gnu-efi/
-Source0:        %{name}-%{version}.tar.bz2
-
-Patch0:         0001-Add-setjmp-back-once-again.patch
-
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
-Packager:       Takemikaduchi
+
+License:        BSD
+URL:            https://sourceforge.net/projects/gnu-efi/
+Source0:        https://downloads.sourceforge.net/project/gnu-efi/%{name}-%{version}.tar.bz2
 
 
 %global efidir  vine
 %global efidir  vine
 
 
@@ -23,7 +19,6 @@ Packager:       Takemikaduchi
 %global efiarch ia32
 %global efiarch ia32
 %endif
 %endif
 
 
-
 %description
 %description
 Develop EFI applications for ARM-64, ARM-32, x86_64, IA-64 (IPF),
 Develop EFI applications for ARM-64, ARM-32, x86_64, IA-64 (IPF),
 and IA-32 (x86) platforms using the GNU toolchain and the EFI
 and IA-32 (x86) platforms using the GNU toolchain and the EFI
@@ -33,7 +28,7 @@ development environment.
 %package        devel
 %package        devel
 Summary:        Development tools for %{name}
 Summary:        Development tools for %{name}
 Summary(ja):    %{name} の開発環境
 Summary(ja):    %{name} の開発環境
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 
 
 %description    devel
 %description    devel
@@ -42,7 +37,7 @@ Header files and libraries for building a extension library for the %{name}.
 
 
 %package        utils
 %package        utils
 Summary:        Utilities for EFI systems
 Summary:        Utilities for EFI systems
-Group:          Applications/System
+Group:          admin-tools
 
 
 %description utils
 %description utils
 This package contains utilties for debugging and developing EFI systems.
 This package contains utilties for debugging and developing EFI systems.
@@ -50,16 +45,23 @@ This package contains utilties for debugging and developing EFI systems.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1
+
 
 
 %build
 %build
-make
+make LIBDIR=%{_libdir}
 make apps
 make apps
+%ifarch x86_64
+setarch linux32 -B \
+    make ARCH=ia32 PREFIX=%{_prefix} LIBDIR=%{_prefix}/lib
+setarch linux32 -B \
+    make ARCH=ia32 PREFIX=%{_prefix} LIBDIR=%{_prefix}/lib apps
+%endif
+
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 make install INSTALLROOT=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}
 make install INSTALLROOT=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
 
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gnuefi
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gnuefi
 mv $RPM_BUILD_ROOT%{_libdir}/*.lds $RPM_BUILD_ROOT%{_libdir}/*.o $RPM_BUILD_ROOT%{_libdir}/gnuefi
 mv $RPM_BUILD_ROOT%{_libdir}/*.lds $RPM_BUILD_ROOT%{_libdir}/*.o $RPM_BUILD_ROOT%{_libdir}/gnuefi
@@ -67,15 +69,21 @@ mv $RPM_BUILD_ROOT%{_libdir}/*.lds $RPM_BUILD_ROOT%{_libdir}/*.o $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
 mkdir -p $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
 mv %{efiarch}/apps/{route80h.efi,modelist.efi} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
 mv %{efiarch}/apps/{route80h.efi,modelist.efi} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
 
 
+%ifarch x86_64
+setarch linux32 -B \
+    make ARCH=ia32 INSTALLROOT=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_prefix}/lib install
 
 
-%post -p /sbin/ldconfig
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/gnuefi
+mv $RPM_BUILD_ROOT%{_prefix}/lib/*.lds $RPM_BUILD_ROOT%{_prefix}/lib/*.o $RPM_BUILD_ROOT%{_prefix}/lib/gnuefi
+%endif
 
 
-%postun -p /sbin/ldconfig
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 
 
 %files
 %files
 %doc README.gnuefi README.efilib README.elilo ChangeLog
 %doc README.gnuefi README.efilib README.elilo ChangeLog
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
+%{_prefix}/lib/*
 %{_libdir}/*
 %{_libdir}/*
 
 
 %files devel
 %files devel
@@ -88,5 +96,10 @@ mv %{efiarch}/apps/{route80h.efi,modelist.efi} $RPM_BUILD_ROOT/boot/efi/EFI/%{ef
 
 
 
 
 %changelog
 %changelog
+* Wed Mar 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.13-1
+- new upstream release.
+- dropped ldconfig scriptlet.
+- dropped Patch0: fixed in upstream.
+
 * Sun Aug 16 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.2-1
 * Sun Aug 16 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.2-1
 - initial build based on fedora
 - initial build based on fedora

+ 20 - 9
n/ninja/ninja-vl.spec

@@ -1,9 +1,9 @@
 Name:           ninja
 Name:           ninja
-Version:        1.10.0
+Version:        1.10.2
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        A small build system with a focus on speed
 Summary:        A small build system with a focus on speed
 Summary(ja):    スピードを重視した小さなビルドシステム
 Summary(ja):    スピードを重視した小さなビルドシステム
-Group:          Development/Tools
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
@@ -27,21 +27,27 @@ fast as possible.
 %package vim
 %package vim
 Summary:     macros and syntax files of ninja for vim
 Summary:     macros and syntax files of ninja for vim
 Summary(ja): VIM用のninjaマクロ・文法ファイル
 Summary(ja): VIM用のninjaマクロ・文法ファイル
-Group:       Development/Tools
+Group:       programming
 Requires:    vim-common
 Requires:    vim-common
 
 
 %description vim
 %description vim
  This package contains macros and syntax files of ninja for vim.
  This package contains macros and syntax files of ninja for vim.
 
 
+
+%debug_package
+
+
 %prep
 %prep
 %setup -qn ninja-%{version}
 %setup -qn ninja-%{version}
 
 
+
 %build
 %build
 CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" \
 CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" \
 %{__python} configure.py --bootstrap --verbose
 %{__python} configure.py --bootstrap --verbose
 ./ninja -v manual
 ./ninja -v manual
 ./ninja -v ninja_test
 ./ninja -v ninja_test
 
 
+
 %install
 %install
 # TODO: Install ninja_syntax.py?
 # TODO: Install ninja_syntax.py?
 mkdir -p %{buildroot}/{%{_bindir},%{_datadir}/bash-completion/completions,%{_datadir}/emacs/site-lisp,%{_datadir}/vim/vimfiles/syntax,%{_datadir}/vim/vimfiles/ftdetect,%{_datadir}/zsh/site-functions}
 mkdir -p %{buildroot}/{%{_bindir},%{_datadir}/bash-completion/completions,%{_datadir}/emacs/site-lisp,%{_datadir}/vim/vimfiles/syntax,%{_datadir}/vim/vimfiles/ftdetect,%{_datadir}/zsh/site-functions}
@@ -54,32 +60,37 @@ install -pm644 misc/ninja.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/ninja.
 install -pm644 %{SOURCE2} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/ninja.vim
 install -pm644 %{SOURCE2} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/ninja.vim
 install -pm644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja
 install -pm644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja
 
 
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
+install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.ninja
-install -pm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.ninja
+
 
 
 %check
 %check
 # workaround possible too low default limits
 # workaround possible too low default limits
 ulimit -n 4096 && ulimit -u 4096
 ulimit -n 4096 && ulimit -u 4096
 ./ninja_test
 ./ninja_test
 
 
+
 %files
 %files
-%license
+%license COPYING
-%doc HACKING.md README doc/manual.html
+%doc README.md doc/manual.html
-%{_sysconfdir}/rpm/macros.ninja
+%{_rpmmacrodir}/macros.ninja
 %{_bindir}/ninja
 %{_bindir}/ninja
 %{_bindir}/ninja-build
 %{_bindir}/ninja-build
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/ninja-bash-completion
 %{_datadir}/bash-completion/completions/ninja-bash-completion
 %{_datadir}/emacs/site-lisp/ninja-mode.el
 %{_datadir}/emacs/site-lisp/ninja-mode.el
 # zsh does not have a -filesystem package
 # zsh does not have a -filesystem package
 %{_datadir}/zsh/
 %{_datadir}/zsh/
 
 
-
 %files vim
 %files vim
 %{_datadir}/vim/vimfiles/syntax/ninja.vim
 %{_datadir}/vim/vimfiles/syntax/ninja.vim
 %{_datadir}/vim/vimfiles/ftdetect/ninja.vim
 %{_datadir}/vim/vimfiles/ftdetect/ninja.vim
 
 
 
 
 %changelog
 %changelog
+* Wed Mar 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.2-1
+- new upstream release.
+
 * Sun Apr 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.0-1
 * Sun Apr 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.0-1
 - new upstream release.
 - new upstream release.
 
 

+ 19 - 17
p/perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5-vl.spec

@@ -1,33 +1,33 @@
 Name: 		perl-Crypt-PasswdMD5
 Name: 		perl-Crypt-PasswdMD5
-Version:	1.3
+Version:	1.41
-Release:	7%{?_dist_release}
+Release:	1%{?_dist_release}
 Summary:	Provides interoperable MD5-based crypt() functions 
 Summary:	Provides interoperable MD5-based crypt() functions 
+Group:		programming
+Vendor:		Project Vine
+Distribution:	Vine Linux
+
 License:	GPL+ or Artistic
 License:	GPL+ or Artistic
-Group:		Development/Libraries
+URL: 		https://metacpan.org/pod/Crypt::PasswdMD5
-URL: 		http://search.cpan.org/dist/Crypt-PasswdMD5/
+Source0: 	https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-%{version}.tgz
-Source0: 	http://search.cpan.org/CPAN/authors/id/L/LU/LUISMUNOZ/Crypt-PasswdMD5-%{version}.tar.gz
 
 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: 	noarch
 BuildArch: 	noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:	perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires:  %{_bindir}/iconv
-Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-Vendor: Project Vine
-Distribution: Vine Linux
 
 
 %description
 %description
 This package provides MD5-based crypt() functions
 This package provides MD5-based crypt() functions
 
 
+
 %prep
 %prep
 %setup -q -n Crypt-PasswdMD5-%{version}
 %setup -q -n Crypt-PasswdMD5-%{version}
-%{_bindir}/iconv -f iso-8859-1 -t utf-8 -o PasswdMD5.pm.new PasswdMD5.pm && mv PasswdMD5.pm.new PasswdMD5.pm
+
-%{__sed} -i -e 's/ISO-8859-1/UTF-8/' PasswdMD5.pm
 
 
 %build
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
+
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
@@ -36,19 +36,21 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %check
 %check
 make test
 make test
 
 
+
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc README
 %doc README
 %{perl_vendorlib}/Crypt
 %{perl_vendorlib}/Crypt
 %{_mandir}/man3/*
 %{_mandir}/man3/*
 
 
+
 %changelog
 %changelog
+* Wed Mar 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.41-1
+- new upstream release.
+
 * Wed Nov  5 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.3-7
 * Wed Nov  5 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.3-7
 - rebuilt with perl 5.16.3
 - rebuilt with perl 5.16.3
 
 

+ 170 - 135
p/plymouth/plymouth-vl.spec

@@ -1,45 +1,54 @@
+%bcond_with systemd
+
 %define plymouthdaemon_execdir /sbin
 %define plymouthdaemon_execdir /sbin
 %define plymouthclient_execdir /bin
 %define plymouthclient_execdir /bin
 %define plymouth_libdir /%{_lib}
 %define plymouth_libdir /%{_lib}
 
 
-Summary: Graphical Boot Animation and Logger
+Summary:        Graphical Boot Animation and Logger
-Summary(ja): グラフィカルブートアニメーション
+Summary(ja):    グラフィカルブートアニメーション
-Name: plymouth
+Name:           plymouth
-Version: 0.8.8
+Version:        0.9.5
-Release: 2%{?_dist_release}
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
-License: GPLv2+
+Group:          system
-Group: System Environment/Base
+Vendor:         Project Vine
-URL: http://freedesktop.org/software/plymouth/releases
+Distribution:   Vine Linux
-
+Packager:       daisuke
-Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
+
-Source1: boot-duration
+License:        GPLv2+
-Source2: plymouth-update-initrd-vine
+URL:            https://www.freedesktop.org/wiki/Software/Plymouth/
-Source10: vinelogo-bw.png
+Source0:        https://www.freedesktop.org/software/plymouth/releases//%{name}-%{version}.tar.xz
-Source11: plymouth-theme-script.tar.bz2
+Source1:        boot-duration
-Source12: plymouth-theme-charge.tar.bz2
+Source2:        plymouth-update-initrd-vine
-
+Source10:       vinelogo-bw.png
-Patch0: fix-crash.patch
+Source11:       charge.plymouth
-Patch13: plymouth-0.8.3-avoid-sigpipe.patch
+Patch0:         plymouth-0.9.5-20210324.patch
-
+
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-
+BuildRequires:  libdrm-devel >= 2.4.40
-Requires: vine-logos
+BuildRequires:  kernel-headers
+BuildRequires:  libxslt, docbook-style-xsl
+BuildRequires:  gtk3-devel
+BuildRequires:  pango-devel >= 1.21.0
+BuildRequires:  cairo-devel
+BuildRequires:  gettext-devel
+BuildRequires:  intltool
+Requires:       vine-logos
+Requires:       plymouth-system-theme
 Requires(post): plymouth-scripts
 Requires(post): plymouth-scripts
+Obsoletes:      bootsplash <= 3.2
+Provides:       bootsplash
+Obsoletes:      plymouth-utils < 0.8.4
+Obsoletes:      plymouth-gdm-hooks < 0.8.4
+Obsoletes:      plymouth-plugin-throbgress < 0.9.5
+%if %{with systemd}
+BuildRequires:  systemd-devel
+%{?systemd_requires}
+%else
+BuildRequires:  eudev-libudev-devel
+BuildRequires:  ncurses-devel
 Requires: initscripts >= 8.90.5
 Requires: initscripts >= 8.90.5
-Requires: plymouth-system-theme
+%endif
-
-Obsoletes: bootsplash <= 3.2
-Provides: bootsplash
-Obsoletes: plymouth-utils < 0.8.4
-Obsoletes: plymouth-gdm-hooks < 0.8.4
-
-BuildRequires: libdrm-devel >= 2.4.40
-BuildRequires: gtk2-devel
-BuildRequires: kernel-headers
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
 
 
 %description
 %description
 Plymouth provides an attractive graphical boot animation in
 Plymouth provides an attractive graphical boot animation in
@@ -47,10 +56,11 @@ place of the text messages that normally get shown.  Text
 messages are instead redirected to a log file for viewing
 messages are instead redirected to a log file for viewing
 after boot.
 after boot.
 
 
+
 %package system-theme
 %package system-theme
 Summary: Plymouth default theme
 Summary: Plymouth default theme
 Summary(ja): Plymouth default theme
 Summary(ja): Plymouth default theme
-Group: System Environment/Base
+Group: system
 Obsoletes: %{name}-system-plugin <  %{version}-%{release}
 Obsoletes: %{name}-system-plugin <  %{version}-%{release}
 Provides: %{name}-system-plugin = %{version}-%{release}
 Provides: %{name}-system-plugin = %{version}-%{release}
 Requires: plymouth(system-theme) = %{version}-%{release}
 Requires: plymouth(system-theme) = %{version}-%{release}
@@ -58,19 +68,21 @@ Requires: plymouth(system-theme) = %{version}-%{release}
 %description system-theme
 %description system-theme
 This metapackage tracks the current distribution default theme.
 This metapackage tracks the current distribution default theme.
 
 
+
 %package core-libs
 %package core-libs
 Summary: Plymouth core libraries
 Summary: Plymouth core libraries
 Summary(ja): Plymouth core libraries
 Summary(ja): Plymouth core libraries
-Group: Development/Libraries
+Group: system
 
 
 %description core-libs
 %description core-libs
 This package contains the libply and libply-splash-core libraries
 This package contains the libply and libply-splash-core libraries
 used by Plymouth.
 used by Plymouth.
 
 
+
 %package graphics-libs
 %package graphics-libs
 Summary: Plymouth graphics libraries
 Summary: Plymouth graphics libraries
 Summary(ja): Plymouth graphics libraries
 Summary(ja): Plymouth graphics libraries
-Group: Development/Libraries
+Group: system
 Requires: %{name}-core-libs = %{version}-%{release}
 Requires: %{name}-core-libs = %{version}-%{release}
 Obsoletes: %{name}-libs < %{version}-%{release}
 Obsoletes: %{name}-libs < %{version}-%{release}
 Provides: %{name}-libs = %{version}-%{release}
 Provides: %{name}-libs = %{version}-%{release}
@@ -80,10 +92,11 @@ BuildRequires: libpng-devel
 This package contains the libply-splash-graphics library
 This package contains the libply-splash-graphics library
 used by graphical Plymouth splashes.
 used by graphical Plymouth splashes.
 
 
+
 %package devel
 %package devel
 Summary: Libraries and headers for writing Plymouth splash plugins
 Summary: Libraries and headers for writing Plymouth splash plugins
 Summary(ja): Libraries and headers for writing Plymouth splash plugins
 Summary(ja): Libraries and headers for writing Plymouth splash plugins
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 Requires: pkgconfig
 
 
@@ -91,19 +104,21 @@ Requires: pkgconfig
 This package contains the libply and libplybootsplash libraries
 This package contains the libply and libplybootsplash libraries
 and headers needed to develop 3rd party splash plugins for Plymouth.
 and headers needed to develop 3rd party splash plugins for Plymouth.
 
 
+
 %package scripts
 %package scripts
 Summary: Plymouth related scripts
 Summary: Plymouth related scripts
 Summary(ja): Plymouth 関連スクリプト
 Summary(ja): Plymouth 関連スクリプト
-Group: Applications/System
+Group: system
 
 
 %description scripts
 %description scripts
 This package contains scripts that help integrate Plymouth with
 This package contains scripts that help integrate Plymouth with
 the system.
 the system.
 
 
+
 %package plugin-label
 %package plugin-label
 Summary: Plymouth label plugin
 Summary: Plymouth label plugin
 Summary(ja): Plymouth label plugin
 Summary(ja): Plymouth label plugin
-Group: System Environment/Base
+Group: system
 Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 BuildRequires: pango-devel >= 1.21.0
 BuildRequires: pango-devel >= 1.21.0
 BuildRequires: cairo-devel
 BuildRequires: cairo-devel
@@ -113,10 +128,11 @@ This package contains the label control plugin for
 Plymouth. It provides the ability to render text on
 Plymouth. It provides the ability to render text on
 graphical boot splashes using pango and cairo.
 graphical boot splashes using pango and cairo.
 
 
+
 %package plugin-fade-throbber
 %package plugin-fade-throbber
 Summary: Plymouth "Fade-Throbber" plugin
 Summary: Plymouth "Fade-Throbber" plugin
 Summary(ja): Plymouth "Fade-Throbber" plugin
 Summary(ja): Plymouth "Fade-Throbber" plugin
-Group: System Environment/Base
+Group: system
 Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 
 
 %description plugin-fade-throbber
 %description plugin-fade-throbber
@@ -124,10 +140,11 @@ This package contains the "Fade-In" boot splash plugin for
 Plymouth. It features a centered image that fades in and out
 Plymouth. It features a centered image that fades in and out
 while other images pulsate around during system boot up.
 while other images pulsate around during system boot up.
 
 
+
 %package theme-fade-in
 %package theme-fade-in
 Summary: Plymouth "Fade-In" theme
 Summary: Plymouth "Fade-In" theme
 Summary(ja): Plymouth "Fade-In" theme
 Summary(ja): Plymouth "Fade-In" theme
-Group: System Environment/Base
+Group: system
 Requires: %{name}-plugin-fade-throbber = %{version}-%{release}
 Requires: %{name}-plugin-fade-throbber = %{version}-%{release}
 
 
 %description theme-fade-in
 %description theme-fade-in
@@ -135,34 +152,23 @@ This package contains the "Fade-In" boot splash theme for
 Plymouth. It features a centered logo that fades in and out
 Plymouth. It features a centered logo that fades in and out
 while stars twinkle around the logo during system boot up.
 while stars twinkle around the logo during system boot up.
 
 
-%package plugin-throbgress
-Summary: Plymouth "Throbgress" plugin
-Summary(ja): Plymouth "Throbgress" plugin
-Group: System Environment/Base
-Requires: %{name}-libs = %{version}-%{release}
-Requires: plymouth-plugin-label
-
-%description plugin-throbgress
-This package contains the "throbgress" boot splash plugin for
-Plymouth. It features a centered logo and animated spinner that
-spins repeatedly while a progress bar advances at the bottom of
-the screen.
 
 
 %package theme-spinfinity
 %package theme-spinfinity
 Summary: Plymouth "Spinfinity" theme
 Summary: Plymouth "Spinfinity" theme
 Summary(ja): Plymouth "Spinfinity" theme
 Summary(ja): Plymouth "Spinfinity" theme
-Group: System Environment/Base
+Group: system
-Requires: %{name}-plugin-throbgress = %{version}-%{release}
+Requires: %{name}-plugin-two-step = %{version}-%{release}
 
 
 %description theme-spinfinity
 %description theme-spinfinity
 This package contains the "Spinfinity" boot splash theme for
 This package contains the "Spinfinity" boot splash theme for
 Plymouth. It features a centered logo and animated spinner that
 Plymouth. It features a centered logo and animated spinner that
 spins in the shape of an infinity sign.
 spins in the shape of an infinity sign.
 
 
+
 %package plugin-space-flares
 %package plugin-space-flares
 Summary: Plymouth "space-flares" plugin
 Summary: Plymouth "space-flares" plugin
 Summary(ja): Plymouth "space-flares" plugin
 Summary(ja): Plymouth "space-flares" plugin
-Group: System Environment/Base
+Group: system
 Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: plymouth-plugin-label
 Requires: plymouth-plugin-label
 
 
@@ -170,20 +176,22 @@ Requires: plymouth-plugin-label
 This package contains the "space-flares" boot splash plugin for
 This package contains the "space-flares" boot splash plugin for
 Plymouth. It features a corner image with animated flares.
 Plymouth. It features a corner image with animated flares.
 
 
+
 %package theme-solar
 %package theme-solar
 Summary: Plymouth "Solar" theme
 Summary: Plymouth "Solar" theme
 Summary(ja): Plymouth "Solar" theme
 Summary(ja): Plymouth "Solar" theme
-Group: System Environment/Base
+Group: system
 Requires: %{name}-plugin-space-flares = %{version}-%{release}
 Requires: %{name}-plugin-space-flares = %{version}-%{release}
 
 
 %description theme-solar
 %description theme-solar
 This package contains the "Solar" boot splash theme for
 This package contains the "Solar" boot splash theme for
 Plymouth. It features a blue flamed sun with animated solar flares.
 Plymouth. It features a blue flamed sun with animated solar flares.
 
 
+
 %package plugin-two-step
 %package plugin-two-step
 Summary: Plymouth "two-step" plugin
 Summary: Plymouth "two-step" plugin
 Summary(ja): Plymouth "two-step" plugin
 Summary(ja): Plymouth "two-step" plugin
-Group: System Environment/Base
+Group: system
 Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: plymouth-plugin-label
 Requires: plymouth-plugin-label
 
 
@@ -193,10 +201,11 @@ Plymouth. It features a two phased boot process that starts with
 a progressing animation synced to boot time and finishes with a
 a progressing animation synced to boot time and finishes with a
 short, fast one-shot animation.
 short, fast one-shot animation.
 
 
+
 %package theme-charge
 %package theme-charge
 Summary: Plymouth "Charge" plugin
 Summary: Plymouth "Charge" plugin
 Summary(ja): Plymouth "Charge" plugin
 Summary(ja): Plymouth "Charge" plugin
-Group: System Environment/Base
+Group: system
 Requires: %{name}-plugin-two-step = %{version}-%{release}
 Requires: %{name}-plugin-two-step = %{version}-%{release}
 
 
 %description theme-charge
 %description theme-charge
@@ -204,10 +213,11 @@ This package contains the "charge" boot splash theme for
 Plymouth. It features the shadowy hull of a logo charge up and
 Plymouth. It features the shadowy hull of a logo charge up and
 and finally burst into full form.
 and finally burst into full form.
 
 
+
 %package plugin-script
 %package plugin-script
 Summary: Plymouth "script" plugin
 Summary: Plymouth "script" plugin
 Summary(ja): Plymouth "script" plugin
 Summary(ja): Plymouth "script" plugin
-Group: System Environment/Base
+Group: system
 Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 
 
 %description plugin-script
 %description plugin-script
@@ -216,10 +226,11 @@ Plymouth. It features an extensible, scriptable boot splash
 language that simplifies the process of designing custom
 language that simplifies the process of designing custom
 boot splash themes.
 boot splash themes.
 
 
+
 %package theme-script
 %package theme-script
 Summary: Plymouth "Script" plugin
 Summary: Plymouth "Script" plugin
 Summary(ja): Plymouth "Script" plugin
 Summary(ja): Plymouth "Script" plugin
-Group: System Environment/Base
+Group: system
 Requires: %{name}-plugin-script = %{version}-%{release}
 Requires: %{name}-plugin-script = %{version}-%{release}
 Requires(post): %{_sbindir}/plymouth-set-default-theme
 Requires(post): %{_sbindir}/plymouth-set-default-theme
 Provides: plymouth(system-theme) = %{version}-%{release}
 Provides: plymouth(system-theme) = %{version}-%{release}
@@ -229,63 +240,96 @@ This package contains the "script" boot splash theme for
 Plymouth. It it is a simple example theme the uses the "script"
 Plymouth. It it is a simple example theme the uses the "script"
 plugin.
 plugin.
 
 
+
+%package theme-spinner
+Summary: Plymouth "Spinner" theme
+Requires: %{name}-plugin-two-step = %{version}-%{release}
+Requires: TrueType-vlgothic
+Requires(post): plymouth-scripts
+Provides: plymouth(system-theme) = %{version}-%{release}
+
+%description theme-spinner
+This package contains the "spinner" boot splash theme for
+Plymouth. It features a small spinner on a dark background.
+
+
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1 -b .fix-crash
+%autopatch -p1
-%patch13 -p1 -b .avoid-sigpipe
+autoreconf -ivf -Wno-portability
-
 # Change the default theme
 # Change the default theme
-sed -i -e 's/fade-in/script/g' src/plymouthd.defaults
+sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults
+
 
 
 %build
 %build
-%configure --enable-tracing --disable-tests                      \
+%configure \
-           --with-logo=%{_datadir}/pixmaps/vine/vinelogo-bw.png  \
+        --enable-tracing --disable-tests                        \
-           --with-background-start-color-stop=0x3A3A6A           \
+        --with-logo=%{_datadir}/pixmaps/vine/vinelogo-bw.png    \
-           --with-background-end-color-stop=0x000000             \
+        --with-background-start-color-stop=0x3A3A6A             \
-           --with-background-color=0x000000                      \
+        --with-background-end-color-stop=0x000000               \
-	   --with-release-file=/etc/vine-release                 \
+        --with-background-color=0x000000                        \
-           --enable-gdm-transition                               \
+        --with-release-file=/etc/vine-release                   \
-           --with-system-root-install                            \
+        --disable-gdm-transition                                \
-	   --disable-libkms
+        --with-system-root-install                              \
+        --without-rhgb-compat-link                              \
+%if %{with systemd}
+        --with-runtimedir=/run                                  \
+        --enable-systemd-integration                            \
+        --with-systemdunitdir=%{_unitdir}                       \
+%else
+        --disable-systemd-integration                           \
+        --enable-upstart-monitoring                             \
+%endif
+        %{nil}
 
 
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# Glow isn't quite ready for primetime
-rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/glow/
-rm -f $RPM_BUILD_ROOT%{_libdir}/plymouth/glow.so
 
 
-find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
+%install
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
+make install DESTDIR=%{buildroot}
+%find_lang %{name}
+find %{buildroot} -name '*.la' -delete
 
 
 # Temporary symlink until rc.sysinit is fixed
 # Temporary symlink until rc.sysinit is fixed
-(cd $RPM_BUILD_ROOT%{_bindir}; ln -s ../../bin/plymouth)
+mkdir -p %{buildroot}%{_bindir}
+(cd %{buildroot}%{_bindir}; ln -s ../../bin/plymouth)
 
 
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
+mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth
-cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_datadir}/plymouth/default-boot-duration
+cp %{SOURCE1} %{buildroot}%{_datadir}/plymouth/default-boot-duration
-cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
+cp %{SOURCE1} %{buildroot}%{_localstatedir}/lib/plymouth
 
 
-# update script theme
+# update charge theme
-tar xjvf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/plymouth/themes
+mkdir -p %{buildroot}%{_datadir}/plymouth/themes/charge
-# add charge theme
+cp %{SOURCE11} %{buildroot}%{_datadir}/plymouth/themes/charge
-tar xjvf %{SOURCE12} -C $RPM_BUILD_ROOT%{_datadir}/plymouth/themes
+cp %{buildroot}%{_datadir}/plymouth/themes/glow/{box,bullet,entry,lock}.png %{buildroot}%{_datadir}/plymouth/themes/charge
 
 
 # install vinelogo-bw.png
 # install vinelogo-bw.png
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/vine/
+#mkdir -p %{buildroot}%{_datadir}/pixmaps/vine/
-cp %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/pixmaps/vine/
+#cp %{SOURCE10} %{buildroot}%{_datadir}/pixmaps/vine/
 
 
 # Override plymouth-update-initrd to work with mkinitrd
 # Override plymouth-update-initrd to work with mkinitrd
-cp -f $RPM_SOURCE_DIR/plymouth-update-initrd-vine $RPM_BUILD_ROOT%{_libexecdir}/plymouth/plymouth-update-initrd
+cp -f %{SOURCE2} %{buildroot}%{_libexecdir}/plymouth/plymouth-update-initrd
 
 
 # Drop glow
 # Drop glow
-rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow
+rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow
+
+# fix symlink
+rm -f %{buildroot}%{_datadir}/plymouth/themes/spinfinity/header-image.png
+ln -sf  ../../../pixmaps/vine/vinelogo-bw.png \
+        %{buildroot}%{_datadir}/plymouth/themes/spinfinity/header-image.png
+
+# substitute font
+sed -i \
+        -e 's/Cantarell Light 30/VL PGothic 30/' \
+        -e 's/Cantarell 12/VL PGothic 12/' \
+        %{buildroot}%{_datadir}/plymouth/themes/spinner/spinner.plymouth
 
 
-%clean
+
-rm -rf $RPM_BUILD_ROOT
+%ldconfig_scriptlets core-libs
+%ldconfig_scriptlets graphics-libs
 
 
 %post
 %post
 [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
 [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
@@ -296,14 +340,8 @@ if [ $1 -eq 0 ]; then
     rm -f /boot/initrd-plymouth.img
     rm -f /boot/initrd-plymouth.img
 fi
 fi
 
 
-%post core-libs -p /sbin/ldconfig
-%postun core-libs -p /sbin/ldconfig
-
-%post graphics-libs -p /sbin/ldconfig
-%postun graphics-libs -p /sbin/ldconfig
-
 
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 %defattr(-, root, root)
 %doc AUTHORS NEWS README
 %doc AUTHORS NEWS README
 %dir %{_datadir}/plymouth
 %dir %{_datadir}/plymouth
@@ -314,20 +352,28 @@ fi
 %{plymouthdaemon_execdir}/plymouthd
 %{plymouthdaemon_execdir}/plymouthd
 %{plymouthclient_execdir}/plymouth
 %{plymouthclient_execdir}/plymouth
 %{_bindir}/plymouth
 %{_bindir}/plymouth
-%{_bindir}/rhgb-client
+#{_bindir}/rhgb-client
 %{_libdir}/plymouth/details.so
 %{_libdir}/plymouth/details.so
 %{_libdir}/plymouth/text.so
 %{_libdir}/plymouth/text.so
+%{_libdir}/plymouth/tribar.so
 %{_libdir}/plymouth/renderers/drm*
 %{_libdir}/plymouth/renderers/drm*
 %{_libdir}/plymouth/renderers/frame-buffer*
 %{_libdir}/plymouth/renderers/frame-buffer*
 %{_datadir}/plymouth/default-boot-duration
 %{_datadir}/plymouth/default-boot-duration
 %{_datadir}/plymouth/themes/details/details.plymouth
 %{_datadir}/plymouth/themes/details/details.plymouth
 %{_datadir}/plymouth/themes/text/text.plymouth
 %{_datadir}/plymouth/themes/text/text.plymouth
+%{_datadir}/plymouth/themes/tribar/tribar.plymouth
 %{_datadir}/plymouth/plymouthd.defaults
 %{_datadir}/plymouth/plymouthd.defaults
-%{_datadir}/pixmaps/vine/*.png
+#{_datadir}/pixmaps/vine/*.png
 %{_localstatedir}/run/plymouth
 %{_localstatedir}/run/plymouth
 %{_localstatedir}/spool/plymouth
 %{_localstatedir}/spool/plymouth
 %{_mandir}/man?/*
 %{_mandir}/man?/*
 %ghost %{_localstatedir}/lib/plymouth/boot-duration
 %ghost %{_localstatedir}/lib/plymouth/boot-duration
+%if %{with systemd}
+%{_unitdir}
+%else
+%{plymouthclient_execdir}/plymouth-upstart-bridge
+%endif
+%exclude /etc/logrotate.d/bootlog
 
 
 %files devel
 %files devel
 %defattr(-, root, root)
 %defattr(-, root, root)
@@ -369,26 +415,11 @@ fi
 
 
 %files theme-fade-in
 %files theme-fade-in
 %defattr(-, root, root)
 %defattr(-, root, root)
-%dir %{_datadir}/plymouth/themes/fade-in
+%{_datadir}/plymouth/themes/fade-in
-%{_datadir}/plymouth/themes/fade-in/bullet.png
-%{_datadir}/plymouth/themes/fade-in/entry.png
-%{_datadir}/plymouth/themes/fade-in/lock.png
-%{_datadir}/plymouth/themes/fade-in/star.png
-%{_datadir}/plymouth/themes/fade-in/fade-in.plymouth
-
-%files plugin-throbgress
-%defattr(-, root, root)
-%{_libdir}/plymouth/throbgress.so
 
 
 %files theme-spinfinity
 %files theme-spinfinity
 %defattr(-, root, root)
 %defattr(-, root, root)
-%dir %{_datadir}/plymouth/themes/spinfinity
+%{_datadir}/plymouth/themes/spinfinity
-%{_datadir}/plymouth/themes/spinfinity/box.png
-%{_datadir}/plymouth/themes/spinfinity/bullet.png
-%{_datadir}/plymouth/themes/spinfinity/entry.png
-%{_datadir}/plymouth/themes/spinfinity/lock.png
-%{_datadir}/plymouth/themes/spinfinity/throbber-[0-3][0-9].png
-%{_datadir}/plymouth/themes/spinfinity/spinfinity.plymouth
 
 
 %files plugin-space-flares
 %files plugin-space-flares
 %defattr(-, root, root)
 %defattr(-, root, root)
@@ -396,9 +427,7 @@ fi
 
 
 %files theme-solar
 %files theme-solar
 %defattr(-, root, root)
 %defattr(-, root, root)
-%dir %{_datadir}/plymouth/themes/solar
+%{_datadir}/plymouth/themes/solar
-%{_datadir}/plymouth/themes/solar/*.png
-%{_datadir}/plymouth/themes/solar/solar.plymouth
 
 
 %files plugin-two-step
 %files plugin-two-step
 %defattr(-, root, root)
 %defattr(-, root, root)
@@ -406,9 +435,7 @@ fi
 
 
 %files theme-charge
 %files theme-charge
 %defattr(-, root, root)
 %defattr(-, root, root)
-%dir %{_datadir}/plymouth/themes/charge
+%{_datadir}/plymouth/themes/charge
-%{_datadir}/plymouth/themes/charge/*.png
-%{_datadir}/plymouth/themes/charge/charge.plymouth
 
 
 %files plugin-script
 %files plugin-script
 %defattr(-, root, root)
 %defattr(-, root, root)
@@ -416,14 +443,22 @@ fi
 
 
 %files theme-script
 %files theme-script
 %defattr(-, root, root)
 %defattr(-, root, root)
-%{_datadir}/plymouth/themes/script/*.png
+%{_datadir}/plymouth/themes/script
-%{_datadir}/plymouth/themes/script/script.script
+
-%{_datadir}/plymouth/themes/script/script.plymouth
+%files theme-spinner
+# bgrt is a variant of spinner with different settings in its .plymouth file
+%{_datadir}/plymouth/themes/bgrt
+%{_datadir}/plymouth/themes/spinner
 
 
 %files system-theme
 %files system-theme
 %defattr(-, root, root)
 %defattr(-, root, root)
 
 
 %changelog
 %changelog
+* Wed Mar 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.5-1
+- dropped all patches.
+- imported Patch0 from upstream.
+- updated Source2.
+
 * Thu Oct 30 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-2
 * Thu Oct 30 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-2
 - rebuild with libpng-1.6.12
 - rebuild with libpng-1.6.12
 
 

+ 99 - 52
s/syslinux/syslinux-vl.spec

@@ -1,22 +1,40 @@
+# this is to keep rpmbuild from thinking the .c32 / .com / .0 / memdisk files
+# in noarch packages are a reason to stop the build.
+%define _binaries_in_noarch_packages_terminate_build 0
+
 Summary: Simple kernel loader which uses a FAT ot iso9660 filesystem ot a PXE network
 Summary: Simple kernel loader which uses a FAT ot iso9660 filesystem ot a PXE network
 Summary(ja): FAT/iso9660 ファイルシステムまたは PXE ネットワークを利用するシンプルなカーネルローダー
 Summary(ja): FAT/iso9660 ファイルシステムまたは PXE ネットワークを利用するシンプルなカーネルローダー
 Name: syslinux
 Name: syslinux
-Version: 4.07
+Version: 6.04
+%global pre_relase pre1
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke, shaolin
+
 License: GPLv2+
 License: GPLv2+
-Group: Applications/System
+URL: https://wiki.syslinux.org/wiki/index.php?title=The_Syslinux_Project
-Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.xz
+Source0: https://mirrors.edge.kernel.org/pub/linux/utils/boot/syslinux{?pre_relase:/Testing/%{version}}/syslinux-%{version}%{?pre_relase:-%{pre_relase}}.tar.xz
-URL: http://syslinux.zytor.com/
+# upstream patches
+Patch0: syslinux-6.04-20210324.patch
+Patch100: 0015-efi-main.c-include-efisetjmp.h.patch
+# debian patches
+Patch1004: 0004-gnu-efi-from-debian.patch
+Patch1016: 0016-strip-gnu-property.patch
+Patch1017: 0017-single-load-segment.patch
+Patch1019: 0019-gcc-10-compatibility.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 ExclusiveArch: %{ix86} x86_64
 ExclusiveArch: %{ix86} x86_64
-Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: nasm, perl, netpbm-progs
 BuildRequires: nasm, perl, netpbm-progs
 BuildRequires: libuuid-devel
 BuildRequires: libuuid-devel
+%ifarch x86_64
+BuildRequires: gnu-efi-devel
+BuildRequires: compat32-glibc-devel
+%endif
 Requires: mtools
 Requires: mtools
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke, shaolin
-
 %description
 %description
 SYSLINUX is a suite of bootloaders, currently supporting DOS FAT filesystems,
 SYSLINUX is a suite of bootloaders, currently supporting DOS FAT filesystems,
 Linux ext2/ext3 filesystems (EXTLINUX), PXE network boots
 Linux ext2/ext3 filesystems (EXTLINUX), PXE network boots
@@ -32,7 +50,7 @@ ISO 9660 CDROM (ISOLINUX) に対応しています。
 %package perl
 %package perl
 Summary: Syslinux tools written in perl
 Summary: Syslinux tools written in perl
 Summary(ja): Syslinux の perl ツール集
 Summary(ja): Syslinux の perl ツール集
-Group: Applications/System
+Group: admin-tools
 
 
 %description perl
 %description perl
 Syslinux tools written in perl
 Syslinux tools written in perl
@@ -41,7 +59,7 @@ Syslinux tools written in perl
 %package devel
 %package devel
 Summary: Headers and libraries for syslinux development.
 Summary: Headers and libraries for syslinux development.
 Summary(ja): Syslinux 開発用ヘッダとライブラリ
 Summary(ja): Syslinux 開発用ヘッダとライブラリ
-Group: Development/Libraries
+Group: programming
 
 
 %description devel
 %description devel
 Headers and libraries for syslinux development.
 Headers and libraries for syslinux development.
@@ -50,7 +68,7 @@ Headers and libraries for syslinux development.
 %package extlinux
 %package extlinux
 Summary: The EXTLINUX bootloader, for booting the local system.
 Summary: The EXTLINUX bootloader, for booting the local system.
 Summary(ja): EXTLINUX ブートローダ
 Summary(ja): EXTLINUX ブートローダ
-Group: Applications/System
+Group: system
 Requires: syslinux
 Requires: syslinux
 
 
 %description extlinux
 %description extlinux
@@ -61,7 +79,7 @@ the SYSLINUX/PXELINUX modules in /boot.
 %package tftpboot
 %package tftpboot
 Summary: SYSLINUX modules in /tftpboot, available for network booting
 Summary: SYSLINUX modules in /tftpboot, available for network booting
 Summary(ja): ネットワークブート用 SYSLINUX モジュール
 Summary(ja): ネットワークブート用 SYSLINUX モジュール
-Group: Applications/Internet
+Group: system,network
 Requires: syslinux
 Requires: syslinux
 
 
 %description tftpboot
 %description tftpboot
@@ -69,35 +87,62 @@ All the SYSLINUX/PXELINUX modules directly available for network
 booting in the /tftpboot directory.
 booting in the /tftpboot directory.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
-%setup -q -n syslinux-%{version}
+%setup -q -n syslinux-%{version}%{?pre_relase:-%{pre_relase}}
+%autopatch -p1
+sed -i -e '/CORELIBOBJS =/a calloc.o \\' mk/lib.mk
+%ifarch x86_64
+sed -i -e 's|/crt0-efi-|/gnuefi/crt0-efi-|' mk/efi.mk
+sed -i -e "s|-lefi||" efi/Makefile
+sed -i -e '/make/d' efi/clean-gnu-efi.sh
+sed -i -e 's|&load_error_buf|load_error_buf|' efi/main.c
+%endif
 
 
 
 
 %build
 %build
-make clean
+CFLAGS32="$(echo '%{build_cflags}' | sed -e 's/-m64  -mtune=generic//' -e 's/-fcf-protection//')"
-make installer
+make OPTFLAGS="${CFLAGS32}" bios
-make -C sample tidy
+make OPTFLAGS="${CFLAGS32}" bios all ||:
+%ifarch x86_64
+make OPTFLAGS="%{build_cflags}" efi64
+%endif
 
 
 
 
 %install
 %install
-rm -rf %{buildroot}
-
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_syssbindir}
 mkdir -p %{buildroot}%{_syssbindir}
 mkdir -p %{buildroot}%{_libdir}/syslinux
 mkdir -p %{buildroot}%{_libdir}/syslinux
 mkdir -p %{buildroot}%{_includedir}
 mkdir -p %{buildroot}%{_includedir}
-make install-all \
+make bios install netinstall \
 	INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_syssbindir} \
 	INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_syssbindir} \
 	LIBDIR=%{_prefix}/lib DATADIR=%{_datadir} \
 	LIBDIR=%{_prefix}/lib DATADIR=%{_datadir} \
 	MANDIR=%{_mandir} INCDIR=%{_includedir} \
 	MANDIR=%{_mandir} INCDIR=%{_includedir} \
-	TFTPBOOT=/tftpboot EXTLINUXDIR=/boot/extlinux
+	TFTPBOOT=/tftpboot EXTLINUXDIR=/boot/extlinux \
+	LDLINUX=ldlinux.c32
+make bios extbootinstall \
+	INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_syssbindir} \
+	LIBDIR=%{_prefix}/lib DATADIR=%{_datadir} \
+	MANDIR=%{_mandir} INCDIR=%{_includedir} \
+	TFTPBOOT=/tftpboot EXTLINUXDIR=/boot/extlinux \
+	LDLINUX=ldlinux.c32 ||:
+%ifarch x86_64
+make efi64 install netinstall \
+	INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_syssbindir} \
+	LIBDIR=%{_prefix}/lib DATADIR=%{_datadir} \
+	MANDIR=%{_mandir} INCDIR=%{_includedir} \
+	TFTPBOOT=/tftpboot EXTLINUXDIR=/boot/extlinux \
+	LDLINUX=ldlinux.c32
+%endif
 
 
-install -m 755 linux/syslinux-nomtools %{buildroot}%{_datadir}/syslinux
+#install -m 755 linux/syslinux-nomtools %{buildroot}%{_datadir}/syslinux
-install -m 755 linux/syslinux %{buildroot}%{_datadir}/syslinux
+#install -m 755 linux/syslinux %{buildroot}%{_datadir}/syslinux
 
 
-mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}/sample
+mkdir -p %{buildroot}/%{_pkgdocdir}/sample
-install -m 644 sample/sample.* %{buildroot}/%{_docdir}/%{name}-%{version}/sample/
+install -m 644 sample/sample.* %{buildroot}/%{_pkgdocdir}/sample/
 mkdir -p %{buildroot}/etc
 mkdir -p %{buildroot}/etc
 ( cd %{buildroot}/etc && ln -s ../boot/extlinux/extlinux.conf . )
 ( cd %{buildroot}/etc && ln -s ../boot/extlinux/extlinux.conf . )
 
 
@@ -106,35 +151,46 @@ rm -f %{buildroot}%{_prefix}/lib/libsyslinux*
 rm -f %{buildroot}%{_includedir}/syslinux.h
 rm -f %{buildroot}%{_includedir}/syslinux.h
 
 
 
 
-%clean
+%post extlinux
-rm -rf $RPM_BUILD_ROOT
+# If we have a /boot/extlinux.conf file, assume extlinux is our bootloader
+# and update it.
+if [ -f /boot/extlinux/extlinux.conf ]; then \
+        extlinux --update /boot/extlinux ; \
+elif [ -f /boot/extlinux.conf ]; then \
+        mkdir -p /boot/extlinux && \
+        mv /boot/extlinux.conf /boot/extlinux/extlinux.conf && \
+        extlinux --update /boot/extlinux ; \
+fi
 
 
 
 
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc NEWS README* COPYING
+%license COPYING
+%doc NEWS README*
 %doc doc/*
 %doc doc/*
 %doc sample
 %doc sample
 %{_mandir}/man1/gethostip*
 %{_mandir}/man1/gethostip*
 %{_mandir}/man1/syslinux*
 %{_mandir}/man1/syslinux*
 %{_mandir}/man1/extlinux*
 %{_mandir}/man1/extlinux*
+%{_mandir}/man1/isohybrid*
+%{_mandir}/man1/memdiskfind*
 %{_bindir}/gethostip
 %{_bindir}/gethostip
 %{_bindir}/isohybrid
 %{_bindir}/isohybrid
 %{_bindir}/memdiskfind
 %{_bindir}/memdiskfind
 %{_bindir}/syslinux
 %{_bindir}/syslinux
 %dir %{_datadir}/syslinux
 %dir %{_datadir}/syslinux
+%dir %{_datadir}/syslinux/dosutil
+%{_datadir}/syslinux/dosutil/*
+%dir %{_datadir}/syslinux/diag
+%{_datadir}/syslinux/diag/*
+%ifarch x86_64
+%{_datadir}/syslinux/efi64
+%endif
 %{_datadir}/syslinux/*.com
 %{_datadir}/syslinux/*.com
-%{_datadir}/syslinux/*.exe
 %{_datadir}/syslinux/*.c32
 %{_datadir}/syslinux/*.c32
 %{_datadir}/syslinux/*.bin
 %{_datadir}/syslinux/*.bin
 %{_datadir}/syslinux/*.0
 %{_datadir}/syslinux/*.0
 %{_datadir}/syslinux/memdisk
 %{_datadir}/syslinux/memdisk
-%dir %{_datadir}/syslinux/dosutil
-%{_datadir}/syslinux/dosutil/*
-%{_datadir}/syslinux/syslinux
-%{_datadir}/syslinux/syslinux-nomtools
-%dir %{_datadir}/syslinux/diag
-%{_datadir}/syslinux/diag/*
 
 
 %files perl
 %files perl
 %defattr(-,root,root)
 %defattr(-,root,root)
@@ -151,36 +207,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/syslinux2ansi
 %{_bindir}/syslinux2ansi
 %{_bindir}/isohybrid.pl
 %{_bindir}/isohybrid.pl
 
 
-
 %files devel
 %files devel
 %defattr(-,root,root)
 %defattr(-,root,root)
 %dir %{_datadir}/syslinux/com32
 %dir %{_datadir}/syslinux/com32
 %{_datadir}/syslinux/com32/*
 %{_datadir}/syslinux/com32/*
 
 
-
 %files extlinux
 %files extlinux
 %{_syssbindir}/extlinux
 %{_syssbindir}/extlinux
-/boot/extlinux
 %config /etc/extlinux.conf
 %config /etc/extlinux.conf
-
+/boot/extlinux
 
 
 %files tftpboot
 %files tftpboot
 /tftpboot
 /tftpboot
 
 
 
 
-%post extlinux
-# If we have a /boot/extlinux.conf file, assume extlinux is our bootloader
-# and update it.
-if [ -f /boot/extlinux/extlinux.conf ]; then \
-        extlinux --update /boot/extlinux ; \
-elif [ -f /boot/extlinux.conf ]; then \
-        mkdir -p /boot/extlinux && \
-        mv /boot/extlinux.conf /boot/extlinux/extlinux.conf && \
-        extlinux --update /boot/extlinux ; \
-fi
-
-
 %changelog
 %changelog
+* Thu Mar 25 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.04-1
+- new upstream release.
+- imported Patch0 from upstream.
+- imported Patch100 from upstream PR.
+- imported Patch1004-1019 from debian.
+
 * Sun Oct 12 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.07-1
 * Sun Oct 12 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.07-1
 - updated to 4.07
 - updated to 4.07
 - moved extlinux subpackage to Applications/System Group
 - moved extlinux subpackage to Applications/System Group
@@ -234,7 +281,7 @@ fi
 * Fri Jun 25 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 2.10-0vl1
 * Fri Jun 25 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 2.10-0vl1
 - new upstream release
 - new upstream release
 
 
-* Wed Mar 26 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 1.52-2vl1
+* Tue Mar 26 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 1.52-2vl1
 - rebuild for Vine Linux
 - rebuild for Vine Linux
 
 
 * Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
 * Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>

+ 19 - 28
w/wireshark/wireshark-vl.spec

@@ -5,9 +5,9 @@
 %define _udevrulesdir /lib/udev/rules.d/
 %define _udevrulesdir /lib/udev/rules.d/
 
 
 Summary: 	Network traffic analyzer
 Summary: 	Network traffic analyzer
-Summary(ja):    ネットワークトラフィック解析プログラム
+Summary(ja):	ネットワークトラフィック解析プログラム
 Name: 		wireshark
 Name: 		wireshark
-Version:	3.4.3
+Version:	3.4.4
 Release: 	1%{_dist_release}
 Release: 	1%{_dist_release}
 Group: 		network,admin-tools
 Group: 		network,admin-tools
 Vendor:		Project Vine
 Vendor:		Project Vine
@@ -26,6 +26,7 @@ Patch4:		wireshark-0004-Restore-Fedora-specific-groups.patch
 Patch5:		wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
 Patch5:		wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
 Patch6:		wireshark-0006-Move-tmp-to-var-tmp.patch
 Patch6:		wireshark-0006-Move-tmp-to-var-tmp.patch
 Patch7:		wireshark-0007-cmakelists.patch
 Patch7:		wireshark-0007-cmakelists.patch
+Patch8:		wireshark-0008-move-glib.patch
 
 
 Patch1000:	wireshark-2.0.5-path.patch
 Patch1000:	wireshark-2.0.5-path.patch
 
 
@@ -58,10 +59,8 @@ BuildRequires:	qt5-linguist
 BuildRequires:	qt5-qtmultimedia-devel
 BuildRequires:	qt5-qtmultimedia-devel
 BuildRequires:	qt5-qtsvg-devel
 BuildRequires:	qt5-qtsvg-devel
 
 
-Requires:		%{name}-cli = %{version}-%{release}
+Requires:	%{name}-cli = %{version}-%{release}
-Requires:		usermode >= 1.37
+Requires:	usermode >= 1.37
-Requires(post):		desktop-file-utils
-Requires(postun):	desktop-file-utils
 
 
 %description
 %description
 Wireshark is a network traffic analyzer for Unix-ish operating systems.
 Wireshark is a network traffic analyzer for Unix-ish operating systems.
@@ -125,9 +124,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS -D_LARGEFILE64_SOURCE"
 export LDFLAGS="$LDFLAGS -pie -fPIC"
 export LDFLAGS="$LDFLAGS -pie -fPIC"
 export PATH="$PATH:/usr/kerberos/bin"
 export PATH="$PATH:/usr/kerberos/bin"
 
 
-mkdir build
-pushd build
-
 %cmake -G Ninja \
 %cmake -G Ninja \
   -DCMAKE_INSTALL_BINDIR=%{_sbindir} \
   -DCMAKE_INSTALL_BINDIR=%{_sbindir} \
   -DDISABLE_WERROR=ON \
   -DDISABLE_WERROR=ON \
@@ -143,17 +139,13 @@ pushd build
   -DENABLE_NETLINK=ON \
   -DENABLE_NETLINK=ON \
   -DBUILD_dcerpcidl2wrs=OFF \
   -DBUILD_dcerpcidl2wrs=OFF \
   -DBUILD_sdjournal=ON \
   -DBUILD_sdjournal=ON \
-  ..
+  %{nil}
-
-popd
 
 
-%ninja_build -C build
+%cmake_build
 
 
 
 
 %install
 %install
-rm -rf %{buildroot}
+%cmake_install
-
-%ninja_install -C build
 
 
 # Install python stuff.
 # Install python stuff.
 mkdir -p %{buildroot}%{python3_sitelib}
 mkdir -p %{buildroot}%{python3_sitelib}
@@ -175,7 +167,7 @@ mkdir -p "${IDIR}/epan/wmem"
 mkdir -p "${IDIR}/wiretap"
 mkdir -p "${IDIR}/wiretap"
 mkdir -p "${IDIR}/wsutil"
 mkdir -p "${IDIR}/wsutil"
 mkdir -p %{buildroot}%{_udevrulesdir}
 mkdir -p %{buildroot}%{_udevrulesdir}
-install -m 644 build/config.h epan/register.h "${IDIR}/"
+install -m 644 %{_vpath_builddir}/config.h epan/register.h "${IDIR}/"
 install -m 644 cfile.h file.h           "${IDIR}/"
 install -m 644 cfile.h file.h           "${IDIR}/"
 install -m 644 ws_symbol_export.h       "${IDIR}/"
 install -m 644 ws_symbol_export.h       "${IDIR}/"
 install -m 644 epan/*.h                 "${IDIR}/epan/"
 install -m 644 epan/*.h                 "${IDIR}/epan/"
@@ -212,22 +204,16 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 
 
-%post
-update-desktop-database -q
-
-%postun
-update-desktop-database -q
-
 %pre cli
 %pre cli
 getent group wireshark >/dev/null || groupadd -r wireshark
 getent group wireshark >/dev/null || groupadd -r wireshark
 getent group usbmon >/dev/null || groupadd -r usbmon
 getent group usbmon >/dev/null || groupadd -r usbmon
 
 
 %post cli
 %post cli
-/sbin/ldconfig
+# skip triggering if udevd isn't even accessible, e.g. containers or
-/sbin/udevadm trigger --subsystem-match=usbmon
+# rpm-ostree-based systems
-
+if [ -S /run/udev/control ]; then
-%postun cli
+    /usr/bin/udevadm trigger --subsystem-match=usbmon
-/sbin/ldconfig
+fi
 
 
 
 
 %files
 %files
@@ -302,6 +288,11 @@ getent group usbmon >/dev/null || groupadd -r usbmon
 
 
 
 
 %changelog
 %changelog
+* Wed Mar 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.4-1
+- new upstream release.
+- dropped update-desktop-database and ldconfig scriptlets.
+- imported Patch8 from rawhide.
+
 * Wed Feb 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.3-1
 * Wed Feb 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.3-1
 - new upstream release.
 - new upstream release.