updated 9 packages

dosfstools-4.1-1

fontconfig-2.13.1-1

gd-2.3.0-1

itstool-2.0.6-1

logrotate-3.16.0-1

ntfs-3g-2017.3.23-1

pciutils-3.6.4-1

redis-5.0.8-1

shared-mime-info-1.15-1

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

d/dosfstools/dosfstools-vl.spec

@@ -1,19 +1,18 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux.
 Summary(ja): LinuxでMS-DOS FAT filesystemsを作成/チェックするユーティリティ
-Version: 4.0
-Release: 2%{?_dist_release}
-
-License: GPLv3+
+Version: 4.1
+Release: 1%{?_dist_release}
 Group: Applications/System
-URL: https://github.com/dosfstools/dosfstools
-
 Vendor: Project Vine
 Distribution: Vine Linux
+BuildRoot: %{_tmppath}/%{name}-root
 
+License: GPLv3+
+URL: https://github.com/dosfstools/dosfstools
 Source0: https://github.com/dosfstools/dosfstools/releases/download/v%{version}/%{name}-%{version}.tar.xz
+Patch0:  dosfstools-4.1-fix-cluster-size-auto-detect-for-4k-disks.patch
 
-BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: mkdosfs-ygg
 
 %description
@@ -28,6 +27,7 @@ dosfstools パッケージには mkdosfs と dosfsck のユーティリティが
 
 %prep
 %setup -q
+%autopatch -p1
 
 %build
 autoreconf -i
@@ -46,11 +46,16 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog COPYING NEWS README* doc/*-2.x
+%license COPYING
+%doc ChangeLog NEWS README* doc/*-2.x
 /sbin/*
 %{_mandir}/man8/*
 
 %changelog
+* Fri Apr 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1-1
+- updated to 4.1.
+- imported Patch0 from rawhide.
+
 * Sat Jun  4 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0-2
 - added symbolic links for compatibility.
 

f/fontconfig/fontconfig-vl.spec

@@ -1,20 +1,23 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define _unpackaged_files_terminate_build 1
 
-%define freetype_version 2.8.1
+%define freetype_version 2.10.1
 
 Summary: Font configuration and customization library
 Summary(ja): フォント設定/カスタマイズライブラリ
 Name: fontconfig
-Version: 2.12.6
+Version: 2.13.1
 Release: 1%{?_dist_release}
-License: MIT
 Group: System Environment/Libraries
-URL: http://fontconfig.org/
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Source: http://fontconfig.org/release/fontconfig-%{version}.tar.bz2
+License: MIT
+URL: https://fontconfig.org/
+Source: https://fontconfig.org/release/fontconfig-%{version}.tar.bz2
 Source10: 70-prefer-ja-font.conf
 Source11: 59-morisawa-font-alias.conf
+Source100: ChangeLog.fedora
 
 # from fedora
 # https://bugzilla.redhat.com/show_bug.cgi?id=140335
@@ -22,7 +25,7 @@ Patch0:         fontconfig-2.8.0-sleep-less.patch
 
 # vine
 Patch4: fontconfig-2.3.2-subst-ja-font.patch
-Patch10: fontconfig-2.6.0-vine.patch
+Patch10: fontconfig-2.13.1-vine.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -31,7 +34,7 @@ BuildRequires: expat-devel
 BuildRequires: freetype2-devel >= %{freetype_version}
 BuildRequires: perl
 #BuildRequires: itstool
-#BuildRequires: libuuid-devel
+BuildRequires: libuuid-devel
 BuildRequires: gperf
 
 Requires(pre): freetype2 >= %{freetype_version}, coreutils
@@ -40,9 +43,6 @@ Obsoletes: XOrg-libs <= 6.9.0
 Conflicts: XOrg-font-utils <= 6.9.0
 Obsoletes: XOrg-font-utils <= 6.9.0
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 Fontconfig is designed to locate fonts within the
 system and select them according to requirements specified by 
@@ -109,7 +109,7 @@ fontconfig-devel パッケージには fontconfig を使ったソフトウエア
 
 %patch0 -p1 -b .sleep-less
 
-%patch4 -p1 -b .subst-ja-font
+#patch4 -p1 -b .subst-ja-font
 %patch10 -p1 -b .vine
 
 %build
@@ -147,6 +147,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/fonts
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 
+# remove locales (zh only)
+rm -rf %{buildroot}%{_datadir}/locale
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -166,12 +169,13 @@ HOME=/root /usr/bin/fc-cache -f -s >& /dev/null
 
 %files
 %defattr(-, root, root)
-%doc README AUTHORS COPYING 
+%license COPYING 
+%doc README AUTHORS
 %doc fontconfig-user.txt fontconfig-user.html
 %doc %{_sysconfdir}/fonts/conf.d/README
 %{_libdir}/libfontconfig.so.*
 %{_bindir}/fc-cache
-#%{_bindir}/fc-conflist
+%{_bindir}/fc-conflist
 %{_bindir}/fc-list
 %{_bindir}/fc-match
 %{_bindir}/fc-cat
@@ -193,6 +197,9 @@ HOME=/root /usr/bin/fc-cache -f -s >& /dev/null
 %defattr(-, root, root)
 %doc fontconfig-devel.txt fontconfig-devel
 %{_libdir}/libfontconfig.so
+%dir %{_datadir}/gettext
+%dir %{_datadir}/gettext/its
+%{_datadir}/gettext/its/*
 %{_libdir}/pkgconfig/*
 %{_includedir}/fontconfig
 %{_mandir}/man3/*
@@ -209,6 +216,12 @@ HOME=/root /usr/bin/fc-cache -f -s >& /dev/null
 %endif
 
 %changelog
+* Fri Apr 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.13.1-1
+- new upstream release.
+- disabled Patch4.
+- updated Patch10.
+- truncated %%changelog: old logs are ChangeLog.fedora.
+
 * Fri Jan 05 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.12.6-1
 - new upstream release.
 - added BR:gperf.
@@ -284,453 +297,3 @@ HOME=/root /usr/bin/fc-cache -f -s >& /dev/null
 * Mon Dec 10 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 2.5.0-0vl1
 - initial build for Vine Linux
   - splitted from XOrg package.
-
-* Tue Nov 13 2007 Behdad Esfahbod <besfahbo@redhat.com> - 2.5.0-1
-- Update to 2.5.0.
-
-* Tue Nov 06 2007 Behdad Esfahbod <besfahbo@redhat.com> - 2.4.92-1
-- Update to 2.4.92.
-- Mark /etc/fonts/conf.d/* as config(noreplace).
-- Remove most of our conf file, all upstreamed except for
-  75-blacklist-fedora.conf that I'm happily dropping.  Who has
-  Hershey fonts these days...
-- ln upstream'ed 25-unhint-nonlatin.conf from conf.avail in conf.d
-- Add 25-no-bitmap-fedora.conf which is the tiny remaining bit
-  of conf that didn't end up upstream.  Can get rid of it in the
-  future, but not just yet.
-
-* Thu Oct 25 2007 Behdad Esfahbod <besfahbo@redhat.com> - 2.4.91-1
-- Update to 2.4.91.
-- Add /usr/local/share/fonts to default config. (#147004)
-- Don't rebuild docs, to fix multilib conflicts. (#313011)
-- Remove docbook and elinks BuildRequires and stuff as we don't
-  rebuild docs.
-
-* Wed Aug 22 2007 Adam Jackson <ajax@redhat.com> - 2.4.2-5
-- Rebuild for PPC toolchain bug
-- Add BuildRequires: gawk
-
-* Sun Jun 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.4.2-4
-- /etc/fonts/conf.d is now owned by filesystem
-
-* Fri May 11 2007 Matthias Clasen <mclasen@redhat.com> - 2.4.2-3
-- Add Liberation fonts to 30-aliases-fedora.conf
-
-* Fri Jan 12 2007 Behdad Esfahbod <besfahbo@redhat.com> - 2.4.2-2
-- Change /usr/share/X11/fonts/OTF to /usr/share/X11/fonts/TTF
-- Resolves: #220809
-
-* Tue Dec  5 2006 Matthias Clasen <mclasen@redhat.com> - 2.4.2-1
-- Update to 2.4.2
-
-* Wed Oct  4 2006 Matthias Clasen <mclasen@redhat.com> - 2.4.1-4
-- Fix a multilib upgrade problem (#208151)
-
-* Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 2.4.1-3
-- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Fri Sep 22 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.4.1-2
-- Update 30-aliases-fedora.conf to correctly alias MS and StarOffice
-  fonts. (#207460)
-
-* Fri Sep 15 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.4.1-1
-- Update to 2.4.1, a public API was dropped from 2.4.0
-- Remove upstreamed patch
-
-* Mon Sep 11 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.4.0-1
-- Update to 2.4.0
-- Rename/order our configuration stuff to match the new scheme.
-  Breaks expected :-(
-
-* Thu Sep 07 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.3.97-3
-- Add missing file.  Previous update didn't go through
-
-* Thu Sep 07 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.3.97-2
-- Add fontconfig-2.3.97-ppc64.patch, for ppc64 arch signature
-
-* Thu Sep 07 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.3.97-1
-- update to 2.3.97
-- Drop upstreamed patches
-- Regenerate defaultconfig patch
-- Don't touch stamp as it was not ever needed
-
-* Thu Aug 17 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.3.95-11
-- inclusion of zhong yi font and rearranged font prefer list. (bug# 201300)
-
-* Fri Aug 11 2006 Ray Strode <rstrode@redhat.com> - 2.3.95-10
-- use "%5x" instead of " %4x" to support 64k instead of
-  clamping.  Idea from Behdad.
-
-* Fri Aug 11 2006 Ray Strode <rstrode@redhat.com> - 2.3.95-9
-- tweak last patch to give a more reasonable page size
-  value if 64k page size is in effect.
-
-* Fri Aug 11 2006 Ray Strode <rstrode@redhat.com> - 2.3.95-8
-- maybe fix buffer overflow (bug 202152).
-
-* Fri Aug 11 2006 Ray Strode <rstrode@redhat.com> - 2.3.95-7
-- Update configs to provide better openoffice/staroffice
-  compatibility (bug 200723)
-
-* Thu Jul 27 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.3.95-6
-- Do umask 0022 in post
-- Update configs to reflect addition of new Indic fonts (#200381, #200397)
-
-* Tue Jul 18 2006 Matthias Clasen <mclasen@redhat.com> - 2.3.95-5
-- Plug a small memory leak
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.3.95-4.1.1
-- rebuild
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.3.95-4.1
-- rebuild
-
-* Fri Jun  2 2006 Matthias Clasen <mclasen@redhat.com> - 2.3.95-4
-- Fix the handling of TTF font collections
-
-* Thu May 18 2006 Matthias Clasen <mclasen@redhat.com> - 2.3.95-3
-- Apply a patch by David Turner to speed up cache generation
-
-* Wed Apr 26 2006 Bill Nottingham <notting@redhat.com> - 2.3.95-2
-- fix fonts.conf typo
-
-* Wed Apr 26 2006 Matthias Clasen <mclasen@redhat.com> - 2.3.95-1
-- Update to 2.3.95
-
-* Fri Feb 24 2006 Matthias Clasen <mclasen@redhat.com> - 2.3.94-1
-- Update to 2.3.94
-
-* Sat Feb 11 2006 Matthias Clasen <mclasen@redhat.com> - 2.3.93.cvs20060211-1
-- Newer cvs snapshot
-
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.3.93.cvs20060208-1.1
-- bump again for double-long bug on ppc(64)
-
-* Wed Feb  8 2006 Matthias Clasen <mclasen@redhat.com> - 2.3.93.cvs20060208-1
-- Newer cvs snapshot
-
-* Tue Feb  7 2006 Matthias Clasen <mclasen@redhat.com> - 2.3.93.cvs20060207-1
-- Newer cvs snapshot
-- Drop upstreamed patches, pick up some new ones
-
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.3.93.cvs20060131-3.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Thu Feb  2 2006 Ray Strode <rstrode@redhat.com> - 2.3.93.cvs20060131-3
-- Move user cache to a subdirectory (bug 160275)
-
-* Thu Feb  2 2006 Matthias Clasen <mclasen@redhat.com> - 2.3.93.cvs20060131-2
-- Accumulated patches
-
-* Tue Jan 31 2006 Matthias Clasen <mclasen@redhat.com> - 2.3.93.cvs20060131-1
-- Newer cvs snapshot
-
-* Tue Jan 24 2006 Matthias Clasen <mclasen@redhat.com> - 2.3.93.cvs20060124-1
-- Newer cvs snapshot
-
-* Tue Jan 17 2006 Ray Strode <rstrode@redhat.com> - 2.3.93-4
-- apply patch from Tim Mayberry to correct aliasing and disable
-  hinting for the two Chinese font names AR PL ShanHeiSun Uni 
-  and AR PL Zenkai Uni
-
-* Tue Jan 10 2006 Bill Nottingham <notting@redhat.com> - 2.3.93-3
-- prereq coreutils for mkdir/touch in %%post
-
-* Wed Dec 21 2005 Carl Worth <cworth@redhat.com> - 2.3.93-2
-- Fix to create /var/cache/fontconfig/stamp in the post install stage.
-
-* Wed Dec 21 2005 Carl Worth <cworth@redhat.com> - 2.3.93-1
-- New upstream version.
-
-* Tue Dec 13 2005 Carl Worth <cworth@redhat.com> - 2.3.92.cvs20051129-3
-- Disable hinting for Lohit Gujarati
-
-* Fri Dec  9 2005 Carl Worth <cworth@redhat.com> - 2.3.92.cvs20051129-2
-- Add two new Chinese font names to the default fonts.conf file:
-  	AR PL ShanHeiSun Uni
-  	AR PL Zenkai Uni
-
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
-
-* Mon Nov 28 2005 Matthias Clasen <mclasen@redhat.com> - 2.3.92.cvs20051129-1
-- Update to a newer cvs snapshot
-
-* Sat Nov 19 2005 Matthias Clasen <mclasen@redhat.com> - 2.3.92.cvs20051119-1
-- Update to a newer cvs snapshot
-
-* Wed Nov 16 2005 Bill Nottingham <notting@redhat.com> - 2.3.93-3
-- modular X moved fonts from /usr/X11R6/lib/X11/fonts to
-  /usr/share/X11/fonts, adjust %%configure accordingly and 
-  conflict with older font packages
-
-* Wed Nov  9 2005 Carl Worth <cworth@redhat.com> - 2.3.92-2
-- Remove inadvertent rejection of Luxi Mono from 40-blacklist-fonts.conf.
-  Fixes #172437
-
-* Fri Nov  4 2005 Matthias Clasen <mclasen@redhat.com> - 2.3.92-1
-- Update to 2.3.92
-
-* Mon Oct 31 2005 Matthias Clasen <mclasen@redhat.com> - 2.3.91.cvs20051031-1
-- Update to a newer cvs snapshot
-- Add a patch which should help to understand broken cache problems
-
-* Fri Oct 21 2005 Matthias Clasen <mclasen@redhat.com> - 2.3.91.cvs20051017-2
-- Add new Chinese fonts
-- Fix the 40-blacklist-fonts.conf file to use the documented
-  fonts.conf syntax, and exclude the Hershey fonts by family
-  name.
-
-* Fri Oct 14 2005 Matthias Clasen <mclasen@redhat.com> - 2.3.91.cvs20051017-1
-- Update to the mmap branch of fontconfig
-
-* Fri Jul 22 2005 Kristian H淡gsberg <krh@redhat.com> - 2.3.2-1
-- Update to fontconfig-2.3.2.  Drop
-
-	fontconfig-2.1-slighthint.patch,
-	fontconfig-2.2.3-timestamp.patch,
-	fontconfig-2.2.3-names.patch,
-	fontconfig-2.2.3-ta-pa-orth.patch, and
-	fontconfig-2.2.3-timestamp.patch,
-
-  as they are now merged upstream.
-
-- Fold fontconfig-2.2.3-add-sazanami.patch into
-  fontconfig-2.3.2-defaultconfig.patch and split rules to disable CJK
-  hinting out into /etc/fonts/conf.d/50-no-hint-fonts.conf.
-
-- Drop fontconfig-0.0.1.020826.1330-blacklist.patch and use the new
-  rejectfont directive to reject those fonts in 40-blacklist-fonts.conf.
-
-- Add fontconfig-2.3.2-only-parse-conf-files.patch to avoid parsing
-  .rpmsave files.
-
-- Renable s390 documentation now that #97079 has been fixed and add
-  BuildRequires: for docbook-utils and docbook-utils-pdf.
-
-- Drop code to iconv and custom install man pages, upstream does the
-  right thing now.
-
-- Add workaround from hell to make elinks cooperate so we can build
-  txt documentation.
-
-* Tue Apr 19 2005 David Zeuthen <davidz@redhat.com> - 2.2.3-13
-- Add another font family name Sazanami Gothic/Mincho (#148748)
-
-* Fri Mar  4 2005 David Zeuthen <davidz@redhat.com> - 2.2.3-12
-- Rebuild
-
-* Fri Mar  4 2005 David Zeuthen <davidz@redhat.com> - 2.2.3-11
-- Rebuild
-
-* Fri Mar  4 2005 David Zeuthen <davidz@redhat.com> - 2.2.3-10
-- Rebuild
-
-* Fri Mar  4 2005 David Zeuthen <davidz@redhat.com> - 2.2.3-9
-- Disable docs for s390 for now
-
-* Fri Mar  4 2005 David Zeuthen <davidz@redhat.com> - 2.2.3-8
-- Rebuild
-
-* Wed Dec  1 2004 Owen Taylor <otaylor@redhat.com> - 2.2.3-6
-- Sleep a second before the exit of fc-cache to fix problems with fast 
-  serial installs of fonts (#140335)
-- Turn off hinting for Lohit Hindi/Bengali/Punjabi (#139816)
-
-* Tue Oct 19 2004 Owen Taylor <otaylor@redhat.com> - 2.2.3-5
-- Add Lohit fonts for Indic languages (#134492)
-- Add Punjabi converage, fix Tamil coverage
-
-* Wed Sep 22 2004 Owen Taylor <otaylor@redhat.com> - 2.2.3-4
-- Update fonts-hebrew names to include CLM suffix
-
-* Thu Sep  2 2004 Owen Taylor <otaylor@redhat.com> - 2.2.3-3
-- Backport code from head branch of fontconfig CVS to parse names 
-  for postscript fonts (fixes #127500, J. J. Ramsey)
-- Own /usr/share/fonts (#110956, David K. Levine)
-- Add KacstQura to serif/sans-serif/monospace aliases (#101182)
-
-* Mon Aug 16 2004 Owen Taylor <otaylor@redhat.com> - 2.2.3-2
-- Don't run fc-cache if the binary isn't there (#128072, tracked
-  down by Jay Turner)
-
-* Tue Aug  3 2004 Owen Taylor <otaylor@redhat.com> - 2.2.3-1
-- Upgrade to 2.2.3
-- Convert man pages to UTF-8 (#108730, Peter van Egdom)
-- Renable docs on s390
-
-* Mon Jul 26 2004 Owen Taylor <otaylor@redhat.com> - 2.2.1-12
-- Rebuild for RHEL
-- Back freetype required version down to 2.1.4
-
-* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Mon Apr 19 2004 Owen Taylor <otaylor@redhat.com> 2.2.1-10
-- Require recent freetype (#109592, Peter Oliver)
-- Remove fonts.conf timestamp to fix multiarch conflict (#118182)
-- Disable hinting for Mukti Narrow (#120915, Sayamindu Dasgupta)
-
-* Wed Mar 10 2004 Owen Taylor <otaylor@redhat.com> 2.2.1-8.1
-- Rebuild
-
-* Wed Mar 10 2004 Owen Taylor <otaylor@redhat.com> 2.2.1-8.0
-- Add Albany/Cumberland/Thorndale as fallbacks for Microsoft core fonts and 
-  as non-preferred alternatives for Sans/Serif/Monospace
-- Fix FreeType includes for recent FreeType
-
-* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Mon Sep 22 2003 Owen Taylor <otaylor@redhat.com> 2.2.1-6.0
-- Should have been passing --with-add-fonts, not --with-add-dirs to 
-  configure ... caused wrong version of Luxi to be used. (#100862)
-
-* Fri Sep 19 2003 Owen Taylor <otaylor@redhat.com> 2.2.1-5.0
-- Tweak fonts.conf to get right hinting for CJK fonts (#97337)
-
-* Tue Jun 17 2003 Bill Nottingham <notting@redhat.com> 2.2.1-3
-- handle null config->cache correctly
-
-* Thu Jun 12 2003 Owen Taylor <otaylor@redhat.com> 2.2.1-2
-- Update default config to include Hebrew fonts (#90501, Dov Grobgeld)
-
-* Tue Jun 10 2003 Owen Taylor <otaylor@redhat.com> 2.2.1-2
-- As a workaround disable doc builds on s390
-
-* Mon Jun  9 2003 Owen Taylor <otaylor@redhat.com> 2.2.1-1
-- Version 2.2.1
-
-* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com>
-- debuginfo rebuild
-
-* Mon Feb 24 2003 Owen Taylor <otaylor@redhat.com> 2.1-8
-- Fix segfault in fc-cache from .dircache patch
-
-* Mon Feb 24 2003 Owen Taylor <otaylor@redhat.com>
-- Back out patch that wrote fonts.conf entries that crash RH-8.0 
-  gnome-terminal, go with patch from fontconfig CVS instead.
-  (#84863)
-
-* Tue Feb 11 2003 Owen Taylor <otaylor@redhat.com>
-- Move fontconfig man page to main package, since it contains non-devel 
-  information (#76189)
-- Look in the OTF subdirectory of /usr/X11R6/lib/fonts as well
-  so we find Syriac fonts (#82627)
-
-* Thu Feb  6 2003 Matt Wilson <msw@redhat.com> 2.1-5
-- modified fontconfig-0.0.1.020626.1517-fontdir.patch to hard code
-  /usr/X11R6/lib/X11/fonts instead of using $(X_FONT_DIR).  This is
-  because on lib64 machines, fonts are not in /usr/X11R6/lib64/....
-
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
-- rebuilt
-
-* Wed Jan 15 2003 Owen Taylor <otaylor@redhat.com>
-- Try a different tack when fixing cache problem
-
-* Tue Jan 14 2003 Owen Taylor <otaylor@redhat.com>
-- Try to fix bug where empty cache entries would be found in 
-  ~/.fonts.cache-1 during scanning (#81335)
-
-* Thu Nov 21 2002 Mike A. Harris <mharris@redhat.com> 2.1-1
-- Updated to version 2.1
-- Updated slighthint patch to fontconfig-2.1-slighthint.patch
-- Updated freetype version required to 2.1.2-7
-
-* Mon Sep  2 2002 Owen Taylor <otaylor@redhat.com>
-- Version 2.0
-- Correct capitalization/spacing for ZYSong18030 name (#73272)
-
-* Fri Aug 30 2002 Owen Taylor <otaylor@redhat.com>
-- Blacklist fonts from ghostscript-fonts that don't render correctly
-
-* Mon Aug 26 2002 Owen Taylor <otaylor@redhat.com>
-- Upgrade to fcpackage rc3
-- Fix bug in comparisons for xx_XX language tags
-- Compensate for a minor config file change in rc3
-
-* Wed Aug 21 2002 Owen Taylor <otaylor@redhat.com>
-- Add an explicit PreReq for freetype
-- Move fonts we don't ship to the end of the fonts.conf aliases so
-  installing them doesn't change the look.
-
-* Wed Aug 21 2002 Owen Taylor <otaylor@redhat.com>
-- Memory leak fix when parsing config files
-- Set rh_prefer_bitmaps for .ja fonts to key off of in Xft
-- Fix some groff warnings for fontconfig.man (#72138)
-
-* Thu Aug 15 2002 Owen Taylor <otaylor@redhat.com>
-- Try once more to get the right default Sans-serif font :-(
-- Switch the Sans/Monospace aliases for Korean to Gulim, not Dotum
-
-* Wed Aug 14 2002 Owen Taylor <otaylor@redhat.com>
-- Fix %%post
-
-* Tue Aug 13 2002 Owen Taylor <otaylor@redhat.com>
-- Fix lost Luxi Sans default
-
-* Mon Aug 12 2002 Owen Taylor <otaylor@redhat.com>
-- Upgrade to rc2
-- Turn off hinting for all CJK fonts
-- Fix typo in %%post
-- Remove the custom language tag stuff in favor of Keith's standard 
-  solution.
-
-* Mon Jul 15 2002 Owen Taylor <otaylor@redhat.com>
-- Prefer Luxi Sans to Nimbus Sans again
-
-* Fri Jul 12 2002 Owen Taylor <otaylor@redhat.com>
-- Add FC_HINT_STYLE to FcBaseObjectTypes
-- Switch Chinese fonts to always using Sung-ti / Ming-ti, and never Kai-ti
-- Add ZYSong18030 to aliases (#68428)
-
-* Wed Jul 10 2002 Owen Taylor <otaylor@redhat.com>
-- Fix a typo in the langtag patch (caught by Erik van der Poel)
-
-* Wed Jul  3 2002 Owen Taylor <otaylor@redhat.com>
-- Add FC_HINT_STYLE tag
-
-* Thu Jun 27 2002 Owen Taylor <otaylor@redhat.com>
-- New upstream version, with fix for problems with
-  ghostscript-fonts (Fonts don't work for Qt+CJK,
-  etc.)
-
-* Wed Jun 26 2002 Owen Taylor <otaylor@redhat.com>
-- New upstream version, fixing locale problem
-
-* Mon Jun 24 2002 Owen Taylor <otaylor@redhat.com>
-- Add a hack where we set the "language" fontconfig property based on the locale, then 
-  we conditionalize base on that in the fonts.conf file.
-
-* Sun Jun 23 2002 Owen Taylor <otaylor@redhat.com>
-- New upstream version
-
-* Tue Jun 18 2002 Owen Taylor <otaylor@redhat.com>
-- Fix crash from FcObjectSetAdd
-
-* Tue Jun 11 2002 Owen Taylor <otaylor@redhat.com>
-- make fonts.conf %%config, not %%config(noreplace)
-- Another try at the CJK aliases
-- Add some CJK fonts to the config
-- Prefer Luxi Mono to Nimbus Mono
-
-* Mon Jun 10 2002 Owen Taylor <otaylor@redhat.com>
-- New upstream version
-- Fix matching for bitmap fonts
-
-* Mon Jun  3 2002 Owen Taylor <otaylor@redhat.com>
-- New version, new upstream mega-tarball
-
-* Tue May 28 2002 Owen Taylor <otaylor@redhat.com>
-- Fix problem with FcConfigSort
-
-* Fri May 24 2002 Owen Taylor <otaylor@redhat.com>
-- Initial specfile
-

g/gd/gd-vl.spec

@@ -4,13 +4,17 @@
 Summary: A graphics library for drawing .png files.
 Summary(ja): PNGイメージファイルを描写するためのグラフィックライブラリ
 Name: gd
-Version: 2.2.5
+Version: 2.3.0
 Release: 1%{_dist_release}
-Source0: https://bitbucket.org/libgd/gd-libgd/downloads/libgd-%{version}.tar.xz
-Patch0: gd-2.1.0-multilib.patch
+Group: System Environment/Libraries
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 License: BSD-style
 URL: http://www.libgd.org/
-Group: System Environment/Libraries
+Source0: https://github.com/libgd/libgd/releases/download/gd-%{version}/libgd-%{version}.tar.xz
+Patch0: gd-2.1.0-multilib.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: freetype2-devel
@@ -29,10 +33,6 @@ BuildRequires: pkgconfig
 # for test
 BuildRequires: TrueType-vlgothic
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 Gd is a graphics library for drawing .png files.  Gd allows your code to
 quickly draw images (lines, arcs, text, multiple colors, cutting and
@@ -144,15 +144,17 @@ If you're installing the gd graphics library, you must install gd-devel.
 
 %prep
 %setup -q -n libgd-%{version}
-%patch0 -p1 -b .mlib
+#patch0 -p1 -b .mlib
 
-: regenerate autotool stuff
-if [ -f configure ]; then
-   libtoolize --copy --force
-   autoreconf -vif
-else
-   ./bootstrap.sh
-fi
+# disable until till this bug is fixed.
+#  - https://github.com/libgd/libgd/issues/610
+#: regenerate autotool stuff
+#if [ -f configure ]; then
+#   libtoolize --copy --force
+#   autoreconf -vif
+#else
+#   ./bootstrap.sh
+#fi
 
 
 %build
@@ -202,17 +204,16 @@ make %{?_smp_mflags} check
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog COPYING NEWS docs/*
+%license COPYING
+%doc README.md CHANGELOG.md docs/*
 %{_libdir}/*.so.*
 
 %files progs
 %defattr(-,root,root)
 %{_bindir}/*
-%exclude %{_bindir}/gdlib-config
 
 %files devel
 %defattr(-,root,root)
-%{_bindir}/gdlib-config
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
@@ -227,6 +228,9 @@ make %{?_smp_mflags} check
 %endif
 
 %changelog
+* Fri Apr 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.0-1
+- new upstream release.
+
 * Fri Dec 15 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.5-1
 - new upstream release.
 - dropped %%patch1 and 2: fixed in upstream.
@@ -261,7 +265,7 @@ make %{?_smp_mflags} check
 - modified font path patch for Vine Linux
 - drop static library
 - remove "-DJISX0208"
-- add "-DHAVE_ICONV -DHAVE_STDARG_H -DHAVE_ERRNO_H""
+- add "-DHAVE_ICONV -DHAVE_STDARG_H -DHAVE_ERRNO_H"
 
 * Fri Mar 09 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.0.35-7
 - move gdlib-config from gd-progs subpackage to gd-devel subpackage

i/itstool/itstool-vl.spec

@@ -1,20 +1,20 @@
 Name:           itstool
-Version:        1.2.0
-Release:        2%{?_dist_release}
+Version:        2.0.6
+Release:        1%{?_dist_release}
 Summary:        ITS-based XML translation tool
-
 Group:          Development/Tools
+Vendor:         Project Vine
+Distribution:   Vine Linux
+BuildArch:      noarch
+
 License:        GPLv3+
 URL:            http://itstool.org/
 Source0:        http://files.itstool.org/%{name}/%{name}-%{version}.tar.bz2
 
-BuildArch:      noarch
-
-Requires: 	libxml2-python
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-libxml2
+Requires:       python3-libxml2
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduchi
 
 %description
 ITS Tool allows you to translate XML documents with PO files, using rules from
@@ -27,6 +27,7 @@ how to separate it into PO file messages.
 
 
 %build
+export PYTHON=%{__python3}
 %configure
 make %{?_smp_mflags}
 
@@ -37,13 +38,17 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING COPYING.GPL3
+%license COPYING COPYING.GPL3
+%doc README
 %{_bindir}/itstool
 %{_datadir}/itstool
 %doc %{_mandir}/man1/itstool.1.gz
 
 
 %changelog
+* Fri Apr 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.6-1
+- new upstream release.
+
 * Mon Dec 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.0-2
 - rebuild with VineSeed environment
 

l/logrotate/logrotate-vl.spec

@@ -1,15 +1,15 @@
 Summary: Rotates, compresses, removes and mails system log files.
 Summary(ja): システムのログファイルを圧縮/削除するプログラム
 Name: logrotate
-Version: 3.9.2
-Release: 2%{?_dist_release}
-License: GPL
+Version: 3.16.0
+Release: 1%{?_dist_release}
 Group: System Environment/Base
-Url: https://fedorahosted.org/logrotate/
 Vendor: Project Vine
 Distribution: Vine Linux
 
-Source: https://github.com/logrotate/logrotate/archive/logrotate-%{version}.tar.gz
+License: GPL
+Url: https://fedorahosted.org/logrotate/
+Source: https://github.com/logrotate/logrotate/releases/download/%{version}/logrotate-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: acl libacl-devel popt-devel
@@ -42,7 +42,7 @@ logrotate パッケージをインストールして下さい．
 %prep
 %setup -q
 
-perl -pi -e 's|/usr/sbin/logrotate|/usr/sbin/logrotate -l syslog|' examples/logrotate.cron
+#perl -pi -e 's|/usr/sbin/logrotate|/usr/sbin/logrotate -l syslog|' examples/logrotate.cron
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSTATEFILE=\\\"/var/lib/logrotate/logrotate.status\\\""
@@ -61,7 +61,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/logrotate
 
-install -p -m 644 examples/logrotate-default $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.conf
+install -p -m 644 examples/logrotate.conf $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.conf
 install -p -m 755 examples/logrotate.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/logrotate
 touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/logrotate/logrotate.status
 
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate/logrotate.status
 
 %changelog
+* Fri Apr 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.16.0-1
+- new upstream release.
+
 * Sun Jun 19 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.9.2-2
 - drop Patch0 (get the same effect by another way).
 

n/ntfs-3g/ntfs-3g-vl.spec

@@ -1,24 +1,29 @@
 %bcond_with externalfuse
 
-Summary: 	Linux NTFS userspace driver 
-Summary(ja): 	Linux NTFS ユーザ空間ドライバ
-Name:		ntfs-3g
-
-Version:	2016.2.22
-Release:	1%{?_dist_release}
-
-License:	GPLv2+
-Group:		System Environment/Base
-URL:		http://www.ntfs-3g.org/
-
-Vendor:		Project Vine
-Distribution:	Vine Linux
+Summary:        Linux NTFS userspace driver 
+Summary(ja):    Linux NTFS ユーザ空間ドライバ
+Name:           ntfs-3g
+Version:        2017.3.23
+Release:        1%{?_dist_release}
+Group:          System Environment/Base
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Source0:	http://tuxera.com/opensource/%{name}_ntfsprogs-%{version}.tgz
-Source1:        20-ntfs-config-write-policy.fdi
+License:        GPLv2+
+URL:            https://www.tuxera.com/community/open-source-ntfs-3g/
+Source0:        https://tuxera.com/opensource/ntfs-3g_ntfsprogs-%{version}.tgz
 Patch0:         ntfs-3g_ntfsprogs-2011.10.9-RC-ntfsck-unsupported-return-0.patch
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+Patch1:         check-mftmirr.patch
+Patch2:         ntfs-3g-big-sectors.patch
+# Fix for ntfsclone crash.
+# Discussed with upstream developer but not upstream yet, see:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1601146#c4
+Patch3:         ntfsclone-full-clusters-bz1601146.patch
+# Upstream fix for CVE-2019-9755
+# https://sourceforge.net/p/ntfs-3g/ntfs-3g/ci/85c1634a26faa572d3c558d4cf8aaaca5202d4e9/
+Patch4:         ntfs-3g-CVE-2019-9755.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libtool
 BuildRequires:  libattr-devel
@@ -74,18 +79,28 @@ installation).
 %prep
 %setup -q -n %{name}_ntfsprogs-%{version}
 %patch0 -p1 -b .unsupported
+%patch1 -p0 -b .check-mftmirr
+%patch2 -p0 -b .big-sectors
+%patch3 -p0 -b .ntfsclone
+%patch4 -p1 -b .CVE-2019-9755
 
 %build
-%configure --disable-static \
-           --disable-ldconfig \
-%{?with_ externalfuse:--with-fuse=external} \
-	   --exec-prefix=/ \
-	   --bindir=/bin \
-	   --sbindir=/sbin \
-	   --libdir=/%{_lib} \
-	   --enable-crypto \
-	   --enable-extras \
-	   --enable-quarantined
+export CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"
+%configure \
+		--disable-static \
+		--disable-ldconfig \
+%if %{with externalfuse}
+		--with-fuse=external \
+%endif
+		--exec-prefix=/ \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--libdir=/%{_lib} \
+		--enable-posix-acls \
+		--enable-xattr-mappings \
+		--enable-crypto \
+		--enable-extras \
+		--enable-quarantined
 
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
@@ -115,11 +130,6 @@ ln -s /bin/ntfsmount $RPM_BUILD_ROOT%{_bindir}/ntfsmount
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
 mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig/libntfs-3g.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
 
-%if %{?_dist_release} == "vl6"
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/
-%endif
-
 # We get this on our own, thanks.
 rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/README
 
@@ -132,7 +142,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING CREDITS NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog CREDITS NEWS README
 /sbin/mount.ntfs
 %attr(4754,root,root) /sbin/mount.ntfs-3g
 /sbin/mount.ntfs-fuse
@@ -140,8 +151,6 @@ rm -rf $RPM_BUILD_ROOT
 /bin/lowntfs-3g
 /bin/ntfs-3g
 /bin/ntfs-3g.probe
-/bin/ntfs-3g.secaudit
-/bin/ntfs-3g.usermap
 /bin/ntfsmount
 %{_bindir}/ntfs-3g
 %{_bindir}/ntfsmount
@@ -149,9 +158,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/mount.lowntfs-3g.*
 %{_mandir}/man8/mount.ntfs-3g.*
 %{_mandir}/man8/ntfs-3g*
-%if %{?_dist_release} == "vl6"
-%{_datadir}/hal/fdi/policy/10osvendor/20-ntfs-config-write-policy.fdi
-%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -160,13 +166,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %files -n ntfsprogs
-%doc AUTHORS COPYING CREDITS ChangeLog NEWS README
+%license COPYING
+%doc AUTHORS CREDITS ChangeLog NEWS README
 /bin/ntfscat
 /bin/ntfscluster
 /bin/ntfscmp
 /bin/ntfsfix
 /bin/ntfsinfo
 /bin/ntfsls
+/bin/ntfssecaudit
+/bin/ntfsusermap
 # extras
 /bin/ntfsck
 /bin/ntfsdecrypt
@@ -191,6 +200,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_mandir}/man8/ntfs-3g*
 
 %changelog
+* Fri Apr 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2017.3.23-1
+- new upstream release.
+- imported Patch1-4 from rawhide.
+
 * Mon Jul 25 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2016.2.22-1
 - new upstream release.
 

p/pciutils/pciutils-vl.spec

@@ -1,21 +1,22 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
-Summary:	PCI bus related utilities.
-Summary(ja):	Linux PCI ユーティリティ
-Name:		pciutils
-Version:	3.4.1
-Release:	1%{?_dist_release}
-License:	GPLv2+
-URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
-Group:		Applications/System
-
-Source:		%{name}-%{version}.tar.gz
-Patch2:		pciutils-2.1.10-scan.patch
-Patch3: 	pciutils-havepread.patch
-Patch6: 	pciutils-2.2.1-idpath.patch
-Patch8:		pciutils-3.3.0-multilib.patch
-Patch9:		pciutils-dir-d.patch
-Patch10:	pciutils-2.2.10-sparc-support.patch
-Patch11:	pciutils-3.0.1-superh-support.patch
+Summary:        PCI bus related utilities.
+Summary(ja):    Linux PCI ユーティリティ
+Name:           pciutils
+Version:        3.6.4
+Release:        1%{?_dist_release}
+Group:          Applications/System
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPLv2+
+URL:            http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
+Source:         https://mirrors.edge.kernel.org/pub/software/utils/pciutils/pciutils-%{version}.tar.xz
+
+#change pci.ids directory to hwdata, fedora/rhel specific
+Patch1:         pciutils-2.2.1-idpath.patch
+
+#add support for directory with another pci.ids, rejected by upstream, rhbz#195327
+Patch2:         pciutils-dir-d.patch
 
 Buildroot: 	%{_tmppath}/%{name}-%{version}-root
 ExclusiveOS: 	Linux
@@ -23,8 +24,7 @@ BuildRequires:  sed
 Requires:	hwdata
 Requires:	%{name}-libs = %{version}-%{release}
 
-Vendor: Project Vine
-Distribution: Vine Linux
+%global __provides_exclude_from ^%{_libdir}/pkgconfig/.*$
 
 %description
 The pciutils package contains various utilities for inspecting and
@@ -43,6 +43,7 @@ Summary: Linux PCI development library.
 Summary(ja):	Linux PCI 開発ライブラリ
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
+Provides: pkgconfig(libpci) = %{version}
 
 %description devel
 This package contains a library for inspecting and setting
@@ -89,13 +90,7 @@ devices connected to the PCI bus.
 
 %prep
 %setup -q -n pciutils-%{version}
-%patch2 -p1 -b .scan
-%patch3 -p1 -b .pread
-%patch6 -p1 -b .idpath
-%patch8 -p1 -b .multilib
-%patch9 -p1 -b .dird
-%patch10 -p1 -b .sparc
-%patch11 -p1 -b .superh
+%autopatch -p1
 
 sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
 
@@ -144,6 +139,7 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 %defattr(-,root,root,-)
 %{_mandir}/man8/*
 %attr(0755, root, root) /sbin/*
+%license COPYING
 %doc README ChangeLog pciutils.lsm
 
 %files devel
@@ -178,6 +174,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.4-1
+- new upstream release.
+- dropped all patches.
+- imported Patch0-2 from rawhide.
+
 * Sun May 15 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 - new upstream release
 

r/redis/redis-vl.spec

@@ -5,7 +5,7 @@
 
 # Commit IDs for the (unversioned) redis-doc repository
 # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
-%global doc_commit 1797cc9887752f9e3dac876fe3e1291d63c65629
+%global doc_commit abfe8e0698564af7260b4c1a0ea4d21424d14a88
 %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
 
 # %%{rpmmacrodir} not usable on EL-6
@@ -17,8 +17,8 @@
 %endif
 
 Name:             redis
-Version:          5.0.5
-Release:          1%{?_dist_release}
+Version:          5.0.8
+Release:          1%{?_dist_release}%{?with_systemd:.systemd}
 Summary:          A persistent in-memory key-value database
 Summary(ja):      永続化可能なキー・バリュー型インメモリデータベース
 
@@ -30,7 +30,7 @@ Vendor:           Project Vine
 Distribution:     Vine Linux
 Packager:         daisuke
 
-Source0:          https://download.redis.io/releases/%{name}-%{version}.tar.gz
+Source0:          https://github.com/antirez/redis/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:          %{name}.logrotate
 Source2:          %{name}-sentinel.service
 Source3:          %{name}.service
@@ -235,7 +235,7 @@ exit 0
 %systemd_preun %{name}.service
 %systemd_preun %{name}-sentinel.service
 %else
-if [ $1 -eq 0 ]; then
+if [ $1 -eq 0 -o -x /sbin/systemctl ]; then
 	/sbin/service %{name} stop ||:
 	/sbin/service %{name}-sentinel stop ||:
 	/sbin/chkconfig --del %{name}
@@ -247,6 +247,14 @@ fi
 %if %{with systemd}
 %systemd_postun_with_restart %{name}.service
 %systemd_postun_with_restart %{name}-sentinel.service
+%else
+if [ $1 -gt 0 ]; then
+	if [ -x /sbin/systemctl ]; then
+		/sbin/service %{name} stop ||:
+	else
+		/sbin/service %{name} condrestart ||:
+	fi
+fi
 %endif
 
 
@@ -293,6 +301,9 @@ fi
 
 
 %changelog
+* Fri Apr 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.0.8-1
+- new upstream release.
+
 * Sun Sep 08 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.0.5-1
 - new upstream release.
 

s/shared-mime-info/shared-mime-info-vl.spec

@@ -1,15 +1,18 @@
 Summary: Shared MIME information database
 Summary(ja): 共有 MIME 情報データベース
 Name: shared-mime-info
-Version: 1.6
+Version: 1.15
 Release: 1%{?_dist_release}
-License: GPL
 Group: User Interface/Desktops
-URL: http://freedesktop.org/wiki/Software/shared-mime-info
-Source0: %{name}-%{version}.tar.xz
+License: GPL
+URL: https://freedesktop.org/wiki/Software/shared-mime-info/
+%define altver %(echo %{version} | tr . -)
+Source0: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/Release-%{altver}/shared-mime-info-Release-%{altver}.tar.bz2
 Source1: defaults.list
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+#BuildRequires:  meson
+BuildRequires:  itstool
 BuildRequires:  gawk
 BuildRequires:  libxml2-devel
 BuildRequires:  glib2-devel >= 2.6.0
@@ -31,15 +34,21 @@ a file. This is generally done by examining the file's name or contents,
 and looking up the correct MIME type in a database.
 
 %prep
-%setup -q
+%setup -q -n shared-mime-info-Release-%{altver}
+
+./autogen.sh
 
 %build
+#meson -Dupdate-mimedb=false
+#meson_build
+
 %configure --disable-update-mimedb
-make
+%make_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
+#meson_install
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
@@ -55,7 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README NEWS shared-mime-info-spec.xml
+%license COPYING
+%doc README* NEWS
 %{_bindir}/*
 %dir %{_datadir}/mime/
 %{_datadir}/mime/packages
@@ -64,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Fri Apr 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.15-1
+- new upstream release.
+
 * Sat Apr 23 2016 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.6-1
 - new upstream release