Browse Source

updated 11 packages

dbus-glib-0.110-1

dstat-0.7.4-1

firefox-68.7.0-1

iso-codes-4.4-1

kbd-2.2.0-1

libdb-5.3.28-12

libsmbios-2.4.3-1

par2cmdline-0.8.1-1

sgml-common-0.6.3-42

smem-1.5-1

thunderbird-68.7.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12371 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 2 years ago
parent
commit
38891d6dc5

+ 11 - 5
d/dbus-glib/dbus-glib-vl.spec

@@ -9,10 +9,10 @@
 Summary: GLib bindings for D-Bus
 Summary(ja): D-Bus の GLib バインディング
 Name: dbus-glib
-Version: 0.106
+Version: 0.110
 Release: 1%{?_dist_release}
-URL: http://www.freedesktop.org/software/dbus/
-Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
+URL: https://www.freedesktop.org/software/dbus/
+Source0: https://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
 Source1: dbus-bus-introspect.xml
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -26,6 +26,7 @@ BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gettext
 BuildRequires: autoconf
+BuildRequires: python3
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -90,7 +91,8 @@ Headers and static libraries for the D-Bus GLib bindings
 	--disable-asserts \
 	--disable-gtk-doc \
 	--with-introspect-xml=%{SOURCE1}
-%__make
+
+make %{?_smp_mflags} V=1
 
 
 %install
@@ -114,7 +116,8 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc COPYING ChangeLog NEWS
+%license COPYING
+%doc ChangeLog NEWS
 %{_sysconfdir}/bash_completion.d/dbus-bash-completion.sh
 %{_libdir}/*glib*.so.*
 %{_libexecdir}/dbus-bash-completion-helper
@@ -146,6 +149,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.110-1
+- new upstream release.
+
 * Sat Feb 13 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.106-1
 - new upstream release
 

+ 26 - 25
d/dstat/dstat-vl.spec

@@ -1,20 +1,20 @@
-Summary: Versatile resource statistics tool
-Summary(ja): 多目的リソース統計ツール
-Name: dstat
-Version: 0.7.3
-Release: 1%{?_dist_release}
-License: GPLv2
-Group: System Environment/Base
-URL: http://dag.wieers.com/home-made/dstat/
-Source: http://dag.wieers.com/home-made/dstat/dstat-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Summary:        Versatile resource statistics tool
+Summary(ja):    多目的リソース統計ツール
+Name:           dstat
+Version:        0.7.4
+Release:        1%{?_dist_release}
+Group:          System Environment/Base
+Vendor:         Project Vine
+Distribution:   Vine Linux
+BuildArch:      noarch
+
+License:        GPLv2
+URL:            http://dag.wieers.com/home-made/dstat/
+Source:         https://github.com/dstat-real/dstat/archive/v%{version}.tar.gz#/dstat-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 # Is there any BZ for this ?
-Patch0: dstat-0.6.8-dbus.patch
-
-# patch adding options switching from bytes to bits when displaying network and/or disk stats
-# Is there any BZ for this ?
-#Patch1: dstat-0.7.2-bits.patch
+Patch0:         0001-dstat-dbus.patch
 
 # This patch enables to specify disks with path to device file
 # (or with symbolic link to the device file)
@@ -24,14 +24,10 @@ Patch0: dstat-0.6.8-dbus.patch
 # dstat -d -D /dev/disk/by-path/pci-0000:00:06.0-virtio-pci-virtio3-part2
 # dstat -d -D /dev/disk/by-uuid/6df45ed6-c4ad-4054-955d-b15102f2c566
 # (BZ#766443)
-Patch2: dstat-0.7.2-disk-path.patch
-
-# Fixed inconsistency between man page and help (#852797)
-#Patch3: dstat-0.7.2-man.patch
+Patch2:         0002-dstat-disk-path.patch
 
-BuildArch: noarch
-BuildRequires: python-devel
-Requires: python
+BuildRequires:  python3-devel
+Requires:       python3
 
 %description
 Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat.
@@ -51,9 +47,7 @@ confusion, less mistakes.
 %prep
 %setup -q
 %patch0 -p1 -b .dbus
-#%patch1 -p1 -b .bits
 %patch2 -p1 -b .disk-path
-#%patch3 -p1 -b .man
 
 %build
 # Make sure the docs are in unix format
@@ -71,15 +65,22 @@ cd docs
 %{__chmod} a-x %{buildroot}/%{_datadir}/dstat/*.py
 %{__chmod} a+x %{buildroot}/%{_datadir}/dstat/dstat.py
 
+sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/python3|' %{buildroot}%{_bindir}/dstat
+
 
 %files
+%license COPYING
+%doc AUTHORS ChangeLog README* TODO docs/*.html docs/*.adoc examples/
 %dir %{_datadir}/dstat
-%doc AUTHORS ChangeLog COPYING README.md TODO docs/*.html docs/*.adoc examples/
 %{_mandir}/man1/dstat.1*
 %{_bindir}/dstat
 %{_datadir}/dstat/*.py*
 
 %changelog
+* Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.7.4-1
+- new upstream release.
+- updated Patch0 and 2.
+
 * Mon Apr 25 2016 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.7.3-1
 - new upstream release
 - deleted Patch1,3

+ 6 - 3
f/firefox/firefox-vl.spec

@@ -1,9 +1,9 @@
 %bcond_with clang
 
 # do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 68.6
-%global geckomajor 68.6
-%global ffminor 1
+%global ffmajor 68.7
+%global geckomajor 68.7
+%global ffminor 0
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
 %define tarballdir firefox-%{ffversion}
@@ -525,6 +525,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.7.0-1
+- updated to 68.7.0.
+
 * Sun Apr 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.6.1-1
 - updated to 68.6.1.
 

+ 35 - 20
i/iso-codes/iso-codes-vl.spec

@@ -1,18 +1,21 @@
 Name:		iso-codes
-Summary:	ISO code lists and translations
-Summary(ja):	ISO コード一覧および翻訳
-Version:	3.65
+Summary:        ISO code lists and translations
+Summary(ja):    ISO コード一覧および翻訳
+Version:        4.4
 Release:        1%{?_dist_release}
-License:	LGPLv2+
-Group:		System Environment/Base
-URL:		http://alioth.debian.org/projects/pkg-isocodes/
-Source:		ftp://pkg-isocodes.alioth.debian.org/downloads/iso-codes-%{version}.tar.xz
+Group:          System Environment/Base
+Vendor:         Project Vine
+Distribution:   Vine Linux
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildArch:      noarch
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildArch:	noarch
-BuildRequires:	python
-BuildRequires:  python-pyxml
-BuildRequires:  gettext
+License:        LGPLv2+
+URL:            https://salsa.debian.org/iso-codes-team/iso-codes
+Source:         https://salsa.debian.org/iso-codes-team/%{name}/-/archive/%{name}-%{version}/%{name}-%{name}-%{version}.tar.gz
+
+BuildRequires:   gettext
+BuildRequires:   python3
+Requires:        xml-common
 
 %description
 This package provides the ISO-639 Language code list, the ISO-3166
@@ -24,29 +27,41 @@ translations in gettext .po form.
 一覧、ISO-4217 通貨コード一覧、および、それらを翻訳したものが gettext
 の .po 形式で含まれています。
 
+
 %prep
-%setup -q
+%setup -q -n iso-codes-iso-codes-%{version}
+
 
 %build
 %configure
-make
+%make_build
+
 
 %install
 %__rm -rf %{buildroot}
-%makeinstall
+%make_install INSTALL="%{__install} -p"
+
+%find_lang %{name} --all-name
+
 
 %clean
 %__rm -rf %{buildroot}
 
-%files
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc ChangeLog LICENSE README TODO
-#{_datadir}/iso-codes
-%{_datadir}/xml/iso-codes
-%{_datadir}/locale/*/LC_MESSAGES/*
+%doc ChangeLog.md README.md
+%license COPYING
+%dir %{_datadir}/xml/iso-codes
+%{_datadir}/xml/iso-codes/*.xml
+%{_datadir}/iso-codes
 %{_datadir}/pkgconfig/iso-codes.pc
 
+
 %changelog
+* Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.4-1
+- new upstream release.
+
 * Wed May 04 2016 Toshiharu Kudoh <toshi.kd2@gmail.com> 3.65-1
 - new upstream release
 

+ 47 - 26
k/kbd/kbd-vl.spec

@@ -1,12 +1,20 @@
 %global convert_xkb 0
 
+# {_exec_prefix}/lib/kbd is correct even on x86_64.
+# It is traditionally used for kdb data (console fonts, keymaps, ...).
+# It is not used for any shared objects/executables.
+%global kbd_datadir /lib/kbd
+
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Summary(ja): コンソール(キーボードや仮想ターミナル等)を設定するツール群
 Name: kbd
-Version: 2.0.4
+Version: 2.2.0
 Release: 1%{?_dist_release}
-License: GPL
 Group: System Environment/Base
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: GPL
 Source0: https://www.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz
 Source1: kbd-latsun-fonts.tar.bz2
 Source2: kbd-latarcyrheb-32.tar.bz2
@@ -35,6 +43,12 @@ Patch5: kbd-1.15.5-loadkeys-search-path.patch
 # Patch6: don't hardcode font used in unicode_start, take it from vconsole.conf,
 #   bz 1101007
 Patch6: kbd-2.0.2-unicode-start-font.patch
+# Patch7: fixes issues found by static analysis
+Patch7:         kbd-2.0.4-covscan-fixes.patch
+# Patch8: fix flags
+Patch8:         kbd-2.2.0-fix-flags.patch
+# Patch9: workaround -Werror=format-security build error
+Patch9:         kbd-2.2.0-format-security.patch
 
 Obsoletes: console-tools open
 Provides: console-tools open
@@ -42,9 +56,6 @@ Conflicts: util-linux < 2.11r-9
 Requires(pre): initscripts >= 5.86-1
 ExcludeArch: s390 s390x
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 The %{name} package contains tools for managing a Linux
 system's console's behavior, including the keyboard, the screen
@@ -64,6 +75,9 @@ cp -fp %{SOURCE6} .
 %patch5 -p1 -b .loadkeys-search-path
 %endif
 %patch6 -p1 -b .unicode-start-font
+%patch7 -p1 -b .covscan-fixes
+%patch8 -p1 -b .fix-flags
+%patch9 -p1 -b .format-security
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
@@ -76,7 +90,6 @@ cp azerty/fr-latin9.map azerty/fr.map
 cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
 
 # Rename conflicting keymaps
-mv dvorak/no.map dvorak/no-dvorak.map
 mv fgGIod/trf.map fgGIod/trf-fgGIod.map
 mv olpc/es.map olpc/es-olpc.map
 mv olpc/pt.map olpc/pt-olpc.map
@@ -99,7 +112,7 @@ export OLD_PO_FILE_INPUT=yes
 # understand most of the options.
 CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
 #./configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} 
-%configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls
+%configure --prefix=%{_prefix} --datadir=%{kbd_datadir} --mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls
 make %{?_smp_mflags}
 
 %install
@@ -108,12 +121,15 @@ rm -rf $RPM_BUILD_ROOT
 # Basic install.
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# ro_win.map.gz is useless
+rm -f $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/i386/qwerty/ro_win.map.gz
+
 # Create additional name for Serbian latin keyboard
-ln -s sr-cy.map.gz $RPM_BUILD_ROOT/lib/kbd/keymaps/i386/qwerty/sr-latin.map.gz
+ln -s sr-cy.map.gz $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/i386/qwerty/sr-latin.map.gz
 
 # The rhpl keyboard layout table is indexed by kbd layout names, so we need a
 # Korean keyboard
-ln -s us.map.gz $RPM_BUILD_ROOT/lib/kbd/keymaps/i386/qwerty/ko.map.gz
+ln -s us.map.gz $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/i386/qwerty/ko.map.gz
 
 # Move binaries which we use before /usr is mounted from %{_bindir} to /bin.
 mkdir -p $RPM_BUILD_ROOT/bin
@@ -134,8 +150,8 @@ ln -s openvt.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/open.1.gz
 gzip -c %SOURCE5 > $RPM_BUILD_ROOT/%{_mandir}/man1/kbdinfo.1.gz
 
 # Move locale files to correct place
-cp -r $RPM_BUILD_ROOT/lib/kbd/locale/ $RPM_BUILD_ROOT%{_datadir}/locale
-rm -rf $RPM_BUILD_ROOT/lib/kbd/locale
+cp -r $RPM_BUILD_ROOT%{kbd_datadir}/locale/ $RPM_BUILD_ROOT%{_datadir}/locale
+rm -rf $RPM_BUILD_ROOT%{kbd_datadir}/locale
 
 # Install PAM configuration for vlock
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
@@ -143,40 +159,40 @@ install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/vlock
 
 %if 0%{convert_xkb}
 # Move original keymaps to legacy directory
-mkdir -p $RPM_BUILD_ROOT/lib/kbd/keymaps/legacy
-mv $RPM_BUILD_ROOT/lib/kbd/keymaps/{amiga,atari,i386,include,mac,ppc,sun} $RPM_B
-UILD_ROOT/lib/kbd/keymaps/legacy
+mkdir -p $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/legacy
+mv $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/{amiga,atari,i386,include,mac,ppc,sun} $RPM_B
+UILD_ROOT%{kbd_datadir}/keymaps/legacy
 
 # Convert X keyboard layouts to console keymaps
-mkdir -p $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb
+mkdir -p $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb
 perl xml2lst.pl < /usr/share/X11/xkb/rules/base.xml > layouts-variants.lst
 while read line; do
   XKBLAYOUT=`echo "$line" | cut -d " " -f 1`
   echo "$XKBLAYOUT" >> layouts-list.lst
   XKBVARIANT=`echo "$line" | cut -d " " -f 2`
-  ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip > $RPM_BUILD_ROOT/lib/kbd/keymaps/xk
+  ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip > $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xk
 b/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
 done < layouts-variants.lst
 
 # Convert X keyboard layouts (plain, no variant)
 cat layouts-list.lst | sort -u >> layouts-list-uniq.lst
 while read line; do
-  ckbcomp "$line" | gzip > $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/"$line".map.gz
+  ckbcomp "$line" | gzip > $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/"$line".map.gz
 done < layouts-list-uniq.lst
 
 # wipe converted layouts which cannot input ASCII (#1031848)
-zgrep -L "U+0041" $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/* | xargs rm -f
+zgrep -L "U+0041" $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/* | xargs rm -f
 
 # Rename the converted default fi (kotoistus) layout (#1117891)
-gunzip $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/fi.map.gz
-mv $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/fi.map $RPM_BUILD_ROOT/lib/kbd/keymaps/xk
+gunzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi.map.gz
+mv $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi.map $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xk
 b/fi-kotoistus.map
-gzip $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/fi-kotoistus.map
+gzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi-kotoistus.map
 
 # Fix converted cz layout - add compose rules
-gunzip $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/cz.map.gz
-patch $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/cz.map < %{SOURCE6}
-gzip $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/cz.map
+gunzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map.gz
+patch $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map < %{SOURCE6}
+gzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map
 %endif
 
 %find_lang %{name}
@@ -189,15 +205,20 @@ gzip $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/cz.map
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc ChangeLog AUTHORS README COPYING docs/doc/kbd.FAQ*.html docs/doc/font-formats/*.html docs/doc/utf/utf* docs/doc/dvorak/*
+%license COPYING
+%doc ChangeLog AUTHORS README docs/doc/kbd.FAQ*.html docs/doc/font-formats/*.html docs/doc/utf/utf* docs/doc/dvorak/*
 /bin/*
 %{_bindir}/*
 %{_mandir}/*/*
-/lib/kbd
+%{kbd_datadir}
 %config(noreplace) %{_sysconfdir}/pam.d/vlock
 
 
 %changelog
+* Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.0-1
+- new upstream release.
+- imported Patch7-9 from rawhide.
+
 * Sun Sep 24 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.4-1
 - new upstream release.
 

+ 23 - 4
lib/libd/libdb/libdb-vl.spec

@@ -2,6 +2,7 @@
 
 %define __soversion_major 5
 %define __soversion %{__soversion_major}.3
+%define __tclversion 8.6
 
 %bcond_with java
 
@@ -9,7 +10,7 @@ Summary: The Berkeley DB database library for C
 Summary(ja): C 言語用 Berkeley DB データベースライブラリ
 Name: libdb
 Version: 5.3.28
-Release: 11%{?_dist_release}
+Release: 12%{?_dist_release}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 # For mt19937db.c
@@ -48,12 +49,22 @@ Patch33: db-5.3.28-cwd-db_config.patch
 Patch34: libdb-5.3.21-region-size-check.patch
 # Patch sent upstream
 Patch35: checkpoint-opd-deadlock.patch
+Patch36: db-5.3.28-atomic_compare_exchange.patch
+# CDB race (rhbz #1099509)
+Patch37: libdb-cbd-race.patch
+# Limit concurrency to max 1024 CPUs (rhbz#1245410)
+# A fix for the issue should be in an upstream release already
+# https://community.oracle.com/message/13274780#13274780
+Patch38: libdb-limit-cpu.patch
+# rhbz#1608749 Patch sent upstream
+# Expects libdb-5.3.21-mutex_leak.patch applied
+Patch39: libdb-5.3.21-trickle_cpu.patch
 
 URL: http://www.oracle.com/database/berkeley-db/
 License: BSD and LGPLv2 and Sleepycat
 Group: System Environment/Libraries
 BuildRequires: perl libtool
-BuildRequires: tcl-devel >= 8.5.2-3
+BuildRequires: tcl-devel >= %{__tclversion}
 %if %{with java}
 BuildRequires: java-devel >= 1:1.6.0
 %endif
@@ -314,6 +325,10 @@ popd
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
 
 cd dist
 ./s_config
@@ -350,7 +365,7 @@ pushd dist/dist-tls
 	--enable-sql \
 	--enable-test \
 	--disable-rpath \
-	--with-tcl=%{_libdir}/tcl8.5 \
+	--with-tcl=%{_libdir}/tcl%{__tclversion} \
 %if %{with java}
 	--enable-java
 %endif
@@ -461,7 +476,8 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README lgpl-2.1.txt
+%license LICENSE lgpl-2.1.txt
+%doc README
 %{_libdir}/libdb-%{__soversion}.so
 %{_libdir}/libdb-%{__soversion_major}.so
 
@@ -563,6 +579,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.3.28-12
+- imported Patch36-39 from rawhide.
+
 * Fri Dec 22 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.3.28-11
 - added Patch28-15.
 

+ 65 - 219
lib/libs/libsmbios/libsmbios-vl.spec

@@ -1,40 +1,33 @@
-# pkg/libsmbios.spec.  Generated from libsmbios.spec.in by configure.
-# required by suse build system
-# norootforbuild
-
-# these are all substituted by autoconf
-%define major 2
-%define minor 3
-%define micro 0
-%define extra %{nil}
-%define pot_file  libsmbios
-%define lang_dom  libsmbios-2.3-x86_64
-%define release_version 2.3.0
-
-%define release_name libsmbios
-
-Name: %{release_name}
-Version: %{release_version}
+Name: libsmbios
+Version: 2.4.3
 Release: 1%{?_dist_release}
 Summary: Libsmbios C/C++ shared libraries
 Summary(ja): Libsmbios C/C++ 共有ライブラリ
-
-License: GPLv2+ or OSL 2.1
 Group: System Environment/Libraries
-URL: http://linux.dell.com/libsmbios/main
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: shaolin, daisuke
 
-Source: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/libsmbios-%{version}.tar.xz
+License: GPLv2+ or OSL 2.1
+URL: https://github.com/dell/libsmbios
+Source: https://github.com/dell/libsmbios/archive/v%{version}.tar.gz#/libsmbios-%{version}.tar.gz
+Source100: ChangeLog.fedora
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: strace libxml2-devel gcc-c++ gettext doxygen cppunit-devel pkgconfig python-devel
+Obsoletes: python-smbios < %{version}-%{release}
 
 # libsmbios only ever makes sense on intel compatible arches
 # no DMI tables on ppc, s390, etc.
 ExclusiveArch: x86_64 ia64 %{ix86}
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: shaolin, daisuke
+# these are all substituted by autoconf
+%define pot_file  libsmbios
+%define lang_dom  libsmbios-2.4-x86_64
 
+%define major %(echo %{version} | sed -e 's/^\\([0-9]*\\)\..*$/\\1/')
+%define minor %(echo %{version} | sed -e 's/^[0-9]*\\.\\([0-9]*\\).*$/\\1/')
+%define micro %(echo %{version} | sed -e 's/^[0-9]*\\.[0-9]*\\.\\([0-9]*\\).*$/\\1/')
+%define extra %{nil}
 
 %description
 Libsmbios is a library and utilities that can be used by client programs to get
@@ -47,22 +40,24 @@ actively maintained, but provided for backwards compatibility. New programs
 should use the libsmbios C interface.
 
 
-%package -n python-smbios
+%package -n python3-smbios
 Summary: Python interface to Libsmbios C library
 Summary(ja): libsmbios C ライブラリへの Python インターフェース
 Group: System Environment/Libraries
-Requires: %{release_name} = %{version}-%{release}
-Requires: python
+BuildRequires: python3-devel python3-setuptools python3-rpm-macros
+Requires: %{name} = %{version}-%{release}
+Requires: python3
+
 
-%description -n python-smbios
+%description -n python3-smbios
 This package provides a Python interface to libsmbios
 
 %package -n smbios-utils
 Summary: Meta-package that pulls in all smbios binaries and python scripts
 Summary(ja): すべての smbios プログラムと python スクリプトをインストールするための仮想パッケージ
 Group: Applications/System
-Requires: smbios-utils-bin
-Requires: smbios-utils-python
+Requires: smbios-utils-bin = %{version}-%{release}
+Requires: smbios-utils-python3 = %{version}-%{release}
 
 %description -n smbios-utils
 This is a meta-package that pulls in the binary libsmbios executables as well
@@ -72,19 +67,21 @@ as the python executables.
 Summary: Binary utilities that use libsmbios
 Summary(ja): libsmbios を用いたユーティリティ集
 Group: Applications/System
-Requires: %{release_name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description -n smbios-utils-bin
 Get BIOS information, such as System product name, product id, service tag and
 asset tag.
 
-%package -n smbios-utils-python
+%package -n smbios-utils-python3
 Summary: Python executables that use libsmbios
 Summary(ja): libsmbios を用いた Python スクリプト集
 Group: Applications/System
-Requires: python-smbios = %{version}-%{release}
+Requires: python3-smbios = %{version}-%{release}
+Obsoletes: smbios-utils-python < %{version}-%{release}
+Provides: smbios-utils-python = %{version}-%{release}
 
-%description -n smbios-utils-python
+%description -n smbios-utils-python3
 Get BIOS information, such as System product name, product id, service tag and
 asset tag. Set service and asset tags on Dell machines. Manipulate wireless
 cards/bluetooth on Dell laptops. Set BIOS password on select Dell systems.
@@ -95,7 +92,7 @@ Update BIOS on select Dell systems. Set LCD brightness on select Dell laptops.
 Summary: Development headers and archives
 Summary(ja): libsmbios の開発用ヘッダファイルとライブラリ
 Group: Development/Libraries
-Requires: %{release_name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description -n libsmbios-devel
 Libsmbios is a library and utilities that can be used by client programs to get
@@ -105,12 +102,12 @@ This package contains the headers and .a files necessary to compile new client
 programs against libsmbios.
 
 %prep
-
 %setup -q -n libsmbios-%{version}
 find . -type d -exec chmod -f 755 {} \;
 find doc src -type f -exec chmod -f 644 {} \;
 chmod 755 src/cppunit/*.sh
 
+
 %build
 # this line lets us build an RPM directly from a git tarball
 # and retains any customized version information we might have
@@ -121,6 +118,7 @@ cd _build
 echo '../configure "$@"' > configure
 chmod +x ./configure
 
+export PYTHON=%{__python3}
 %configure
 
 mkdir -p out/libsmbios_c
@@ -129,6 +127,7 @@ make %{?_smp_mflags} 2>&1 | tee build-%{_arch}.log
 
 echo \%doc _build/build-%{_arch}.log > buildlogs.txt
 
+
 %install
 rm -rf %{buildroot}
 mkdir %{buildroot}
@@ -141,6 +140,7 @@ mkdir -p %{buildroot}/%{_bindir}
 cp -a $TOPDIR/src/include/*  %{buildroot}/%{_includedir}/
 cp -a out/public-include/*  %{buildroot}/%{_includedir}/
 rm -f %{buildroot}/%{_libdir}/lib*.{la,a}
+rm -f %{buildroot}/%{_includedir}/Makefile.am
 find %{buildroot}/%{_includedir} out/libsmbios_c++ out/libsmbios_c -exec touch -r $TOPDIR/configure.ac {} \;
 
 mv out/libsmbios_c++  out/libsmbios_c++-%{_arch}
@@ -150,25 +150,14 @@ rename %{pot_file}.mo %{lang_dom}.mo $(find %{buildroot}/%{_datadir} -name %{pot
 %find_lang %{lang_dom}
 
 touch files-yum-dellsysid
-touch files-smbios-utils-python
-touch files-python-smbios
-
-# backwards compatible:
-ln -s %{_sbindir}/dellWirelessCtl %{buildroot}/%{_bindir}/dellWirelessCtl
-ln -s smbios-sys-info %{buildroot}/%{_sbindir}/getSystemId
-ln -s smbios-wireless-ctl %{buildroot}/%{_sbindir}/dellWirelessCtl
-ln -s smbios-lcd-brightness %{buildroot}/%{_sbindir}/dellLcdBrightness
-ln -s smbios-rbu-bios-update %{buildroot}/%{_sbindir}/dellBiosUpdate
-
-cat > files-python-smbios <<-EOF
-	%doc COPYING-GPL COPYING-OSL README
-	%{python_sitelib}/*
+touch files-smbios-utils-python3
+touch files-python3-smbios
+
+cat > files-python3-smbios <<-EOF
+	%{python3_sitearch}/*
 EOF
 
-cat > files-smbios-utils-python <<-EOF
-	%doc COPYING-GPL COPYING-OSL README
-	%doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
-	%doc doc/pkgheader.sh
+cat > files-smbios-utils-python3 <<-EOF
 	%dir %{_sysconfdir}/libsmbios
 	%config(noreplace) %{_sysconfdir}/libsmbios/*
 	
@@ -178,18 +167,10 @@ cat > files-smbios-utils-python <<-EOF
 	%{_sbindir}/smbios-passwd
 	%{_sbindir}/smbios-wakeup-ctl
 	%{_sbindir}/smbios-wireless-ctl
-	%{_sbindir}/smbios-rbu-bios-update
 	%{_sbindir}/smbios-lcd-brightness
 	%{_sbindir}/smbios-keyboard-ctl
 	%{_sbindir}/smbios-thermal-ctl
-
-	# symlinks: backwards compat
-	%{_sbindir}/dellLcdBrightness
-	%{_sbindir}/getSystemId
-	%{_sbindir}/dellWirelessCtl
-	%{_sbindir}/dellBiosUpdate
-	# used by HAL in old location, so keep it around until HAL is updated.
-	%{_bindir}/dellWirelessCtl
+	%{_sbindir}/smbios-battery-ctl
 
 	# data files
 	%{_datadir}/smbios-utils
@@ -198,20 +179,19 @@ EOF
 %clean
 rm -rf %{buildroot}
 
-%post   -n %{release_name}   -p /sbin/ldconfig
-%postun -n %{release_name}   -p /sbin/ldconfig
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files -f _build/%{lang_dom}.lang
 %defattr(-,root,root,-)
+%license COPYING* src/bin/getopts_LICENSE.txt src/include/smbios_c/config/boost_LICENSE_1_0_txt
+%doc README*
 %{_libdir}/libsmbios_c.so.*
-%{_libdir}/libsmbios.so.*
 
 %files -n libsmbios-devel -f _build/buildlogs.txt
 %defattr(-,root,root,-)
-%doc COPYING-GPL COPYING-OSL README src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
 %{_includedir}/smbios
 %{_includedir}/smbios_c
-%{_libdir}/libsmbios.so
 %{_libdir}/libsmbios_c.so
 %{_libdir}/pkgconfig/*.pc
 %doc _build/out/libsmbios_c++-%{_arch}
@@ -220,21 +200,15 @@ rm -rf %{buildroot}
 %files -n smbios-utils
 # opensuse 11.1 enforces non-empty file list :(
 %defattr(-,root,root,-)
-%doc COPYING-GPL COPYING-OSL README
+%license COPYING-GPL COPYING-OSL
+%doc README*
 # no other files.
 
 %files -n smbios-utils-bin
 %defattr(-,root,root,-)
-%doc COPYING-GPL COPYING-OSL README
-%doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
-%doc doc/pkgheader.sh
-#
-# legacy C++
-%{_sbindir}/dellBiosUpdate-compat
-%{_sbindir}/dellLEDCtl
-%ifnarch ia64
-%{_sbindir}/dellMediaDirectCtl
-%endif
+%license COPYING-GPL COPYING-OSL
+%license src/bin/getopts_LICENSE.txt src/include/smbios_c/config/boost_LICENSE_1_0_txt
+%doc README*
 #
 # new C utilities
 %{_sbindir}/smbios-state-byte-ctl
@@ -242,14 +216,25 @@ rm -rf %{buildroot}
 %{_sbindir}/smbios-upflag-ctl
 %{_sbindir}/smbios-sys-info-lite
 
-%files -n python-smbios -f _build/files-python-smbios
+%files -n python3-smbios -f _build/files-python3-smbios
 %defattr(-,root,root,-)
+%license COPYING-GPL COPYING-OSL
+%doc README*
 
-%files -n smbios-utils-python -f _build/files-smbios-utils-python
+%files -n smbios-utils-python3 -f _build/files-smbios-utils-python3
 %defattr(-,root,root,-)
+%license COPYING-GPL COPYING-OSL
+%license src/bin/getopts_LICENSE.txt src/include/smbios_c/config/boost_LICENSE_1_0_txt
+%doc README*
 
 
 %changelog
+* Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.3-1
+- new upstream release.
+- dropped python2 support.
+- added python3 support.
+- truncated %%changelog: old logs are ChangeLog.fedora.
+
 * Sat Jul  2 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.0-1
 - new upstream release.
 
@@ -264,142 +249,3 @@ rm -rf %{buildroot}
 - merged with upstream package
   * Sat May 24 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.0.1-3
   - initial build for Vine Linux
-
-* Mon Sep 27 2010 Matt Domsch <mdomsch@fedoraproject.org> - 2.2.26-3
-- build for Fedora 15
-
-* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 2.2.19-2
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Fri Jul 06 2010 Michael Brown <michael-e_brown at dell.com> - 2.2.26-1
-- implement CSV export of token settings from smbios-token-ctl
-
-* Fri Jul 06 2010 Michael Brown <michael-e_brown at dell.com> - 2.2.25-1
-- Fix breakage resulting from improperly fixing up constructors for MemoryAccess/CmosAccess. Fixes CLI utilities.
-
-* Fri Jun 11 2010 Michael Brown <michael-e_brown at dell.com> - 2.2.23-1
-- Fixup ABI break where a couple functions that should have been exported were not marked.
-
-* Thu Jun 10 2010 Michael Brown <michael-e_brown at dell.com> - 2.2.22-1
-- Fixup bug in reading asset and service tag where it A) read checksum from wrong location and B) used wrong comparison check to validate it
-- enable service tag SET for machines that still set service tag in CMOS
-- ABI/API - change to -fvisibility=hidden for libsmbios_c.so.*, mark public api's. This removes all non-public symbols that were not formerly part of the ABI from the dynamic link table.
-
-* Mon May 18 2009 Matt Domsch <Matt_Domsch@dell.com> - 2.2.16-3
-- split yum plugin into yum-dellsysid package
-
-* Mon Mar 24 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.16-1
-- add gcc 4.4 support
-
-* Mon Mar 24 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.15-1
-- update to lastest upstream.
-- fixes bug in bios update on systems with versions like x.y.z.
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Feb 3 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.12-1
-- Add feature to turn on debugging printf()'s without recompiling by setting
-  certain environment variables:
-    LIBSMBIOS_C_DEBUG_OUTPUT_ALL    -- all debugging output
-        or, per module:
-    LIBSMBIOS_C_DEBUG_CONSTRUCTOR_C
-    LIBSMBIOS_C_DEBUG_SYSINFO_C
-    LIBSMBIOS_C_DEBUG_SMBIOS_C
-    LIBSMBIOS_C_DEBUG_TOKEN_C
-    LIBSMBIOS_C_DEBUG_MEMORY_C
-    LIBSMBIOS_C_DEBUG_CMOS_C
-    LIBSMBIOS_C_DEBUG_SMI_C
-
-* Mon Feb 2 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.12-1
-- Add pkgconfig files to -devel
-- fixup yum plugin to not parse certain data that causes a crash on some machines (Optiplex 755, others may be affected)
-
-* Thu Jan 15 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.8-1
-- revert change in upstream renaming rpm to libsmbios2
-
-* Thu Jan 15 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.7-1
-- change source to bz2 format
-- Update to latest upstream release. Many changes in the new release:
-  - python interface
-  - libsmbios_c interface almost fully implemented
-  - libsmbios c++ interface deprecated
-
-* Tue Oct 28 2008 Michael E Brown <michael_e_brown at dell.com> - 2.2.0-1
-- Spec updates
-
-* Mon Apr 21 2008 Michael E Brown <michael_e_brown at dell.com> - 2.0.1-2.1
-- obsolete libsmbios-libs as well
-
-* Mon Mar 3 2008 Michael E Brown <michael_e_brown at dell.com> - 2.0.1-2
-- properly obsolete older versions
-
-* Wed Feb 13 2008 Michael E Brown <michael_e_brown at dell.com> - 2.0.1
-- Fixup GCC 4.3 compile issues.
-
-* Wed Jan 9 2008 Michael E Brown <michael_e_brown at dell.com> - 2.0.0
-- ABI incompatible, minor API changes
-- sync up libsmbios soname with version #
-- move binaries to /usr/sbin as they are only runnable by root
-- drop libsmbiosxml lib as it was mostly unused.
-- drop autotools generated files out of git and add autogen.sh
-- drop tokenCtl binary-- pysmbios has a *much* improved version
-
-* Wed Aug 22 2007 Michael E Brown <michael_e_brown at dell.com> - 0.13.9
-- Fix a couple of failure-to-check-return on fopen. most were unit-test code
-  only, but two or three were in regular code.
-- Add hinting to the memory class, so that it can intelligently close /dev/mem
-  file handle when it is not needed (which is most of the time). it only
-  leaves it open when it is scanning, so speed is not impacted.
-
-* Tue Aug 6 2007 Michael E Brown <michael_e_brown at dell.com> - 0.13.8
-- new upstream
-
-* Tue Apr 3 2007 Michael E Brown <michael_e_brown at dell.com> - 0.13.6
-- critical bugfix for dellBiosUpdate utility for packet mode
-- autoconf/automake support for automatically building docs
-- more readable 'make' lines by splitting out env vars
-- remove run_cppunit option... always run unit tests.
-- update autoconf/automake utilities to latest version
-- fix LDFLAGS to not overwrite user entered LDFLAGS
-- add automatic doxygen build of docs
-- fix urls of public repos
-- remove yum repo page in favor of official page from docs
-- split dmi table entry point from smbios table entry point
-- support legacy _DMI_ tables
-- fix support for EFI-based imacs without proper _SM_ anchor
-
-* Tue Mar 20 2007 Michael E Brown <michael_e_brown at dell.com> - 0.13.5
-- rpmlint cleanups
-- Add dellLEDCtl binary
-- update AUTHORS file to add credit for dellLEDCtl
-- update doc/DellToken.txt to add a few more useful tokens.
-- updated build system to create documentation
-- skip cppunit dep on .elX builds (not in EPEL yet)
-
-* Mon Mar 12 2007 Michael E Brown <michael_e_brown at dell.com> - 0.13.4-1
-- Added dellWirelessCtl binary
-- Added 'static' makefile target to build static binaries and clean them as well
-- fix for signed/unsigned bug in probes binary. CPU temp misreported
-- simplify interface for DELL_CALLING_INTERFACE_SMI, autodetect Port/Magic
-- document all of the tokens for controlling wireless on dell notebooks
-- enums for SMI args/res to make code match docs better (cbRES1 = res[0], which
-  was confusing.
-- helper functions isTokenActive() and activateToken() to simplify token API.
-- Added missing windows .cpp files to the dist tarball for those who compile
-  windows from dist tarball vs source control
-- Add support for EFI based machines without backwards compatible smbios table
-  entry point in 0xF0000 block.
-- Added wirelessSwitchControl() and wirelessRadioControl() API for newer
-  laptops.
-- fixed bug in TokenDA activate() code where it wasnt properly using SMI
-  (never worked, but apparently wasnt used until now.)
-
-* Tue Oct 3 2006 Michael E Brown <Michael_E_Brown@Dell.com> - 0.13.0-1
-- autotools conversion
-- add Changelog
-
-* Tue Sep 26 2006 Michael E Brown <michael_e_brown at dell.com> - 0.12.4-1
-- Changes per Fedora Packaging Guidelines to prepare to submit to Extras.
-- Add in a changelog entry per Fedora Packaging Guidelines...
-

+ 23 - 16
p/par2cmdline/par2cmdline-vl.spec

@@ -1,14 +1,16 @@
+%bcond_without test
+
 Name:           par2cmdline
 Summary:        PAR 2.0 compatible file verification and repair tool
-Version:        0.4
-Release:        2%{?_dist_release}
-
+Version:        0.8.1
+Release:        1%{?_dist_release}
 Group:          Applications/Archiving
-License:        GPLv2+
-URL:            http://parchive.sourceforge.net/
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Source:         http://downloads.sourceforge.net/project/parchive/par2cmdline/0.4/%{name}-%{version}.tar.gz
-Patch1:         par2cmdline-0.4-debian.patch
+License:        GPLv2+
+URL:            https://github.com/Parchive/par2cmdline/
+Source:         https://github.com/Parchive/par2cmdline/releases/download/v%{version}/par2cmdline-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Obsoletes:      parchive <= 1.1.4
@@ -24,7 +26,6 @@ multi-part archives.
 
 %prep
 %setup -q 
-%patch1 -p1
 
 # fix end-of-lines of several files
 sed -i 's/\r//' AUTHORS PORTING README ROADMAP
@@ -33,35 +34,41 @@ sed -i 's/\r//' AUTHORS PORTING README ROADMAP
 %build
 %configure
 make %{_smp_mflags}
-chmod 644 ChangeLog galois.h par1repairer.cpp par2repairer.cpp par2repairersourcefile.cpp par2repairersourcefile.h
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-%makeinstall
-ln -sf par2 $RPM_BUILD_ROOT/%{_bindir}/par
+rm -rf %{buildroot}
+%make_install
+ln -sf par2 %{buildroot}/%{_bindir}/par
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
+%if %{with test}
 %check
-chmod +x test[1-6] pretest posttest
 make check-TESTS
+%endif
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README 
+%license COPYING
+%doc AUTHORS ChangeLog README*
 %{_bindir}/par	
 %{_bindir}/par2	
 %{_bindir}/par2create	
 %{_bindir}/par2repair	
 %{_bindir}/par2verify
+%{_mandir}/man1/par2.1*
+
 
 %changelog
+* Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8.1-1
+- new upstream release.
+- dropped Patch1.
+
 * Fri Sep 02 2016 Toshiaki Ara <ara_t@384.jp> 0.4-2
 - rebuild with gcc-5.4.0
 

+ 71 - 33
s/sgml-common/sgml-common-vl.spec

@@ -1,37 +1,40 @@
 %global xmlxsdver 2009/01
 
-Summary:	Common SGML catalog and DTD files.
-Summary(ja):	共用 SGML カタログ及び DTD ファイル集
-Name:		sgml-common
-Version:	0.6.3
-Release:	41%{?_dist_release}
-
-License:	GPL+
-Group:		Applications/Text
+Summary:        Common SGML catalog and DTD files.
+Summary(ja):    共用 SGML カタログ及び DTD ファイル集
+Name:           sgml-common
+Version:        0.6.3
+Release:        42%{?_dist_release}
+Group:          Applications/Text
+Vendor:         Project Vine
+Distribution:   Vine Linux
+BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+
+License:        GPL+
 #Actually - there is no homepage of this project, on that URL
 #page you could get complete ISO 8879 listing as was on the
 #old page - only part of it is included in sgml-common package.
-URL: http://www.w3.org/2003/entities/
-
-Source0: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tgz
+URL:            http://www.w3.org/2003/entities/
+Source0:        ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tgz
 # From openjade:
-Source1: xml.dcl
-Source2: xml.soc
-Source3: html.dcl
-Source4: html.soc
-Source5: http://www.w3.org/%{xmlxsdver}/xml.xsd
-Patch0: sgml-common-umask.patch
-Patch1: sgml-common-xmldir.patch
-Patch2: sgml-common-quotes.patch
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	libxml2 >= 2.4.8
-BuildRequires:	automake
-Requires:	/bin/basename
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Source1:        xml.dcl
+Source2:        xml.soc
+Source3:        html.dcl
+Source4:        html.soc
+Source5:        http://www.w3.org/%{xmlxsdver}/xml.xsd
+Source6:        http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd
+Source7:        http://www.w3.org/2001/XMLSchema.dtd
+Source8:        http://www.w3.org/2001/datatypes.dtd
+Source9:        sgmlwhich.1
+Source10:       sgml.conf.5
+Patch0:         sgml-common-umask.patch
+Patch1:         sgml-common-xmldir.patch
+Patch2:         sgml-common-quotes.patch
+
+BuildRequires:  libxml2 >= 2.4.8
+BuildRequires:  automake
+Requires:       /bin/basename
 
 %description
 The sgml-common package contains a collection of entities and DTDs
@@ -71,7 +74,6 @@ done
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT htmldir='%{_datadir}/doc' INSTALL='install -p'
 
-#cp %{SOURCE1} CHANGES
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xml
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sgml/docbook
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/sgml/docbook
@@ -87,6 +89,10 @@ for type in system uri ; do
 			"http://www.w3.org/$path/xml.xsd" \
 			"file://%{_datadir}/xml/xml.xsd" $XMLCATALOG
 	done
+	# Add xmldsig-core-schema.xsd to catalog
+	%{_bindir}/xmlcatalog --noout --add $type \
+		"http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd" \
+		"file://%{_datadir}/xml/xmldsig-core-schema.xsd" $XMLCATALOG
 done
 
 # Now put the common DocBook entries in it
@@ -105,6 +111,15 @@ done
 %{_bindir}/xmlcatalog --noout --add "delegateURI" \
 	"http://www.oasis-open.org/docbook/" \
 	"file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+for public in "-//W3C//DTD XMLSchema 200102//EN" "-//W3C//DTD XMLSCHEMA 200102//EN" ; do
+	%{_bindir}/xmlcatalog --noout --add "public" \
+		"$public" \
+		"file://%{_datadir}/xml/XMLSchema.dtd" $XMLCATALOG
+done
+%{_bindir}/xmlcatalog --noout --add "system" \
+	"http://www.w3.org/2001/XMLSchema.dtd" \
+	"file://%{_datadir}/xml/XMLSchema.dtd" $XMLCATALOG
+
 # Also create the common DocBook catalog
 %{_bindir}/xmlcatalog --noout --create \
 	$RPM_BUILD_ROOT%{_sysconfdir}/sgml/docbook/xmlcatalog
@@ -115,7 +130,12 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/sgml/xml.dcl
 install -p -m0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
 	$RPM_BUILD_ROOT%{_datadir}/sgml
 rm -rf $RPM_BUILD_ROOT%{_datadir}/xml/*
-install -p -m0644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xml
+install -p -m0644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \
+        $RPM_BUILD_ROOT%{_datadir}/xml
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
+install -p -m0644 %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m0644 %{SOURCE10} $RPM_BUILD_ROOT%{_mandir}/man5
 
 # remove installed doc file and prepare installation with %%doc
 rm -f $RPM_BUILD_ROOT%{_datadir}/doc/*.html
@@ -135,12 +155,21 @@ if [ $1 -gt 1 ] && [ -e %{_sysconfdir}/xml/catalog ]; then
 				"file://%{_datadir}/xml/xml.xsd" \
 				%{_sysconfdir}/xml/catalog
 		done
+		%{_bindir}/xmlcatalog --noout --add $type \
+			"http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd" \
+			"file://%{_datadir}/xml/xmldsig-core-schema.xsd" %{_sysconfdir}/xml/catalog
+	done
+	for public in "-//W3C//DTD XMLSchema 200102//EN" "-//W3C//DTD XMLSCHEMA200102//EN" ; do
+		%{_bindir}/xmlcatalog --noout --add "public" \
+			"$public" \
+			"file://%{_datadir}/xml/XMLSchema.dtd" %{_sysconfdir}/xml/catalog
 	done
 fi
 
 %files
 %defattr (-,root,root)
-%doc __dist_doc/html/ AUTHORS NEWS ChangeLog COPYING README
+%license COPYING
+%doc __dist_doc/html/ AUTHORS NEWS ChangeLog README
 %dir %{_sysconfdir}/sgml
 %config(noreplace) %{_sysconfdir}/sgml/sgml.conf
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/sgml/catalog
@@ -154,11 +183,15 @@ fi
 %{_bindir}/sgmlwhich
 %{_bindir}/install-catalog
 %{_mandir}/man8/install-catalog.8*
+%{_mandir}/man1/sgmlwhich.1*
+%{_mandir}/man5/sgml.conf.5*
 
 %files -n xml-common
 %defattr (-,root,root)
-%doc AUTHORS NEWS ChangeLog COPYING README
+%license COPYING
+%doc AUTHORS NEWS ChangeLog README
 %dir %{_sysconfdir}/xml
+%dir %{_sysconfdir}/sgml
 %dir %{_sysconfdir}/sgml/docbook
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xml/catalog
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook/xmlcatalog
@@ -167,9 +200,14 @@ fi
 %{_datadir}/sgml/docbook/xmlcatalog
 %dir %{_datadir}/xml
 %{_datadir}/xml/xml.xsd
-
+%{_datadir}/xml/xmldsig-core-schema.xsd
+%{_datadir}/xml/XMLSchema.dtd
+%{_datadir}/xml/datatypes.dtd
 
 %changelog
+* Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.6.3-42
+- imported Source6-10 from rawhide.
+
 * Sun Nov 16 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.6.3-41
 - updated based on Fedora 0.6.3-41
   * Thu Oct 11 2012 Ondrej Vasik <ovasik@redhat.com> 0.6.3-38

+ 14 - 10
s/smem/smem-vl.spec

@@ -1,16 +1,16 @@
 Name:           smem
-Version:        1.4
-Release:        5%{?_dist_release}
+Version:        1.5
+Release:        1%{?_dist_release}
 Summary:        Report application memory usage in a meaningful way
+Vendor:         Project Vine
+Distribution:   Vine Linux
+BuildArch:      noarch
 
 License:        GPLv2+
 URL:            http://www.selenic.com/smem/
-Source0:        http://www.selenic.com/smem/download/smem-%{version}.tar.gz
-BuildArch:      noarch
+Source0:        http://www.selenic.com/smem/download/smem-%{version}.tar.xz
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
+Patch0:         smem-1.5-python3path.patch
 
 %description
 smem is a tool that can give numerous reports on memory usage on Linux
@@ -25,8 +25,9 @@ instead measures each application's "fair share" of each shared area to give
 a realistic measure.
 
 %prep
-
 %setup -q
+%patch0 -p1 -b py3
+
 
 %build
 
@@ -37,13 +38,16 @@ install -D -p -m 644 smem.8 $RPM_BUILD_ROOT/%{_mandir}/man8/smem.8
  
 
 %files
-%doc COPYING
+%license COPYING
 %{_bindir}/smem
 %{_mandir}/man8/smem.8*
 
 %changelog
+* Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.5-1
+- new upstream release.
+
 * Sat May 28 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.4-5
-- initisla build for Vine Linux.
+- initial build for Vine Linux.
 
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

+ 4 - 1
t/thunderbird/thunderbird-vl.spec

@@ -36,7 +36,7 @@
 Summary:	Thunderbird Community Edition, Mail/newsgroup client
 Summary(ja):	Thunderbirdコミュニティエディション, メール・ニュースクライアント
 Name:		thunderbird
-Version:	68.6.0
+Version:	68.7.0
 Release:	1%{?_dist_release}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -479,6 +479,9 @@ fi
 #===============================================================================
 
 %changelog
+* Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.7.0-1
+- new upstream release.
+
 * Thu Mar 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.6.0-1
 - new upstream release.