updated 4 packages

lsb-release-3.1-1

lsb-4.0-6

mailutils-3.12-1

vine-release-7.0-0.0.3

l/lsb-release/lsb-release-vl.spec

@@ -0,0 +1,40 @@
+Summary:        Linux Standard Base Release Tools
+Name:           lsb-release
+Version:        3.1
+Release:        1%{_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPL2+
+URL:            https://github.com/thkukuk/lsb-release_os-release
+Source:         https://github.com/thkukuk/lsb-release_os-release/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+BuildArch:      noarch
+
+%description
+Tools from the Linux Standard Base project to determine the used distribution
+
+
+%prep
+%setup -q
+
+
+%build
+make
+
+
+%install
+make install INSTALL_ROOT=%{buildroot}%{_prefix}
+
+
+%files
+%license COPYING
+%doc README
+%{_bindir}/lsb?release
+%{_mandir}/man1/lsb?release.1*
+
+
+%changelog
+* Thu Mar 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1-1
+- initial build for Vine Linux.

l/lsb/lsb-vl.spec

@@ -6,37 +6,12 @@
 %define lsbldso ld-lsb.so
 %endif
 
-%ifarch ia64
-%define ldso ld-linux-ia64.so.2
-%define lsbldso ld-lsb-ia64.so
-%endif
-
-%ifarch ppc
-%define ldso ld.so.1
-%define lsbldso ld-lsb-ppc32.so
-%endif
-
-%ifarch ppc64
-%define ldso ld64.so.1
-%define lsbldso ld-lsb-ppc64.so
-%endif
-
-%ifarch s390
-%define ldso ld.so.1
-%define lsbldso ld-lsb-s390.so
-%endif
-
-%ifarch s390x
-%define ldso ld64.so.1
-%define lsbldso ld-lsb-s390x.so
-%endif
-
 %ifarch x86_64
 %define ldso ld-linux-x86-64.so.2
 %define lsbldso ld-lsb-x86-64.so
 %endif
 
-%ifarch ia64 ppc64 s390x x86_64
+%ifarch x86_64
 %define qual ()(64bit)
 %else
 %define qual %{nil}
@@ -50,11 +25,15 @@ Summary: LSB support for Vine Linux
 Summary(ja): Vine Linux の LSB サポート
 Name: lsb
 Version: 4.0
-Release: 5%{?_dist_release}
+Release: 6%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: GPLv2
 URL: http://www.linuxfoundation.org/
 Source0: %{name}-vine-%{version}.tar.bz2
-License: GPLv2
-Group: System Environment/Base
+
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: glibc-static
 # dependency for primary LSB application for v1.3
@@ -63,21 +42,6 @@ Provides: lsb = %{version}
 %ifarch %{ix86}
 %define archname ia32
 %endif
-%ifarch ia64
-%define archname ia64
-%endif
-%ifarch ppc
-%define archname ppc32
-%endif
-%ifarch ppc64
-%define archname ppc64
-%endif
-%ifarch s390
-%define archname s390
-%endif
-%ifarch s390x
-%define archname s390x
-%endif
 %ifarch x86_64
 %define archname amd64
 %endif
@@ -348,6 +312,9 @@ Requires: /usr/sbin/useradd
 Requires: /usr/sbin/userdel
 Requires: /usr/sbin/usermod
 
+Requires: /bin/mailx
+Requires: lsb-release
+
 %description
 The Linux Standard Base (LSB) is an attempt to develop a set of
 standards that will increase compatibility among Linux distributions.
@@ -356,13 +323,16 @@ Applications.  It also contains requirements that will ensure that all
 components required by the LSB that are provided by Red Hat Linux are
 installed on the system.
 
+
 %prep
 %setup -q -n %{name}-vine-%{version}
 
+
 %build
 cd lsb-release-%{upstreamlsbrelver}
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 # LSB uses /usr/lib rather than /usr/lib64 even for 64bit OS
@@ -401,64 +371,36 @@ mkdir -p $RPM_BUILD_ROOT/bin
 # it's OK to put non binary in /usr/lib.
 ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/install_initd
 ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/remove_initd
-ln -snf mail $RPM_BUILD_ROOT/bin/mailx
-
-gcc $RPM_OPT_FLAGS -Os -static -o lsb_vine_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \
-  -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE
-install -m 700 lsb_vine_trigger.%{_target_cpu} \
-  $RPM_BUILD_ROOT%{_sbindir}/lsb_vine_trigger.%{_target_cpu}
 
 cp -p lsb_vine_init $RPM_BUILD_ROOT/bin/lsb_vine_init
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}%{_bindir}
+rm -rf %{buildroot}%{_mandir}
 
-%triggerpostun -- glibc
-if [ -x /usr/sbin/lsb_vine_trigger.%{_target_cpu} ]; then
-  /usr/sbin/lsb_vine_trigger.%{_target_cpu}
-fi
 
-%ifnarch %{ix86}
-  /sbin/sln %{ldso} /%{_lib}/%{lsbldso} || :
-%else
-  if [ -f /emul/ia32-linux/lib/%{ldso} ]; then
-    for LSBVER in %{lsbsover}; do
-      /sbin/sln /emul/ia32-linux/lib/%{ldso} /%{_lib}/%{lsbldso}.$LSBVER || :
-    done
-  else
-    for LSBVER in %{lsbsover}; do
-      /sbin/sln %{ldso} /%{_lib}/%{lsbldso}.$LSBVER || :
-    done
-  fi
-%endif
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-%ifarch %{ix86}
-%post
-# make this softlink again for /emul
-  if [ -f /emul/ia32-linux/lib/%{ldso} ]; then
-    for LSBVER in %{lsbsover}; do
-      /sbin/sln /emul/ia32-linux/lib/%{ldso} /%{_lib}/%{lsbldso}.$LSBVER || :
-    done
-  fi
-%endif
 
 %files
 %defattr(-,root,root)
 %{_sysconfdir}/lsb-vine
 %dir %{_sysconfdir}/lsb-release.d
 %{_sysconfdir}/lsb-release.d/*
-%{_mandir}/*/*
-%{_bindir}/*
 /bin/lsb_vine_init
 /usr/lib/lsb
 /%{_lib}/*so*
 /lib/lsb*
-%{_sbindir}/lsb_vine_trigger.%{_target_cpu}
-/bin/mailx
+
 
 %changelog
+* Thu Mar 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0-6
+- dropped /bin/mailx: provided by mailutils.
+- dropped lsb_release: provides by lsb-release.
+- dropped scriptlets and triggers.
+
 * Mon Oct 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0-5
-- made not to require qt3.
+- dropped dependence on qt3.
 - removed stuff for unsuppoted architectures.
 
 * Fri Sep 02 2016 Toshiaki Ara <ara_t@384.jp> 4.0-4

m/mailutils/mailutils-vl.spec

@@ -0,0 +1,218 @@
+%ifarch x86_64
+%bcond_without doc
+%else
+%bcond_with doc
+%endif
+
+Name:           mailutils
+Summary:        GNU Mailutils: General-Purpose Mail Package
+Version:        3.12
+Release:        1%{_dist_release}
+Group:          internet
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPL3+
+URL:            https://mailutils.org/
+Source0:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
+
+BuildRequires:  bzip2-devel
+BuildRequires:  flex
+BuildRequires:  gdbm-devel
+BuildRequires:  gnutls-devel
+BuildRequires:  info
+BuildRequires:  libgcrypt-devel
+BuildRequires:  libunistring-devel
+BuildRequires:  libtool-ltdl-devel
+BuildRequires:  openldap-devel
+BuildRequires:  pam-devel
+BuildRequires:  perl
+BuildRequires:  readline-devel
+BuildRequires:  zlib-devel
+
+Requires:       mailutils-libs = %{version}-%{release}
+
+%global         mailx_version 8.1.2.20180807-2
+Conflicts:      mailx < %{mailx_version}
+Obsoletes:      mailx < %{mailx_version}
+Provides:       mailx = %{mailx_version}
+Provides:       config(mailx) = %{mailx_version}
+Provides:       /bin/mail
+
+%description
+GNU Mailutils is a rich and powerful protocol-independent mail
+framework. It contains a series of useful mail libraries, clients,
+and servers. These are the primary mail utilities for the GNU system.
+The central library is capable of handling electronic mail in various
+mailbox formats and protocols, both local and remote.  Specifically,
+this project contains a POP3 server, an IMAP4 server, and a Sieve mail
+filter. It also provides a POSIX `mailx' client, and a collection of
+other handy tools.
+
+
+%package        libs
+Summary:        GNU Mailutils: mailbox access library.
+Group:          system
+License:        LGPL3+
+
+%description    libs
+The runtime library libmailbox contains various mailbox access
+routines and support for a number of mailbox types, such as mbox,
+maildir, mh, POP3, and IMAP4. It also supports MIME message
+handling, and sending mail via SMTP and /sbin/sendmail.
+
+
+%package        devel
+Summary:        GNU Mailutils: mailbox access development.
+Group:          programming
+License:        LGPL3+
+Requires:       mailutils-libs = %{version}-%{release}
+
+%description    devel
+GNU Mailutils: mailbox access development.
+
+
+%package        mh
+Summary:        GNU Mailutils: The Message Handling System.
+Group:          internet
+License:        GPL3+
+Requires:       mailutils-libs = %{version}-%{release}
+
+%description mh
+The GNU MH (Message Handling System).
+
+
+%if %{with doc}
+%package        doc
+Summary:        GNU Mailutils: documentation.
+Group:          documentation
+License:        GFDL-1.2
+BuildArch:      noarch
+
+%description    doc
+API reference for libmailbox and user documentation for the rest of
+the GNU Mailutils.
+%endif
+
+
+%debug_package
+
+
+%prep
+%setup -q
+if [ %version = 3.12 ]; then
+    echo "#endif" >> include/mailutils/sys/streamtrans.h
+fi
+
+
+%build
+autoreconf -fiv
+
+%configure \
+    --disable-static \
+    --disable-rpath \
+    --enable-ipv6 \
+    --with-mail-spool=/var/spool/mail \
+    --with-mh-bindir=%{_libexecdir}/mu-mh \
+    --disable-build-pop3d \
+    --disable-build-imap4d \
+    --disable-build-comsat \
+    --disable-build-mda \
+    --disable-build-lmtpd \
+    --disable-build-putmail \
+    --disable-build-sieve \
+    --without-guile \
+    --disable-python \
+    %{nil}
+
+# SMP-incompatible build.
+make V=1
+
+
+%install
+%make_install
+
+install -d %{buildroot}/bin
+mv -f %{buildroot}%{_bindir}/mail %{buildroot}/bin/
+ln -s ./mail %{buildroot}/bin/Mail
+ln -s ./mail %{buildroot}/bin/mailx
+ln -s ../../bin/mail %{buildroot}%{_bindir}/mail
+ln -s ../../bin/mail %{buildroot}%{_bindir}/Mail
+ln -s ../../bin/mail %{buildroot}%{_bindir}/mailx
+
+%find_lang %name
+
+# unshipped files
+find %{buildroot}%{_libdir} -name "*.la" -delete
+rm -f %{buildroot}%{_mandir}/man1/{imap4d,pop3d,popauth}.1*
+rm -f %{buildroot}%{_infodir}/dir
+
+# x86_64 only (noarch)
+%if !%{with doc}
+rm -rf %{buildroot}%{_infodir}
+%endif
+
+
+%check
+#make check MH=/dev/null || { cat mh/tests/testsuite.log; exit 1; }
+make check
+
+
+%if %{with doc}
+%post doc
+/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
+
+%preun doc
+/sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
+%endif
+
+
+%files -f %name.lang
+%license COPYING*
+%doc AUTHORS THANKS NEWS README* TODO ChangeLog
+/bin/Mail
+/bin/mail
+/bin/mailx
+%{_bindir}/mailutils
+%{_bindir}/dotlock
+%{_bindir}/frm
+%{_bindir}/from
+%{_bindir}/Mail
+%{_bindir}/mail
+%{_bindir}/mailx
+%{_bindir}/messages
+%{_bindir}/mimeview
+%{_bindir}/movemail
+%{_bindir}/readmsg
+%{_bindir}/decodemail
+%{_mandir}/*/mail*
+%dir %{_libexecdir}/mailutils
+%{_libexecdir}/mailutils/*
+%dir %{_datadir}/%{name}
+
+%files libs
+%dir %{_libdir}/mailutils
+%{_libdir}/mailutils/*.so
+%{_libdir}/*.so.*
+
+%files mh
+%dir %{_libexecdir}/mu-mh
+%{_libexecdir}/mu-mh/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/mh
+
+%files devel
+%{_bindir}/mailutils-config
+%{_includedir}/mailutils
+%{_libdir}/*.so
+%{_datadir}/aclocal/mailutils.m4
+
+%if %{with doc}
+%files doc
+%{_infodir}/*
+%endif
+
+
+%changelog
+* Thu Mar 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.12-1
+- initial build for Vine Linux.

v/vine-release/vine-release-vl.spec

@@ -12,21 +12,21 @@
 #define vinebeta 1
 #define vinecr 1
 
-# release=1+, alpha/beta=0.1+, seed=0.0.1+
-%define relbase 0.0.2
-
 Summary: Vine Linux release file
 Summary(ja): Vine Linux リリースファイル
 Name: vine-release
 Version: %{vine_version}%{?vinecr:CR}
-Release: %{relbase}%{_dist_release}%{?vineseed:.seed}%{?vinebeta:.beta%{vinebeta}}
-License: BSD
-Group: System Environment/Base
+# release=1+, alpha/beta=0.1+, seed=0.0.1+
+Release: 0.0.3%{_dist_release}%{?vineseed:.seed}%{?vinebeta:.beta%{vinebeta}}
+Group: system
 Distribution: Vine Linux
 Vendor: Project Vine
 Packager: daisuke
+
+License: BSD
+
 BuildRoot: /tmp/%{name}-%{version}-root
-BuildArchitectures: noarch
+BuildArch: noarch
 Obsoletes: redhat-release
 Provides: redhat-release = %{rh_version}
 
@@ -36,6 +36,7 @@ Vine Linux release file
 %description -l ja
 Vine Linux リリースファイル
 
+
 %install
 mkdir -p ${RPM_BUILD_ROOT}/etc
 echo "Vine Linux %{vine_version} %{?vinecr:CR }%{?vineseed:(+VineSeed) }%{?vinebeta:(BETA) }(%{vine_codename})" > ${RPM_BUILD_ROOT}/etc/vine-release
@@ -49,7 +50,7 @@ VERSION="%{vine_version} %{?vinecr:CR }%{?vineseed:(+VineSeed) }%{?vinebeta:(BET
 ID="vine"
 VERSION_ID="%{vine_version}"
 ANSI_COLOR="0;34"
-CPE_NAME="cpe:/o:vinelinux:vine:%{vine_version}"
+CPE_NAME="cpe:/o:projectvine:vinelinux:%{vine_version}"
 HOME_URL="https://vinelinux.org/"
 BUG_REPORT_URL="http://mantis.vinelinux.org/"
 EOF
@@ -62,6 +63,7 @@ DISTRIB_CODENAME="%{vine_codename_lsb}"
 DISTRIB_DESCRIPTION="Vine Linux %{version}"
 EOF
 
+
 %pre
 if [ -f /etc/vine-release ]; then
     if [ ! -z "`grep CR /etc/vine-release`" ]; then
@@ -69,6 +71,7 @@ if [ -f /etc/vine-release ]; then
     fi
 fi
 
+
 %files
 %defattr(-,root,root)
 /etc/vine-release
@@ -76,7 +79,11 @@ fi
 /etc/os-release
 /etc/lsb-release
 
+
 %changelog
+* Thu Mar 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0-0.0.3vl7.seed
+- fixed CPE_NAME in os-release.
+
 * Sun Oct 29 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0-0.0.2vl7.seed
 - added /etc/{os,system}-release.
 
@@ -157,7 +164,7 @@ fi
 * Mon Jun  7 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 2.92-0vl1
 - Vine Linux 2.92
 
-* Thu Apr  4 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 2.91-1
+* Sun Apr  4 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 2.91-1
 - Vine Linux 2.91
 
 * Tue May 27 2003 Daisuke SUZUKI <daisuke@vinelinux.org> 2.90-1
@@ -219,13 +226,13 @@ fi
 * Mon Dec 28 1998 Hideya Hane <vine@flatout.org>
 - sync Vine Linux 1.0beta
 
-* Mon Oct 16 1998 Hideya Hane <vine@flatout.org>
+* Fri Oct 16 1998 Hideya Hane <vine@flatout.org>
 - sync RHL-5.2
 
-* Mon Oct 10 1998 Hideya Hane <vine@flatout.org>
+* Sat Oct 10 1998 Hideya Hane <vine@flatout.org>
 - add tcl/tk jp
 - add tgif
 
-* Mon Oct 10 1998 Hideya Hane <vine@flatout.org>
+* Sat Oct 10 1998 Hideya Hane <vine@flatout.org>
 - initial release