Browse Source

updated 5 packages

desktop-file-utils-0.26-1

glib2-2.66.7-2

gtk2-2.24.33-1

gtk3-3.24.26-2

hicolor-icon-theme-0.17-2
Tomohiro "Tomo-p" KATO 3 years ago
parent
commit
6f61791b4e

+ 45 - 20
d/desktop-file-utils/desktop-file-utils-vl.spec

@@ -1,23 +1,21 @@
 Name: desktop-file-utils
 Summary: Utilities for manipulating .desktop files
 Summary(ja): .desktop ファイルを操作するユーティリティ
-Version: 0.23
+Version: 0.26
 Release: 1%{?_dist_release}
+Group: admin-tools
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Group: Development/Tools
 License: GPLv2
-URL: http://www.freedesktop.org/wiki/Software/desktop-file-utils
-
-Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz
+URL: https://www.freedesktop.org/wiki/Software/desktop-file-utils
+Source0: https://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz
+Source1: desktop-entry-mode-init.el
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: glib2-devel >= 2.4
+BuildRequires: glib2-devel
 BuildRequires: emacs
-
-Obsoletes: desktop-file-validator
-
-Vendor: Project Vine
-Distribution: Vine Linux
+BuildRequires: meson
 
 %description
 .desktop files are used to describe an application for inclusion in
@@ -27,32 +25,59 @@ http://www.freedesktop.org/standards/, and desktop-file-install
 which installs a desktop file to the standard directory, optionally 
 fixing it up in the process.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
-if [ ! -x configure ]; then
-  ./autogen.sh
-fi
-%configure
-make
+%meson
+%meson_build
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
+rm -rf %{buildroot}
+%meson_install
+
+mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/%{name}
+mv %{buildroot}%{_datadir}/emacs/site-lisp/*.el* %{buildroot}%{_datadir}/emacs/site-lisp/%{name}/
+install -Dpm 644 %{SOURCE1} %{buildroot}%{_datadir}/emacs/site-start.d/desktop-entry-mode-init.el
+touch %{buildroot}%{_datadir}/emacs/site-start.d/desktop-entry-mode-init.elc
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+
+%transfiletriggerin -- %{_datadir}/applications
+update-desktop-database &> /dev/null || :
+
+%transfiletriggerpostun -- %{_datadir}/applications
+update-desktop-database &> /dev/null || :
+
 
 %files
 %defattr(-,root,root)
 %license COPYING
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS NEWS README
 %{_bindir}/*
+%dir %{_datadir}/emacs
+%dir %{_datadir}/emacs/site-lisp
 %{_datadir}/emacs/site-lisp/*
+%dir %{_datadir}/emacs/site-start.d
+%{_datadir}/emacs/site-start.d/desktop-entry-mode-init.el
+%ghost %{_datadir}/emacs/site-start.d/desktop-entry-mode-init.elc
 %{_mandir}/man1/*
 
+
 %changelog
+* Mon Mar 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.26-1
+- new upstream release.
+- added triggers.
+
 * Thu Apr 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.23-1
 - new upstream release.
 

+ 35 - 10
g/glib2/glib2-vl.spec

@@ -4,7 +4,7 @@
 Summary:        A library of handy utility functions.
 Name:           glib2
 Version:        2.66.7
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -97,13 +97,14 @@ version %{shortver} of the GLib library.
 %prep
 %setup -q -n glib-%{version}
 
+
 %build
 %meson \
 	-Dselinux=disabled \
 	-Dman=true
-
 %meson_build
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -120,26 +121,45 @@ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gio/modules
 touch $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache
 
+%if %{build_compat32}
+cp -p \
+	%{buildroot}%{_bindir}/gio-querymodules \
+	%{buildroot}%{_bindir}/gio-querymodules-32
+%endif
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/lib*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.cache
 
 %find_lang glib20
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post 
-/sbin/ldconfig
-gio-querymodules %{_libdir}/gio/modules
 
-%postun
-/sbin/ldconfig
-gio-querymodules %{_libdir}/gio/modules
+%ldconfig_scriptlets
+%ldconfig_scriptlets -n compat32-%{name}
+
+%transfiletriggerin -- %{_libdir}/gio/modules
+gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || :
 
-%post -n compat32-%{name} -p /sbin/ldconfig
+%transfiletriggerpostun -- %{_libdir}/gio/modules
+gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || :
 
-%postun -n compat32-%{name} -p /sbin/ldconfig
+%transfiletriggerin -- %{_datadir}/glib-2.0/schemas
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+%transfiletriggerpostun -- %{_datadir}/glib-2.0/schemas
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+%if %{build_compat32}
+%transfiletriggerin -n compat32-%{name} -- %{_libdir}/gio/modules
+gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || :
+
+%transfiletriggerpostun -n compat32-%{name} -- %{_libdir}/gio/modules
+gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || :
+%endif
 
 
 %files -f glib20.lang
@@ -203,6 +223,7 @@ gio-querymodules %{_libdir}/gio/modules
 %if %{build_compat32}
 %files -n compat32-%{name}
 %defattr(-, root, root)
+%{_bindir}/gio-querymodules-32
 %{_libdir}/libglib-2.0.so.*
 %{_libdir}/libgthread-2.0.so.*
 %{_libdir}/libgmodule-2.0.so.*
@@ -217,7 +238,11 @@ gio-querymodules %{_libdir}/gio/modules
 %{_libdir}/glib-2.0
 %endif
 
+
 %changelog
+* Mon Mar 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.66.7-2
+- added triggers.
+
 * Fri Feb 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.66.7-1
 - new upstream release.
 

+ 47 - 13
g/gtk2/gtk2-vl.spec

@@ -12,7 +12,7 @@
 %define gdkpixbuf2_version %{gdkpixbuf2_base_version}-1
 %define gobject_introspection_version 0.9.8
 
-%define base_version 2.24.32
+%define base_version 2.24.33
 %define bin_version 2.10.0
 
 # biarch support
@@ -27,11 +27,14 @@ Summary(ja): X 用 GUI 作成ライブラリ: GIMP ツールキット(GTK+)
 Name: gtk2
 Version: %{base_version}
 Release: 1%{?_dist_release}
-Group: System Environment/Libraries
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
 
 License: LGPLv2+
 URL: https://www.gtk.org/
-%define shortver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
+%define shortver %(echo %{version} | cut -d . -f 1-2)
 Source: https://download.gnome.org/sources/gtk+/%{shortver}/gtk+-%{version}.tar.xz
 
 # biarch support
@@ -86,11 +89,6 @@ Requires(post): libSM >= 1.1.0
 Requires(post): libtiff >= 3.7
 Requires: libXrandr >= 1.3.0
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
-
 %description
 GTK+ is a multi-platform toolkit for creating graphical user
 interfaces. Offering a complete set of widgets, GTK+ is suitable for
@@ -100,7 +98,7 @@ suites.
 %package devel
 Summary: Development tools for GTK+ applications.
 Summary(ja): GTK+ (GIMP ツールキット) アプリケーション開発ツール
-Group: Development/Libraries
+Group: programming
 Requires: gtk2 = %{version}
 Requires: pango-devel >= %{pango_version}
 Requires: gdk-pixbuf2-devel >= %{gdkpixbuf2_version}
@@ -127,7 +125,7 @@ docs for the GTK+ widget toolkit.
 %package -n compat32-%{name}
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Summary(ja): X 用 GUI 作成ライブラリ: GIMP ツールキット(GTK+)
-Group: System Environment/Libraries
+Group: system,legacy
 Requires(post): compat32-glib2 >= %{glib2_version}
 Requires(post): compat32-atk >= %{atk_version}
 Requires(post): compat32-pango >= %{pango_version}
@@ -145,7 +143,7 @@ suites.
 %package -n compat32-%{name}-devel
 Summary: Development tools for GTK+ applications.
 Summary(ja): GTK+ (GIMP ツールキット) アプリケーション開発ツール
-Group: Development/Libraries
+Group: programming,legacy
 Requires: compat32-%{name} = %{version}
 Requires: %{name}-devel = %{version}
 Requires: compat32-libX11-devel, compat32-libXcursor-devel, compat32-libXinerama-devel
@@ -158,6 +156,9 @@ The gtk+-devel package contains the header files and developer
 docs for the GTK+ widget toolkit.  
 
 
+%debug_package
+
+
 %prep
 %setup -q -n gtk+-%{version}
 %patch1 -p1 -b .lib64
@@ -243,13 +244,17 @@ done
       $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0%{_query_suffix}
 %endif
 
+mv %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-update-icon-cache-2.0
+
 # Remove unpackaged files
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/Raleigh
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /sbin/ldconfig
 %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
@@ -257,12 +262,30 @@ rm -rf $RPM_BUILD_ROOT
 %postun 
 /sbin/ldconfig
 if [ $1 = 0 ]; then
-    /bin/rm -f %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
+	update-alternatives \
+		--remove gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-2.0
+
+	/bin/rm -f %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
 fi
 
 %triggerpostun -- gtk2 <= 2.8.11
 /bin/rm -f %{_sysconfdir}/gtk-2.0/gtk.immodules
 
+%transfiletriggerin -- %{_libdir}/gtk-2.0/immodules/ %{_libdir}/gtk-2.0/%{bin_version}/immodules/
+gtk-query-immodules-2.0 --update-cache
+
+%transfiletriggerpostun -- %{_libdir}/gtk-2.0/immodules/ %{_libdir}/gtk-2.0/%{bin_version}/immodules/
+gtk-query-immodules-2.0 --update-cache
+
+
+%posttrans
+if [ ! -L %{_bindir}/gtk-update-icon-cache ]; then
+	rm -f %{_bindir}/gtk-update-icon-cache
+	update-alternatives \
+		--install %{_bindir}/gtk-update-icon-cache gtk-update-icon-cache \
+			%{_bindir}/gtk-update-icon-cache-2.0 20
+fi
+
 %if %{build_compat32}
 %post -n compat32-%{name}
 /sbin/ldconfig
@@ -273,8 +296,15 @@ fi
 if [ $1 = 0 ]; then
     /bin/rm -f %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
 fi
+
+%transfiletriggerin -n compat32-%{name} -- %{_libdir}/gtk-2.0/immodules/ %{_libdir}/gtk-2.0/%{bin_version}/immodules/
+gtk-query-immodules-2.0%{_query_suffix} --update-cache
+
+%transfiletriggerpostun -n compat32-%{name} -- %{_libdir}/gtk-2.0/immodules/ %{_libdir}/gtk-2.0/%{bin_version}/immodules/
+gtk-query-immodules-2.0%{_query_suffix} --update-cache
 %endif
 
+
 %files -f all.lang
 %defattr(-, root, root)
 %license COPYING
@@ -282,7 +312,7 @@ fi
 %{_bindir}/gtk-demo
 %{_bindir}/gtk-builder-convert
 %{_bindir}/gtk-query-immodules-2.0
-%{_bindir}/gtk-update-icon-cache
+%{_bindir}/gtk-update-icon-cache-2.0
 %{_libdir}/libgtk-x11-2.0.so.*
 %{_libdir}/libgdk-x11-2.0.so.*
 %{_libdir}/libgailutil.so.*
@@ -334,7 +364,11 @@ fi
 %{_libdir}/gtk-2.0/include
 %endif
 
+
 %changelog
+* Mon Mar 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.33-1
+- new upstream release.
+
 * Sat Oct 26 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.32-1
 - new upstream release.
 

+ 45 - 20
g/gtk3/gtk3-vl.spec

@@ -12,7 +12,7 @@
 %define gdkpixbuf2_version %{gdkpixbuf2_base_version}-1
 %define gobject_introspection_version 1.46.0
 
-%define base_version 3.24.24
+%define base_version 3.24.26
 %define bin_version 3.0.0
 
 # biarch support
@@ -28,18 +28,20 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Summary(ja): X 用 GUI 作成ライブラリ: GIMP ツールキット(GTK+)
 Name: gtk3
 Version: %{base_version}
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
 License: LGPL
+URL: https://www.gtk.org
 %global shortver %(echo %{version} | cut -d . -f 1,2)
 Source0: https://download.gnome.org/sources/gtk+/%{shortver}/gtk+-%{version}.tar.xz
 
 # for Vine
 Patch100: gtk+-3.14.0-vine-default-theme.patch
 
+BuildRoot: %{_tmppath}/gtk-%{version}-root
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: at-spi2-atk-devel
 BuildRequires: pango-devel >= %{pango_version}
@@ -71,12 +73,10 @@ BuildRequires: libXinerama-devel
 BuildRequires: libXcomposite-devel
 BuildRequires: libXdamage-devel
 
-BuildRoot: %{_tmppath}/gtk-%{version}-root
-
-URL: https://www.gtk.org
-
 # required for icon themes apis to work
 Requires: hicolor-icon-theme
+Requires: libXrandr >= 1.3.0
+Provides: gtk-update-icon-cache = %{version}-%{release}
 
 # We need to prereq these so we can run gtk-query-immodules-2.0
 Requires(post): glib2 >= %{glib2_version}
@@ -85,7 +85,6 @@ Requires(post): pango >= %{pango_version}
 Requires(post): libSM >= 1.1.0
 # We need to prereq libtiff >= 3.7 to run gdk-pixbuf-query-loaders
 Requires(post): libtiff >= 3.7
-Requires: libXrandr >= 1.3.0
 
 %description
 GTK+ is a multi-platform toolkit for creating graphical user
@@ -208,6 +207,8 @@ touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/immodules
 
+mv %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-update-icon-cache-3.0
+
 # Remove unpackaged files
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/Raleigh
@@ -217,30 +218,46 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-%{_bindir}/gtk-query-immodules-3.0 --update-cache || : > /dev/null 2>&1
+if [ $1 = 1 ]; then
+	update-alternatives \
+		--install %{_bindir}/gtk-update-icon-cache gtk-update-icon-cache \
+			%{_bindir}/gtk-update-icon-cache-3.0 30
+fi
 
 %postun 
 /sbin/ldconfig
 if [ $1 -gt 0 ]; then
-  %{_bindir}/gtk-query-immodules-3.0 --update-cache || : > /dev/null 2>&1
+	%{_bindir}/gtk-query-immodules-3.0 --update-cache || : > /dev/null 2>&1
+else
+	update-alternatives \
+		--remove gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-3.0
 fi
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%transfiletriggerin -- %{_libdir}/gtk-3.0/3.0.0/immodules
+gtk-query-immodules-3.0 --update-cache &>/dev/null || :
+
+%transfiletriggerpostun -- %{_libdir}/gtk-3.0/3.0.0/immodules
+gtk-query-immodules-3.0 --update-cache &>/dev/null || :
 
 %posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+if [ ! -L %{_bindir}/gtk-update-icon-cache ]; then
+	rm -f %{_bindir}/gtk-update-icon-cache
+	update-alternatives \
+		--install %{_bindir}/gtk-update-icon-cache gtk-update-icon-cache \
+			%{_bindir}/gtk-update-icon-cache-3.0 30
+fi
 
 %if %{build_compat32}
-%post -n compat32-%{name}
-/sbin/ldconfig
-%{_bindir}/gtk-query-immodules-3.0%{_query_suffix} --update-cache || : > /dev/null 2>&1
+%ldconfig_scriptlets -n compat32-%{name}
 
-%postun -n compat32-%{name}
-/sbin/ldconfig
-if [ $1 = 0 ]; then
-  %{_bindir}/gtk-query-immodules-3.0%{_query_suffix} --update-cache || : > /dev/null 2>&1
-fi
+%transfiletriggerin -n compat32-%{name} -- %{_libdir}/gtk-3.0/3.0.0/immodules
+gtk-query-immodules-3.0%{_query_suffix} --update-cache &>/dev/null || :
+
+%transfiletriggerpostun -n compat32-%{name} -- %{_libdir}/gtk-3.0/3.0.0/immodules
+gtk-query-immodules-3.0%{_query_suffix} --update-cache &>/dev/null || :
 %endif
 
+
 %files -f all.lang
 %defattr(-, root, root)
 %license COPYING
@@ -253,7 +270,7 @@ fi
 %{_bindir}/gtk-builder-tool
 %{_bindir}/gtk-launch
 %{_bindir}/gtk-query-settings
-%exclude %{_bindir}/gtk-update-icon-cache
+%{_bindir}/gtk-update-icon-cache-3.0
 %{_bindir}/gtk-query-immodules-3.0
 %{_libdir}/libgtk-3.so.*
 %{_libdir}/libgdk-3.so.*
@@ -306,6 +323,14 @@ fi
 %endif
 
 %changelog
+* Mon Mar 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.24.26-2
+- added "Provides: /usr/bin/gtk-update-icon-cache".
+
+* Mon Mar 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.24.26-1
+- new upstream release.
+- enabled gtk-update-icon-cache.
+- added triggers.
+
 * Fri Feb 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.24.24-1
 - new upstream release.
 

+ 10 - 10
h/hicolor-icon-theme/hicolor-icon-theme-vl.spec

@@ -2,7 +2,7 @@ Summary: Basic requirement for icon themes
 Summary(ja): アイコンテーマの基本ファイル
 Name: hicolor-icon-theme
 Version: 0.17
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -15,7 +15,8 @@ Source0: http://icon-theme.freedesktop.org/releases/%{name}-%{version}.tar.xz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Conflicts: kdelibs <= 3.2.3-0vl1
-Requires(post): coreutils, gtk2
+Requires(post): coreutils
+Requires: gtk-update-icon-cache
 
 %description
 Contains the basic directories and files needed for icon theme support.
@@ -42,15 +43,11 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+%transfiletriggerin -- %{_datadir}/icons/hicolor
+gtk-update-icon-cache --force %{_datadir}/icons/hicolor &>/dev/null || :
 
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+%transfiletriggerpostun -- %{_datadir}/icons/hicolor
+gtk-update-icon-cache --force %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
@@ -61,6 +58,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Mon Mar 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.17-2
+- added triggers.
+
 * Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.17-1
 - new upstream release.