updated 6 packages

gdk-pixbuf2-2.40.0-1

gnumeric-1.12.46-1

goffice-0.10.46-1

libgsf-1.14.47-1

nss-3.51.1-2

rpm-4.12.0.1-3

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

g/gdk-pixbuf2/gdk-pixbuf2-vl.spec

@@ -9,15 +9,19 @@
 %endif
 
 Name:           gdk-pixbuf2
-Version:        2.36.11
-Release:        1%{?_dist_release}
 Summary:        An image loading library
-
+Version:        2.40.0
+Release:        1%{?_dist_release}
 Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        LGPLv2+
-URL:            http://www.gt.org
-Source0:        http://download.gnome.org/sources/gdk-pixbuf/2.34/gdk-pixbuf-%{version}.tar.xz
+URL:            http://www.gtk.org
+%global         shortver %(echo %{version} | cut -d . -f 1,2)
+Source:         https://download.gnome.org/sources/gdk-pixbuf/%{shortver}/gdk-pixbuf-%{version}.tar.xz
 
+BuildRequires:  meson
 BuildRequires:  glib2-devel >= 2.36.0
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-turbo-devel
@@ -44,10 +48,6 @@ Conflicts: gtk2 <= 2.21.2
 # https://bugzilla.gnome.org/show_bug.cgi?id=624712
 Patch0: 0001-Fix-linking-when-libpng-loader-is-builtin.patch
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduchi
-
 %description
 gdk-pixbuf is an image loading library that can be extended by loadable
 modules for new image formats. It is used by toolkits such as GTK+ or
@@ -105,27 +105,21 @@ for writing applications that are using gdk-pixbuf.
 ## %patch0 -p1 -b .libpng-linking
 
 %build
-(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
- %configure $CONFIGFLAGS             \
-        --with-x11	                 \
-        --with-included-loaders=png  \
-        --enable-introspection=yes  )
-make %{?_smp_mflags}
+%meson \
+  -Dbuiltin_loaders=png \
+  -Dinstalled_tests=false \
+  -Ddocs=true
+%meson_build
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT    \
-             RUN_QUERY_LOADER_TEST=false
+%meson_install
 
-# Remove unpackaged files
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.la
-
-touch $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
+touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
 %if %{build_compat32}
-   cp $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders \
-      $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders%{_query_suffix}
+   cp %{buildroot}%{_bindir}/gdk-pixbuf-query-loaders \
+      %{buildroot}%{_bindir}/gdk-pixbuf-query-loaders%{_query_suffix}
 %endif
 
 %find_lang gdk-pixbuf
@@ -155,7 +149,8 @@ fi
 
 %files -f gdk-pixbuf.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS
+%license COPYING
+%doc NEWS README.md
 %{_bindir}/gdk-pixbuf-pixdata
 %{_bindir}/gdk-pixbuf-thumbnailer
 %{_libdir}/libgdk_pixbuf-2.0.so.*
@@ -200,7 +195,11 @@ fi
 %{_libdir}/libgdk_pixbuf_xlib-2.0.so
 %endif
 
+
 %changelog
+* Sat May 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.40.0-1
+- new upstream release.
+
 * Sat Jan 06 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.36.11-1
 - new upstream release.
 - disabled JPEG2000: jasper is too buggy and not fully implemented.

g/gnumeric/gnumeric-vl.spec

@@ -1,40 +1,42 @@
 %define gnumeric_version %{version}-bonobo
 %define goffice_version  0.10.44
 
-Summary:     A spreadsheet program for GNOME.
-Summary(ja): GNOME スプレッドシート
-Name:        gnumeric
-Version:     1.12.44
-Release:     1%{?_dist_release}
-License:     GPLv2 or GPLv3
-Group:       Applications/Productivity
-
-URL:    http://www.gnome.org/projects/gnumeric
-Source0:  ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.12/%{name}-%{version}.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Summary:        A spreadsheet program for GNOME.
+Summary(ja):    GNOME スプレッドシート
+Name:           gnumeric
+Version:        1.12.46
+Release:        1%{?_dist_release}
+Group:          Applications/Productivity
+Distribution:   Vine Linux
+Vendor:         Project Vine
+
+License:        GPLv2 or GPLv3
+URL:            http://www.gnome.org/projects/gnumeric
+%global         shortver %(echo %{version} | cut -d . -f 1,2)
+Source:         https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 
 # default font: VL Gothic
-Patch0: gnumeric-1.11.5-vlgothic.patch
-
-Distribution: Vine Linux
-Vendor: Project Vine
-Packager: Takemikaduchi
-
-BuildRequires: bison
-BuildRequires: flex
-BuildRequires: goffice-devel >= %{goffice_version}
-BuildRequires: pygobject3-devel
-BuildRequires: perl python-devel
-BuildRequires: automake
-BuildRequires: gnome-doc-utils
-BuildRequires: desktop-file-utils
-BuildRequires: itstool
+Patch0:         gnumeric-1.11.5-vlgothic.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  goffice-devel >= %{goffice_version}
+#BuildRequires:  python3-devel
+#BuildRequires:  python3-pygobject
+BuildRequires:  python-devel
+BuildRequires:  pygobject3
+BuildRequires:  pygobject3-devel
+BuildRequires:  perl
+BuildRequires:  automake
+BuildRequires:  gnome-doc-utils
+BuildRequires:  desktop-file-utils
+BuildRequires:  itstool
 
 Requires(postun,posttrans): glib2
 Requires(post,postun): desktop-file-utils
 
-Obsoletes:  %{name}-devel
-
+Obsoletes:      %{name}-devel
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -60,10 +62,9 @@ MS Excelファイルや他の多くのフォーマット(csv, latex, xbase, appl
 %setup -q
 %patch0 -p1 -b .vlgothic
 
+
 %build
-%ifarch alpha
-  MYARCH_FLAGS="--host=alpha-redhat-linux"
-%endif
+export PYTHON=%{__python}
 
 %configure \
     --without-gda \
@@ -71,6 +72,7 @@ MS Excelファイルや他の多くのフォーマット(csv, latex, xbase, appl
     --with-python
 make
 
+
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
@@ -95,9 +97,11 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 rm -rf $RPM_BUILD_ROOT%{_includedir}/libspreadsheet-1.12
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 
+
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /sbin/ldconfig
 scrollkeeper-update > /dev/null 2>&1 || :
@@ -123,7 +127,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %files -f %{name}-%{version}.lang
 %defattr (-, root, root)
-%doc AUTHORS BUGS *ChangeLog* COPYING HACKING NEWS README
+%license COPYING*
+%doc AUTHORS BUGS *ChangeLog* HACKING NEWS README
 %{_bindir}/*
 %{_libdir}/libspreadsheet*.so
 %{_libdir}/%{name}
@@ -140,6 +145,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Sat May 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.46-1
+- new upstream release.
+
 * Tue Jan 29 2019 Toshiaki Ara <ara_t@384.jp> 1.12.44-1
 - new upstream release
 

g/goffice/goffice-vl.spec

@@ -1,25 +1,24 @@
-Summary: Set of document centric objects and utilities for glib/gtk
-Name: goffice
-Version: 0.10.44
-Release: 1%{?_dist_release}
-Source0: http://ftp.gnome.org/pub/GNOME/sources/goffice/0.10/%{name}-%{version}.tar.xz
-
-License: GPL
-Group: System Environment/Libraries
-URL: http://www.gnome.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-BuildRequires: bison
-BuildRequires: flex
-BuildRequires: gtk3-devel >= 3.0.0
-BuildRequires: libxml2-devel >= 2.4.12
-BuildRequires: libgsf-devel >= 1.14.9
-BuildRequires: librsvg2-devel >= 2.22.0
-BuildRequires: libxslt-devel
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduch
+Summary:        Set of document centric objects and utilities for glib/gtk
+Name:           goffice
+Version:        0.10.46
+Release:        1%{?_dist_release}
+Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPL
+URL:            http://www.gnome.org
+%global         shortver %(echo %{version} | cut -d . -f 1,2)
+Source:         https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  gtk3-devel >= 3.0.0
+BuildRequires:  libxml2-devel >= 2.4.12
+BuildRequires:  libgsf-devel >= 1.14.9
+BuildRequires:  librsvg2-devel >= 2.22.0
+BuildRequires:  libxslt-devel
 
 %description
 There are common operations for document centric applications that are
@@ -28,6 +27,7 @@ conceptually simple, but complex to implement fully.
     - load/save documents
     - undo/redo
 
+
 %package devel
 Summary: Development files of the Goffice library.
 Group: Development/Libraries
@@ -37,13 +37,16 @@ Requires: pkgconfig
 %description devel
 Development files of the Goffice library.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -52,9 +55,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %find_lang %{name}-%{version}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -62,6 +67,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}-%{version}.lang
 %defattr(-,root,root)
+%license COPYING*
 %doc README NEWS AUTHORS BUGS ChangeLog MAINTAINERS
 %{_libdir}/lib*.so.*
 %{_libdir}/%{name}/%{version}
@@ -76,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat May 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.10.46-1
+- new upstream release.
+
 * Tue Jan 29 2019 Toshiaki Ara <ara_t@384.jp> 0.10.44-1
 - new upstream release
 

lib/libg/libgsf/libgsf-vl.spec

@@ -1,27 +1,26 @@
-Summary: GNOME Structured File library
-Summary(ja): GNOME 構造化ファイルライブラリ
-
-Name: libgsf
-Version: 1.14.46
-Release: 1%{?_dist_release}
-Group: System Environment/Libraries
-License: GPL
-
-URL: https://ftp.gnome.org/pub/gnome/sources/libgsf/
-%define shortver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
-Source: https://ftp.gnome.org/pub/gnome/sources/libgsf/%{shortver}/libgsf-%{version}.tar.xz
-
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: glib2-devel >= 2.26.0
-BuildRequires: libxml2-devel >= 2.4.16
-BuildRequires: gobject-introspection-devel
-BuildRequires: gdk-pixbuf2-devel
-BuildRequires: bzip2-devel
-BuildRequires: zlib-devel
-BuildRequires: popt-devel
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Summary:        GNOME Structured File library
+Summary(ja):    GNOME 構造化ファイルライブラリ
+Name:           libgsf
+Version:        1.14.47
+Release:        1%{?_dist_release}
+Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPL
+URL:            https://ftp.gnome.org/pub/gnome/sources/libgsf/
+%global         shortver %(echo %{version} | cut -d . -f 1,2)
+Source:         https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
+
+Buildroot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  glib2-devel >= 2.26.0
+BuildRequires:  libxml2-devel >= 2.4.16
+BuildRequires:  gobject-introspection-devel
+BuildRequires:  gdk-pixbuf2-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  zlib-devel
+BuildRequires:  popt-devel
+BuildRequires:  gtk-doc
 
 %description
 A library for reading and writing structured files (eg MS OLE and Zip)
@@ -92,6 +91,9 @@ if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi
 %{_datadir}/gtk-doc/html/gsf
 
 %changelog
+* Sat May 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.47-1
+- new upstream release.
+
 * Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.46-1
 - new upstream release.
 

n/nss/nss-vl.spec

@@ -1,7 +1,7 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %define nspr_version 4.22
-%define pem_version 1.0.5
+%define pem_version 1.0.6
 %define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv"
 
@@ -18,24 +18,24 @@
     %{?__debug_package:%{__debug_install_post}} \
     %{__arch_install_post} \
     %{__os_install_post} \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreeblpriv3.so \
     $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreeblpriv3.so \
     $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \
 %{nil}
 
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.46
-Release:          1%{?_dist_release}
-License:          MPLv1.1 or GPLv2+ or LGPLv2+
-URL:              http://www.mozilla.org/projects/security/pki/nss/
+Version:          3.51.1
+Release:          2%{?_dist_release}
 Group:            System Environment/Libraries
 Vendor:           Project Vine
 Distribution:     Vine Linux
 
-%define           altver %(echo %{version} | sed -e 's/\\./_/')
+License:          MPLv1.1 or GPLv2+ or LGPLv2+
+URL:              http://www.mozilla.org/projects/security/pki/nss/
+%define           altver %(echo %{version} | sed -e 's/\\./_/g')
 Source0:          https://archive.mozilla.org/pub/security/nss/releases/NSS_%{altver}_RTM/src/%{name}-%{version}.tar.gz
 Source1:          nss.pc.in
 Source2:          nss-config.in
@@ -86,7 +86,8 @@ Patch50:          iquote.patch
 Patch58: rhbz1185708-enable-ecc-3des-ciphers-by-default.patch
 Patch62: nss-skip-util-gtest.patch
 
-Patch1000: nss-enable-pem.patch
+# dropped: get same effect by sed
+#Patch1000: nss-enable-pem.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
@@ -159,6 +160,9 @@ and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
 v3 certificates, and other security standards.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %setup -q -T -D -n %{name}-%{version} -a 1000
@@ -176,8 +180,9 @@ pushd nss
 %patch62 -p1 -b .skip_util_gtest
 popd
 
-%patch1000 -p0 -b .libpem
-
+# enable nss-pem
+sed -i -e 's/^DIRS = builtins/DIRS = builtins pem/' \
+	nss/lib/ckfw/manifest.mn
 
 pemNeedsFromSoftoken="lowkeyi lowkeyti softoken softoknt"
 for file in ${pemNeedsFromSoftoken}; do
@@ -274,10 +279,18 @@ export IN_TREE_FREEBL_HEADERS_FIRST=1
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
-for file in libsoftokn3.so libfreebl3.so libfreeblpriv3.so \
-            libnss3.so libnssutil3.so \
-            libssl3.so libsmime3.so libnssckbi.so \
-            libnsspem.so libnssdbm3.so
+for file in \
+	libfreebl3.so \
+	libfreeblpriv3.so \
+    libnss3.so \
+    libnssckbi.so \
+    libnssdbm3.so \
+    libnsspem.so \
+    libnsssysinit.so \
+    libnssutil3.so \
+    libsmime3.so \
+    libsoftokn3.so \
+    libssl3.so
 do
   %{__install} -m 755 dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
@@ -436,16 +449,17 @@ chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
 
 %files
 %defattr(-,root,root)
+%{_libdir}/libfreebl3.so
+%{_libdir}/libfreeblpriv3.so
 %{_libdir}/libnss3.so
-%{_libdir}/libnssutil3.so
+%{_libdir}/libnssckbi.so
 %{_libdir}/libnssdbm3.so
-%{_libdir}/libssl3.so
+%{_libdir}/libnsspem.so
+%{_libdir}/libnsssysinit.so
+%{_libdir}/libnssutil3.so
 %{_libdir}/libsmime3.so
 %{_libdir}/libsoftokn3.so
-%{_libdir}/libnssckbi.so
-%{_libdir}/libnsspem.so
-%{_libdir}/libfreebl3.so
-%{_libdir}/libfreeblpriv3.so
+%{_libdir}/libssl3.so
 %{unsupported_tools_directory}/shlibsign
 %{_libdir}/libfreebl3.chk
 %{_libdir}/libfreeblpriv3.chk
@@ -620,6 +634,14 @@ chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
 
 
 %changelog
+* Wed May 06 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.51.1-2
+- added missing libnsssysinit.so.
+
+* Sun Apr 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.51.1-1
+- update to 3.51.1.
+- updated nss-pem to 1.0.6.
+- dropped Patch1000: got same effect by sed.
+
 * Fri Sep 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.46-1
 - update to 3.46.
 - updated nss-pem to 1.0.5.

r/rpm/rpm-vl.spec

@@ -31,15 +31,16 @@ Summary(ja): RPM パッケージ管理システム
 Name: rpm
 Version: 4.12.0.1
 %define rpm_version %{version}
-Release: 2%{_dist_release}
+Release: 3%{_dist_release}
 Group: System Environment/Base
-License: GPL
+Vendor: Project Vine
+Distribution: Vine Linux
 
+License: GPL
 Source: http://rpm.org/releases/rpm-4.12.x/rpm-%{version}%{?_prever}.tar.bz2
 %if %{with int_bdb}
 Source1: db-%{bdbver}.tar.gz
 %endif
-Source10: macros.vine
 Source100: rpm-4.11.2-ja.po
 Source110: GROUPS_for_vine.txt
 Source120: GROUPS-DESC_for_vine.txt
@@ -81,6 +82,9 @@ Patch1310: rpm-4.10.0-brp-strip-static-archive-find-a-only.patch
 Patch1320: rpm-4.9.1.2-force-v3-sigs.patch
 Patch1330: rpm-4.9.1.2-enable-xz-payload.patch
 
+# https://github.com/rpm-software-management/rpm/commit/5b4805df2085b0e7c4f09caad62638c3238b3bc1
+Patch10000: rpm-strip.patch
+
 Conflicts: patch < 2.5
 Requires(post): coreutils, shadow-utils
 Requires(postun): coreutils, shadow-utils
@@ -91,6 +95,7 @@ Requires: rpm-libs = %{version}
 %if %{without int_bdb}
 Requires: libdb-utils
 %endif
+Requires: vine-rpm-macros
 
 Obsoletes: rpm-perl < %{version}
 
@@ -125,9 +130,6 @@ BuildRequires: python-devel >= %{with_python_version}
 
 BuildRoot: %{_tmppath}/%{name}-root
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 The RPM Package Manager (RPM) is a powerful command line driven
 package management system capable of installing, uninstalling,
@@ -189,6 +191,7 @@ Requires: rpm = %{rpm_version}-%{release}
 Requires: elfutils, binutils
 Requires: findutils, sed, grep, gawk, diffutils, file, patch >= 2.5
 Requires: zip, gzip, bzip2, cpio, tar, xz
+Requires: vine-rpm-build-macros
 
 %description build
 The rpm-build package contains the scripts and executable programs
@@ -263,6 +266,8 @@ that will manipulate RPM packages and databases.
 %patch1320 -p1 -b .force-v3-sigs
 %patch1330 -p1 -b .enable-xz-payload
 
+%patch10000 -p1 -b .brp-strip
+
 # install updated japanese message catalogue
 cp -f po/ja.po po/ja.po.orig
 cp -f %{SOURCE100} po/ja.po
@@ -336,9 +341,6 @@ install -m 644 scripts/rpm.log ${RPM_BUILD_ROOT}/etc/logrotate.d/rpm
 
 mkdir -p $RPM_BUILD_ROOT/etc/rpm
 
-# install vine macros
-cp %{SOURCE10} $RPM_BUILD_ROOT/etc/rpm/macros.vine
-
 mkdir -p $RPM_BUILD_ROOT/var/spool/repackage
 mkdir -p $RPM_BUILD_ROOT/var/lib/rpm
 for dbi in \
@@ -393,6 +395,9 @@ done
   rm -f .%{__libdir}/python%{with_python_version}/site-packages/rpm/*.{a,la}
   rm -f .%{__libdir}/python%{with_python_version}/site-packages/rpmdb/*.{a,la}
 %endif
+  # obsoleted files (macros for metainfo are provided by vine-rpm-macros)
+  rm -f ./usr/lib/rpm/appdata.prov
+  rm -f ./usr/lib/rpm/fileattrs/appdata.attr
 }
 
 %clean
@@ -456,7 +461,7 @@ exit 0
 %config(noreplace,missingok)	/etc/cron.daily/rpm
 %config(noreplace,missingok)	/etc/logrotate.d/rpm
 %dir				/etc/rpm
-%config(noreplace,missingok)	/etc/rpm/macros.*
+#config(noreplace,missingok)	/etc/rpm/macros.*
 %attr(0755, rpm, rpm)	%dir /var/lib/rpm
 %attr(0755, rpm, rpm)	%dir /var/spool/repackage
 
@@ -548,7 +553,6 @@ exit 0
 %defattr(-,root,root)
 %rpmattr	%{__bindir}/rpmbuild
 %rpmattr	%{__bindir}/rpmspec
-%rpmattr	%{__prefix}/lib/rpm/appdata.prov
 %rpmattr	%{__prefix}/lib/rpm/brp-*
 %rpmattr	%{__prefix}/lib/rpm/check-files
 %rpmattr	%{__prefix}/lib/rpm/check-prereqs
@@ -608,6 +612,12 @@ exit 0
 
 
 %changelog
+* Fri May 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.12.0.1-3
+- moved macros.vine to vine-rpm-macros.
+- dropped appdata macros.
+- imported metainfo.fileattr from upstream.
+- imported Patch10000 from upstream.
+
 * Tue Nov 24 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 4.12.0.1-2
 - add new utils (rpm2archive)