Browse Source

updated 9 packages

OpenEXR-2.5.5-1

control-center-40.0-2

dracut-053-1

gdm-40.0-2

gnome-keyring-40.0-1

grub2-2.06~rc1-1

libgphoto2-2.5.27-1

vine-logos-2.2.0-1

vine-release-7.0-0.0.4
Tomohiro "Tomo-p" KATO 1 year ago
parent
commit
c0d552e4cb

+ 12 - 19
O/OpenEXR/OpenEXR-vl.spec

@@ -3,7 +3,7 @@
 Name:	        OpenEXR
 Summary:        A high dynamic-range (HDR) image file format
 Summary(ja):    高ダイナミックレンジ(HDR)画像ファイルフォーマット
-Version:        2.5.3
+Version:        2.5.5
 Release:        1%{?_dist_release}
 Group:          graphics
 Vendor:         Project Vine
@@ -30,6 +30,7 @@ OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial
 Light & Magic for use in computer imaging applications. This package contains
 sample applications for handling the format.
 
+
 %package        libs
 Summary:        %{name} runtime libraries
 Summary(ja):    %{name} のランタイムライブラリ
@@ -92,24 +93,19 @@ Headers and libraries for building apps that use ilmbase.
 
 %build
 
-mkdir build
-pushd build
 %cmake \
 	-DPYILMBASE_ENABLE=no \
 	-DOPENEXR_VIEWERS_ENABLE=no \
-	..
-make %{?_smp_mflags}
-popd
+	%{nil}
+%cmake_build
 
 
 %install
 rm -rf %{buildroot}
-
-pushd build
-make install DESTDIR=%{buildroot}
-popd
+%cmake_install
 
 # prepare docs
+rm -rf rpmdocs
 mkdir -p rpmdocs
 cp -a %{buildroot}%{_docdir}/OpenEXR/* rpmdocs/
 rm -rf %{buildroot}%{_docdir}/OpenEXR
@@ -117,13 +113,11 @@ rm -rf %{buildroot}%{_docdir}/OpenEXR
 
 %if %{with check}
 %check
-pushd build
 %ifarch %{ix86}
-make %{_smp_mflags} test ||:
+%ctest ||:
 %else
-make %{_smp_mflags} test
+%ctest
 %endif
-popd
 %endif
 
 
@@ -131,11 +125,6 @@ popd
 rm -rf %{buildroot}
 
 
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
 %files
 %defattr(-,root,root,-)
 %license LICENSE.md
@@ -180,6 +169,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 06 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5.5-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Sat Dec 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5.3-1
 - new upstream release.
 

+ 7 - 1
c/control-center/control-center-vl.spec

@@ -23,7 +23,7 @@ Summary: GNOME Control Center.
 Summary(ja): GNOME コントロールセンター
 Name: control-center
 Version: 40.0
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: desktop-gnome,admin-tools
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -33,6 +33,7 @@ License: GPLv2+ and GFDL+
 URL: http://www.gnome.org
 %global shortver %(echo %{version} | cut -d . -f 1)
 Source0: https://download.gnome.org/sources/gnome-%{name}/%{shortver}/gnome-%{name}-%{version}.tar.xz
+Patch1: logo-128.patch
 # patch for Vine
 Patch1000: 0001-disable-NTP-and-auto-timezone.patch
 
@@ -99,6 +100,7 @@ BuildRequires: libsecret-devel
 BuildRequires: gsound-devel
 BuildRequires: krb5-devel
 BuildRequires: libpwquality-devel
+BuildRequires: libhandy-devel
 BuildRequires: python3
 
 %description
@@ -136,6 +138,7 @@ GNOME コントロールセンターの開発用ファイルが含まれてい
 
 %prep
 %setup -q -n gnome-control-center-%{version}
+%patch1 -p1
 %if !%{with systemd}
 %patch1000 -p1
 %endif
@@ -210,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Apr 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 40.0-2
+- added Patch1 to reduce the size of distro-logo.
+
 * Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 40.0-1
 - new upstream release.
 - dropped scriptlets.

+ 57 - 99
d/dracut/dracut-vl.spec

@@ -1,3 +1,5 @@
+%bcond_with systemd
+
 %define dracutlibdir %{_prefix}/lib/dracut
 %bcond_without doc
 
@@ -9,17 +11,15 @@
 # Variables must be defined
 %define with_nbd                0
 
-%define dist_free_release 3
+%define dist_free_release 1
 
 Name: dracut
-Version: 050
-Release: %{dist_free_release}%{?_dist_release}
-
 Summary: Initramfs generator using udev
-Group: System Environment/Base
+Version: 053
+Release: %{dist_free_release}%{?_dist_release}%{?with_systemd:.systemd}
+Group: system,admin-tools
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: tomop
 
 # The entire source code is GPLv2+
 # except install/* which is LGPLv2+
@@ -28,43 +28,14 @@ URL: https://dracut.wiki.kernel.org/
 # Source can be generated by
 # http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%%{version};sf=tgz
 Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
-Patch1: 0001.patch
-Patch2: 0002.patch
-Patch3: 0003.patch
-Patch4: 0004.patch
-Patch5: 0005.patch
-Patch6: 0006.patch
-Patch7: 0007.patch
-Patch8: 0008.patch
-Patch9: 0009.patch
-Patch10: 0010.patch
-Patch11: 0011.patch
-Patch12: 0012.patch
-Patch13: 0013.patch
-Patch14: 0014.patch
-Patch15: 0015.patch
-Patch16: 0016.patch
-Patch17: 0017.patch
-Patch18: 0018.patch
-Patch19: 0019.patch
-Patch20: 0020.patch
-Patch21: 0021.patch
-Patch22: 0022.patch
-Patch23: 0023.patch
-Patch24: 0024.patch
-Patch25: 0025.patch
-
-Patch1000: dracut-050-resolve-symlink.patch
-
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
-
-Source1000: dracut-warpclock.tar.gz
-
 Source2000: vine.conf
 Source2001: vine-module-setup.sh
 Source2002: vine-usb-pre-udev.sh
 Source2003: ChangeLog.fedora
 
+Patch1000: dracut-050-resolve-symlink.patch
+
 BuildRequires: bash git
 BuildRequires: kmod-devel >= 15
 
@@ -81,25 +52,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
 %endif
 
 %if %{with doc}
-%if 0%{?fedora} || 0%{?rhel}
 BuildRequires: docbook-style-xsl docbook-dtds libxslt
-%endif
-
-%if 0%{?suse_version}
--BuildRequires: docbook-xsl-stylesheets libxslt
-%endif
-
 BuildRequires: asciidoc
 %endif
 
-%if 0%{?fedora} > 12 || 0%{?rhel}
 # no "provides", because dracut does not offer
 # all functionality of the obsoleted packages
 Obsoletes: mkinitrd < 6.0.94
 Obsoletes: mkinitrd-devel < 6.0.94
 Obsoletes: nash < 6.0.94
-Obsoletes: libbdevid-python < 6.0.94
-%endif
 
 %if 0%{?fedora} > 16 || 0%{?rhel} > 6
 BuildRequires: systemd-units
@@ -122,26 +83,12 @@ Requires: kmod
 Requires: sed
 Requires: xz
 Requires: xz-lzma-compat
+Requires: zstd
 Requires: gzip
 
-Recommends: grubby
-Recommends: hardlink
-Recommends: pigz
-Recommends: kpartx
-
-%if 0%{?fedora} || 0%{?rhel} > 6
-Requires: util-linux >= 2.21
-Requires: systemd >= 219
-Requires: systemd-udev >= 219
-Requires: procps-ng
-Conflicts: grubby < 8.23
-Conflicts: initscripts < 8.63-1
-Conflicts: plymouth < 0.8.0-0.2009.29.09.19.1
-Conflicts: bcache-tools < 0-0.14.20130909git
-%else
+Requires: procps
 Requires: udev > 166
 Requires: util-linux-ng >= 2.21
-%endif
 
 Conflicts: mdadm < 3.2.6-14
 
@@ -152,8 +99,10 @@ into the initramfs. dracut contains various modules which are driven by the
 event-based udev. Having root on MD, DM, LVM2, LUKS is supported as well as
 NFS, iSCSI, NBD, FCoE with the dracut-network package.
 
+
 %package network
 Summary: dracut modules to build a dracut initramfs with network support
+Group: system
 %if 0%{?_module_build}
 # In the module-build-service, we have pieces of dracut provided by different
 # modules ("base-runtime" provides most functionality, but we need
@@ -173,9 +122,11 @@ Provides:  dracut-generic = %{version}-%{release}
 This package requires everything which is needed to build a generic
 all purpose initramfs with network support with dracut.
 
+
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
 %package fips
 Summary: dracut modules to build a dracut initramfs with an integrity check
+Group: system,security
 Requires: %{name} = %{version}-%{release}
 Requires: hmaccalc
 %if 0%{?rhel} > 5
@@ -193,14 +144,17 @@ initramfs with dracut, which does an integrity check.
 
 %package fips-aesni
 Summary: dracut modules to build a dracut initramfs with an integrity check with aesni-intel
+Group: system,security
 Requires: %{name}-fips = %{version}-%{release}
 
 %description fips-aesni
 This package requires everything which is needed to build an
 initramfs with dracut, which does an integrity check and adds the aesni-intel kernel module.
 
+
 %package caps
 Summary: dracut modules to build a dracut initramfs which drops capabilities
+Group: system
 Requires: %{name} = %{version}-%{release}
 Requires: libcap
 
@@ -208,8 +162,10 @@ Requires: libcap
 This package requires everything which is needed to build an
 initramfs with dracut, which drops capabilities.
 
+
 %package live
 Summary: dracut modules to build a dracut initramfs with live image capabilities
+Group: system
 %if 0%{?_module_build}
 # See the network subpackage comment.
 Requires: %{name} >= %{version}-%{dist_free_release}
@@ -223,8 +179,10 @@ Requires: tar gzip coreutils bash device-mapper curl
 This package requires everything which is needed to build an
 initramfs with dracut, with live image capabilities, like Live CDs.
 
+
 %package config-generic
 Summary: dracut configuration to turn off hostonly image generation
+Group: system
 Requires: %{name} = %{version}-%{release}
 Obsoletes: dracut-nohostonly < 030
 Provides:  dracut-nohostonly = %{version}-%{release}
@@ -233,8 +191,10 @@ Provides:  dracut-nohostonly = %{version}-%{release}
 This package provides the configuration to turn off the host specific initramfs
 generation with dracut and generates a generic image by default.
 
+
 %package config-rescue
 Summary: dracut configuration to turn on rescue image generation
+Group: system
 Requires: %{name} = %{version}-%{release}
 Obsoletes: dracut < 030
 
@@ -242,20 +202,26 @@ Obsoletes: dracut < 030
 This package provides the configuration to turn on the rescue initramfs
 generation with dracut.
 
+
 %package tools
 Summary: dracut tools to build the local initramfs
+Group: admin-tools
 Requires: %{name} = %{version}-%{release}
 
 %description tools
 This package contains tools to assemble the local initrd and host configuration.
 
+
+%debug_package
+
+
 %prep
 %autosetup -n %{name}-%{version} -S git_am
 
 cp %{SOURCE1} .
-
 cp %{SOURCE2003} .
 
+
 %build
 %configure \
 %if %{defined _unitdir}
@@ -271,6 +237,7 @@ cp %{SOURCE2003} .
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf -- $RPM_BUILD_ROOT
 
@@ -285,13 +252,6 @@ rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
 %endif
 
-%if %{defined _unitdir}
-# for systemd, better use systemd-bootchart
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00bootchart
-%else
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00systemd-bootchart
-%endif
-
 # we do not support dash in the initramfs
 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
 
@@ -320,17 +280,6 @@ install -m 0644 %{SOURCE2000} %{buildroot}%{dracutlibdir}/dracut.conf.d/01-dist.
 install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/40-fips.conf
 %endif
 
-%if 0%{?fedora} <= 12 && 0%{?rhel} < 6 && 0%{?suse_version} <= 9999
-rm -f -- $RPM_BUILD_ROOT%{_bindir}/mkinitrd
-rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd
-rm -f -- $RPM_BUILD_ROOT%{_mandir}/man8/mkinitrd*
-rm -f -- $RPM_BUILD_ROOT%{_mandir}/man1/lsinitrd*
-%endif
-
-# FIXME: remove after F19
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d
-install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
-
 echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
 echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf
 
@@ -338,10 +287,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 > $RPM_BUILD_ROOT/etc/system-fips
 %endif
 
-#pushd $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/
-#tar xvf %{SOURCE1000}
-#popd
-
 # make to load EHCI driver at first
 mkdir -p %{buildroot}%{dracutlibdir}/modules.d/70ehci_first
 install -m755 %{SOURCE2001} %{buildroot}%{dracutlibdir}/modules.d/70ehci_first/module-setup.sh
@@ -351,24 +296,29 @@ install -m755 %{SOURCE2002} %{buildroot}%{dracutlibdir}/modules.d/70ehci_first/u
 sed -i -e 's|/usr/sbin/|/sbin/|' \
 	%{buildroot}%{dracutlibdir}/modules.d/06rngd/rngd.service
 
+# drop a unshipped file
+rm -f %{buildroot}%{_mandir}/man8/mkinitrd-suse.8*
+
+
 %clean
 rm -rf -- $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,0755)
 %if %{with doc}
-%doc README* HACKING TODO AUTHORS NEWS dracut.html dracut.png dracut.svg
+%doc README* AUTHORS dracut.html dracut.png dracut.svg
 %endif
 %{!?_licensedir:%global license %%doc}
 %license COPYING lgpl-2.1.txt
 %doc ChangeLog.fedora
 %{_bindir}/dracut
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/dracut
 %{_datadir}/bash-completion/completions/lsinitrd
-%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
 %{_bindir}/mkinitrd
 %{_bindir}/lsinitrd
-%endif
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/modules.d
 %{dracutlibdir}/dracut-functions.sh
@@ -389,10 +339,8 @@ rm -rf -- $RPM_BUILD_ROOT
 %if %{with doc}
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man8/*service.8*
-%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
 %{_mandir}/man8/mkinitrd.8*
 %{_mandir}/man1/lsinitrd.1*
-%endif
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man7/dracut.cmdline.7*
 %{_mandir}/man7/dracut.modules.7*
@@ -400,20 +348,25 @@ rm -rf -- $RPM_BUILD_ROOT
 %{_mandir}/man5/dracut.conf.5*
 %endif
 
-%if %{defined _unitdir}
-%{dracutlibdir}/modules.d/00systemd-bootchart
-%else
-%{dracutlibdir}/modules.d/00bootchart
-%endif
 %{dracutlibdir}/modules.d/00bash
 %{dracutlibdir}/modules.d/00systemd
 %{dracutlibdir}/modules.d/00warpclock
+%{dracutlibdir}/modules.d/01systemd-ask-password
+%{dracutlibdir}/modules.d/01systemd-coredump
 %{dracutlibdir}/modules.d/01systemd-initrd
+%{dracutlibdir}/modules.d/01systemd-modules-load
+%{dracutlibdir}/modules.d/01systemd-repart
+%{dracutlibdir}/modules.d/01systemd-sysctl
+%{dracutlibdir}/modules.d/01systemd-sysusers
 %{dracutlibdir}/modules.d/03modsign
 %{dracutlibdir}/modules.d/03rescue
 %{dracutlibdir}/modules.d/04watchdog
+%{dracutlibdir}/modules.d/04watchdog-modules
 %{dracutlibdir}/modules.d/05busybox
+%{dracutlibdir}/modules.d/06dbus-broker
+%{dracutlibdir}/modules.d/06dbus-daemon
 %{dracutlibdir}/modules.d/06rngd
+%{dracutlibdir}/modules.d/09dbus
 %{dracutlibdir}/modules.d/10i18n
 %{dracutlibdir}/modules.d/30convertfs
 %{dracutlibdir}/modules.d/45url-lib
@@ -434,13 +387,13 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/90multipath
 %{dracutlibdir}/modules.d/90nvdimm
 %{dracutlibdir}/modules.d/90qemu
-%{dracutlibdir}/modules.d/90stratis
 %{dracutlibdir}/modules.d/90ppcmac
 %{dracutlibdir}/modules.d/91crypt-gpg
 %{dracutlibdir}/modules.d/91crypt-loop
 %{dracutlibdir}/modules.d/95debug
 %{dracutlibdir}/modules.d/95fstab-sys
 %{dracutlibdir}/modules.d/95lunmask
+%{dracutlibdir}/modules.d/95nvmf
 %{dracutlibdir}/modules.d/95resume
 %{dracutlibdir}/modules.d/95rootfs-block
 %{dracutlibdir}/modules.d/95terminfo
@@ -482,6 +435,7 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/98dracut-systemd
 %{dracutlibdir}/modules.d/98usrmount
 %{dracutlibdir}/modules.d/99base
+%{dracutlibdir}/modules.d/99memstrack
 %{dracutlibdir}/modules.d/99fs-lib
 %{dracutlibdir}/modules.d/99shutdown
 %{dracutlibdir}/modules.d/99squash
@@ -505,7 +459,6 @@ rm -rf -- $RPM_BUILD_ROOT
 %{_unitdir}/initrd.target.wants/dracut-pre-pivot.service
 %{_unitdir}/initrd.target.wants/dracut-pre-trigger.service
 %{_unitdir}/initrd.target.wants/dracut-pre-udev.service
-
 %endif
 %{_prefix}/lib/kernel/install.d/50-dracut.install
 
@@ -514,6 +467,7 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/02systemd-networkd
 %{dracutlibdir}/modules.d/35network-legacy
 %{dracutlibdir}/modules.d/35network-manager
+%{dracutlibdir}/modules.d/35network-wicked
 %{dracutlibdir}/modules.d/40network
 %{dracutlibdir}/modules.d/90kernel-network-modules
 %{dracutlibdir}/modules.d/95fcoe
@@ -575,9 +529,13 @@ rm -rf -- $RPM_BUILD_ROOT
 %defattr(-,root,root,0755)
 %{dracutlibdir}/dracut.conf.d/02-rescue.conf
 %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
-%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
+
 
 %changelog
+* Tue Apr 06 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 053-1
+- new upstream release.
+- added O:mkinitrd, nash.
+
 * Fri Apr 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 050-3
 - added support for recursive symlink of /sbin/init.
 

+ 7 - 3
g/gdm/gdm-vl.spec

@@ -17,7 +17,7 @@ Summary: The GNOME Display Manager
 Summary(ja): GNOME ディスプレイマネージャ
 Name: gdm
 Version: 40.0
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: desktop-gnome,system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -124,8 +124,10 @@ Development files and headers for writing GDM greeters.
 %setup -q -n %{name}-%{version}
 %if !%{with systemd}
 %patch501 -p1 -b .elogind
+sed -i -e '/XORG_RUN_AS_USER_OK/d' ./daemon/gdm-x-session.c
 %endif
 
+
 %build
 %meson -Dpam-prefix=%{_sysconfdir} \
        -Dpam-mod-dir=/%{_lib}/security \
@@ -209,8 +211,6 @@ chmod 755 %{buildroot}%{_sbindir}/gdm
 exit 0
 
 %post
-/sbin/ldconfig
-
 # if the user already has a config file, then migrate it to the new
 # location; rpm will ensure that old file will be renamed
 
@@ -355,6 +355,10 @@ dconf update
 
 
 %changelog
+* Sat Apr 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 40.0-2
+- don't set XORG_RUN_AS_USER_OK without systemd.
+- updated Source100.
+
 * Fri Apr 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 40.0-1
 - new upstream release.
 - dropped Source2-4.

+ 11 - 23
g/gnome-keyring/gnome-keyring-vl.spec

@@ -3,14 +3,15 @@
 Summary: A framework for managing user passwords and other secrets
 Summary(ja): ユーザのパスワードや秘匿情報を管理するためのフレームワーク
 Name: gnome-keyring
-Version: 3.36.0
+Version: 40.0
 Release: 1%{?_dist_release}
+Group: desktop-gnome,security
 Vendor: Project Vine
 Distribution: Vine Linux
 
 License: GPL/LGPL
 URL: http://www.gnome.org
-%define shortver %(echo %{version} | cut -d. -f1-2)
+%define shortver %(echo %{version} | cut -d. -f1)
 Source0:https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 Patch2: %{name}-2.31.91-configure-vine.patch
 
@@ -49,7 +50,7 @@ with the keyring.
 %package pam
 Summary: A pam module for unlocking keyrings at login time
 License: LGPLv2+
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 # for /lib/security
 Requires: pam
@@ -60,6 +61,9 @@ automatically unlock the "login" keyring when the user logs in
 and start the keyring daemon.
 
 
+%debug_packcage
+
+
 %prep
 %setup -q -n gnome-keyring-%{version}
 %patch2 -p1 -b .vine
@@ -94,26 +98,6 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.la
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-/sbin/ldconfig
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
-update-mime-database %{_datadir}/mime > /dev/null || :
-
-
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ]; then
-	glib-compile-schemas %{_datadir}/glib-2.0/schemas
-	gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-	update-mime-database %{_datadir}/mime > /dev/null || :
-fi
-
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas
-
-
 %files -f %{name}.lang
 %defattr(-, root, root)
 %license COPYING COPYING.LIB
@@ -144,6 +128,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 %changelog
+* Sat Apr 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 40.0-1
+- new upstream release.
+- dropped scriptlets.
+
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.0-1
 - new upstream release.
 

+ 17 - 9
g/grub2/grub2-vl.spec

@@ -5,15 +5,15 @@
 %undefine _missing_build_ids_terminate_build
 %global _configure_gnuconfig_hack 0
 
-%global tarversion 2.04
+%global tarversion 2.06~rc1
 %global gnulibversion fixes
 
 %global build_cflags %{optflags}
 %global build_ldflags %{nil}
 
 Name:           grub2
-Version:        2.04
-Release:        5%{?_dist_release}%{?with_systemd:.systemd}
+Version:        2.06~rc1
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        Bootloader with support for Linux, Multiboot and more
 Group:          system
 License:        GPLv3+
@@ -47,13 +47,14 @@ Source1002:     grub2-theme-vine.tar.gz
 
 # Vine patch(es)
 Patch100001:	100001-change-title-for-Vine-Linux.patch
+Patch100002:	100002-fix-localedir-in-grub.cfg.patch
 
 BuildRequires:	gcc efi-srpm-macros
 BuildRequires:	flex bison binutils python3
 BuildRequires:	ncurses-devel xz-devel bzip2-devel
 BuildRequires:	freetype2-devel libusb1-devel fuse-devel
 BuildRequires:	rpm-devel
-BuildRequires:	rpm-devel rpm-libs
+BuildRequires:	rpm-libs
 BuildRequires:	autoconf automake autogen device-mapper-devel
 BuildRequires:	freetype-devel gettext-devel git
 BuildRequires:	texinfo
@@ -207,8 +208,8 @@ This package provides Vine Linux theme.
 %prep
 %do_common_setup
 
-cp -f %{SOURCE1001} po/ja.po
 pushd po
+cp -f %{SOURCE1001} ja.po
 msgfmt -v ja.po -o ja.gmo
 popd
 
@@ -247,9 +248,11 @@ sed -i \
 	grub-core/lib/gnulib/Makefile.in \
 	grub-core/lib/gnulib/Makefile.am
 
+%if %{with systemd}
 sed -i \
 	-e 's|systemdunitdir = .*$|systemdunitdir = %{_unitdir}|' \
 	conf/Makefile.common
+%endif
 
 %if 0%{with_efi_arch}
 %{expand:%do_primary_efi_build %%{grubefiarch} %%{grubefiname} %%{grubeficdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags}}
@@ -316,7 +319,7 @@ EOF
 
 # Install kernel-install scripts
 install -d -m 0755 %{buildroot}%{_prefix}/lib/kernel/install.d/
-install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE10}
+#install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE10}
 install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE3}
 install -d -m 0755 %{buildroot}%{_sysconfdir}/kernel/install.d/
 %if %{with systemd}
@@ -335,7 +338,8 @@ ln -s ../grub-boot-indeterminate.service \
 ln -s ../grub2-systemd-integration.service \
 	%{buildroot}%{_unitdir}/reboot.target.wants
 %else
-rm -rf %{buildroot}%{_unitdir}
+rm -rf %{buildroot}/lib/systemd
+rm -rf %{buildroot}/usr/lib/systemd
 rm -rf %{buildroot}%{_libexecdir}/grub2
 %endif
 
@@ -432,8 +436,7 @@ fi
 %dir %{_datarootdir}/grub/themes/
 %exclude %{_datarootdir}/grub/themes/*
 %attr(0700,root,root) %dir %{_sysconfdir}/grub.d
-%{_prefix}/lib/kernel/install.d/20-grub.install
-%{_prefix}/lib/kernel/install.d/99-grub-mkconfig.install
+%{_prefix}/lib/kernel/install.d/*
 %exclude %{_datarootdir}/grub/*
 %attr(0700,root,root) %dir /boot/%{name}
 %dir /boot/%{name}/locale
@@ -616,6 +619,11 @@ fi
 
 
 %changelog
+* Tue Apr 06 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.06~rc1-1
+- updated to 2.06-rc1.
+- updated ja.po.
+- updated kernel-install scripts.
+
 * Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.04-5
 - rebuilt with rpm-4.16.
 

+ 13 - 5
lib/libg/libgphoto2/libgphoto2-vl.spec

@@ -1,8 +1,9 @@
 Summary: Library for accessing digital cameras
 Summary(ja): デジタルカメラにアクセスするためのライブラリ
 Name: libgphoto2
-Version: 2.5.25
+Version: 2.5.27
 Release: 1%{?_dist_release}
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -37,7 +38,7 @@ however, such as gtkam for example.
 
 %package devel
 Summary: Headers and links to compile against the libgphoto2 library
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 #Requires: libusb-devel >= 0.1.6a
@@ -57,6 +58,9 @@ This package contains files needed to compile applications that
 use libgphoto2.
 
 
+%debug_package
+
+
 %prep
 %autosetup -p1
 
@@ -67,6 +71,7 @@ for i in AUTHORS ChangeLog COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYI
     rm -f ${i}.old
 done
 
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure \
@@ -86,6 +91,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libgphoto2_port/
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf "${RPM_BUILD_ROOT}"
 
@@ -131,12 +137,10 @@ mkdir -p __doc
 mv $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/* __doc
 rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
 
+
 %clean
 rm -rf "${RPM_BUILD_ROOT}"
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
 
 %files -f libgphoto.lang
 %defattr(-,root,root)
@@ -167,6 +171,10 @@ rm -rf "${RPM_BUILD_ROOT}"
 
 
 %changelog
+* Sat Apr 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5.27-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5.25-1
 - new upstream release.
 - dropped Patch3: fixed in upstream.

+ 31 - 12
v/vine-logos/vine-logos-vl.spec

@@ -1,19 +1,19 @@
 Name: vine-logos
 Summary: Vine Linux Logo files
 Summary(ja): Vine Linux のロゴファイル
-Version: 2.1.0
+Version: 2.2.0
 Release: 1%{?_dist_release}
-Group: System Environment/Base
-Source0: %{name}-%{version}.tar.xz
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 License: Copyright 1999-2014 Project Vine, all rights reserved
+Source0: %{name}-%{version}.tar.xz
 
 Buildroot: %{_tmppath}/%{name}-%{name}-root
 BuildArchitectures: noarch
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 This package includes Vine Linux logo files.
 
@@ -30,26 +30,45 @@ Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke
 
+
 %prep
 %setup -q
 
+
 %build
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/vine
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_datadir}/pixmaps/vine
 for i in *; do
-  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/vine
+  install -m 644 $i %{buildroot}%{_datadir}/pixmaps/vine
 done
 
+mkdir -p %{buildroot}/usr/share/icons/hicolor/128x128/apps
+ln -sf \
+	../../../../pixmaps/vine/logo-vinelinux-128.png \
+	%{buildroot}/usr/share/icons/hicolor/128x128/apps/vinelinux-logo.png
+
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %files
-%defattr(-,root,root)
 %{_datadir}/pixmaps/vine
+%dir %{_datadir}/icons
+%dir %{_datadir}/icons/hicolor
+%dir %{_datadir}/icons/hicolor/128x128
+%dir %{_datadir}/icons/hicolor/128x128/apps
+%{_datadir}/icons/hicolor/128x128/apps/vinelinux-logo.png
+
 
 %changelog
+* Sat Apr 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.0-1
+- added vine-gdm-splash.png.
+- created a symlink for gnome-control-center.
+
 * Mon Jul 14 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.1.0-1
 - update logofile, add new monochrome logos
 

+ 5 - 1
v/vine-release/vine-release-vl.spec

@@ -17,7 +17,7 @@ Summary(ja): Vine Linux リリースファイル
 Name: vine-release
 Version: %{vine_version}%{?vinecr:CR}
 # release=1+, alpha/beta=0.1+, seed=0.0.1+
-Release: 0.0.3%{_dist_release}%{?vineseed:.seed}%{?vinebeta:.beta%{vinebeta}}
+Release: 0.0.4%{_dist_release}%{?vineseed:.seed}%{?vinebeta:.beta%{vinebeta}}
 Group: system
 Distribution: Vine Linux
 Vendor: Project Vine
@@ -53,6 +53,7 @@ ANSI_COLOR="0;34"
 CPE_NAME="cpe:/o:projectvine:vinelinux:%{vine_version}"
 HOME_URL="https://vinelinux.org/"
 BUG_REPORT_URL="http://mantis.vinelinux.org/"
+LOGO="vinelinux-logo"
 EOF
 
 cat <<EOF > ${RPM_BUILD_ROOT}/etc/lsb-release
@@ -81,6 +82,9 @@ fi
 
 
 %changelog
+* Sat Apr 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0-0.0.4vl7.seed
+- added LOGO to os-release.
+
 * Thu Mar 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0-0.0.3vl7.seed
 - fixed CPE_NAME in os-release.