Browse Source

updated 26 packages

clutter-1.26.4-2

cmake-3.20.0-1

cogl-1.22.8-2

control-center-40.0-1

evolution-data-server-3.40.0-1

evolution-3.40.0-1

folks-0.15.2-1

glslang-11.2.0-1

gnome-desktop3-40.0-1

gnome-panel-3.40.0-1

gnome-session-40-0.1.beta.

gnome-shell-40.0-1

gsettings-desktop-schemas-40.0-1

gtk-doc-1.33.2-1

gtk3-3.24.28-1

gtk4-4.0.3-1

libgweather-40.0-1

libhandy-1.2.0-3

mutter-40.0-1

python-dbusmock-0.23.0-1

spirv-headers-1.5.4-1

spirv-tools-2020.7-1

vulkan-headers-1.2.170.0-1

vulkan-loader-1.2.170.0-1

vulkan-tools-1.2.170.0-1

vulkan-validation-layers-1.2.170.0-1
Tomohiro "Tomo-p" KATO 3 years ago
parent
commit
5e2ce33ddd

+ 34 - 37
c/clutter/clutter-vl.spec

@@ -1,11 +1,9 @@
-%define         clutter_version 1.26.2
-%define         clutter_release 1%{?_dist_release}
-
 Summary:        Open Source software library for creating rich graphical user interfaces
 Summary:        Open Source software library for creating rich graphical user interfaces
 Summary(ja):    リッチなGUIを作成するためのオープンソースライブラリ
 Summary(ja):    リッチなGUIを作成するためのオープンソースライブラリ
 Name:           clutter
 Name:           clutter
 Version:        1.26.4
 Version:        1.26.4
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
+Group:          system
 Vendor:	        Project Vine
 Vendor:	        Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
@@ -14,8 +12,6 @@ URL:            https://www.clutter-project.org/
 %global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
 %global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
 Source:         https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 Source:         https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 
 
-Patch0:         clutter-fixdso.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
 Requires:       gobject-introspection
 Requires:       gobject-introspection
@@ -23,16 +19,17 @@ Requires:       gobject-introspection
 # libraries
 # libraries
 
 
 BuildRequires:  glib2-devel
 BuildRequires:  glib2-devel
-BuildRequires:	mesa-libGL-devel
-BuildRequires:	mesa-libEGL-devel
 BuildRequires:	gdk-pixbuf2-devel
 BuildRequires:	gdk-pixbuf2-devel
 BuildRequires:	atk-devel
 BuildRequires:	atk-devel
 BuildRequires:	gtk3-devel
 BuildRequires:	gtk3-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig
+BuildRequires:	cairo-devel
 BuildRequires:	pango-devel
 BuildRequires:	pango-devel
 BuildRequires:  libXdamage-devel
 BuildRequires:  libXdamage-devel
 BuildRequires:  libXcomposite-devel
 BuildRequires:  libXcomposite-devel
 BuildRequires:  libXi-devel
 BuildRequires:  libXi-devel
+BuildRequires:	mesa-libGL-devel
+BuildRequires:	mesa-libEGL-devel
 BuildRequires:	gettext
 BuildRequires:	gettext
 BuildRequires:	gtk-doc
 BuildRequires:	gtk-doc
 BuildRequires:  gobject-introspection-devel >= 0.9.5
 BuildRequires:  gobject-introspection-devel >= 0.9.5
@@ -42,6 +39,10 @@ BuildRequires:	libinput-devel
 BuildRequires:	libxkbcommon-devel
 BuildRequires:	libxkbcommon-devel
 BuildRequires:	eudev-libudev-devel
 BuildRequires:	eudev-libudev-devel
 BuildRequires:	libgudev-devel
 BuildRequires:	libgudev-devel
+BuildRequires:	pkgconfig(wayland-client)
+BuildRequires:	pkgconfig(wayland-cursor)
+BuildRequires:	pkgconfig(wayland-server)
+BuildRequires:	pkgconfig(xkbcommon)
 
 
 %description
 %description
 Clutter is an open source software library for creating fast, 
 Clutter is an open source software library for creating fast, 
@@ -58,7 +59,7 @@ Clutterは高速で視覚的にリッチなGUIを作成するためのオープ
 %package		devel
 %package		devel
 Summary:        Clutter development environment
 Summary:        Clutter development environment
 Summary(ja):    Clutterの開発環境
 Summary(ja):    Clutterの開発環境
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig glib2-devel pango-devel fontconfig-devel gdk-pixbuf2-devel
 Requires:       pkgconfig glib2-devel pango-devel fontconfig-devel gdk-pixbuf2-devel
 Requires:       mesa-libGL-devel
 Requires:       mesa-libGL-devel
@@ -76,7 +77,7 @@ clutter
 %package        docs
 %package        docs
 Summary:        Documentation for %{name}
 Summary:        Documentation for %{name}
 Summary(ja):    %{name}用のドキュメント
 Summary(ja):    %{name}用のドキュメント
-Group:          Documentation
+Group:          documentation
 Provides:		%{name}-doc = %{version}-%{release}
 Provides:		%{name}-doc = %{version}-%{release}
 BuildArch:		noarch
 BuildArch:		noarch
 
 
@@ -89,51 +90,42 @@ We hope however it can be used for a lot more.
 This package contains documentation for clutter.
 This package contains documentation for clutter.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1 -b .dso
 
 
 
 
 %build
 %build
-#%configure --enable-gtk-doc \
-#	--enable-introspection=yes \
-#	--disable-silent-rules \
-#	--enable-xinput \
-#	--disable-static
-(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
- %configure $CONFIGFLAGS \
+# gobject introspection does not work with LTO.  There is an effort to fix this
+# in the appropriate project upstreams, so hopefully LTO can be enabled someday
+# Disable LTO.
+%define _lto_cflags %{nil}
+
+%configure \
 	--disable-static \
 	--disable-static \
 	--disable-silent-rules \
 	--disable-silent-rules \
 	--enable-introspection=yes \
 	--enable-introspection=yes \
 	--enable-xinput \
 	--enable-xinput \
-	--enable-x11-backend=yes \
-	--enable-gdk-backend=no \
-	--enable-egl-backend=yes \
-	--enable-evdev-input=yes
- # clutter git ships with some magic to put the git log in shipped tarballs
- # which gets listed in files; don't blow up if it's missing
- if ! test -f ChangeLog; then
-   echo "Created from snapshot" > ChangeLog
- fi
-)
+	--enable-x11-backend \
+	--enable-gdk-backend \
+	--enable-egl-backend \
+	--enable-evdev-input \
+	--enable-wayland-backend \
+	--enable-wayland-compositor
 
 
-make %{?_smp_mflags} V=0
+make %{?_smp_mflags} V=1
 
 
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-#make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL="%{__install} -p -c"
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL="%{__install} -p -c"
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -delete
 
 
 %find_lang %{name}-1.0
 %find_lang %{name}-1.0
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 
 %files -f %{name}-1.0.lang
 %files -f %{name}-1.0.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
@@ -157,6 +149,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.26.4-2
+- rebuilt with wayland.
+- dropped ldconfig scriptlets.
+- dropped Patch0.
+
 * Sun Aug 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.26.4-1
 * Sun Aug 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.26.4-1
 - new upstream release.
 - new upstream release.
 
 

+ 5 - 1
c/cmake/cmake-vl.spec

@@ -7,7 +7,7 @@
 Name: cmake
 Name: cmake
 Summary: Cross-platform make system
 Summary: Cross-platform make system
 Summary(ja): クロスプラットフォームな Make システム
 Summary(ja): クロスプラットフォームな Make システム
-Version: 3.19.6
+Version: 3.20.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Group: programming
 Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
@@ -172,6 +172,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.20.0-1
+- nre upstream release.
+- updated macros.req.
+
 * Sat Feb 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.19.6-1
 * Sat Feb 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.19.6-1
 - updated to 3.19.6.
 - updated to 3.19.6.
 - updated macros.cmake.
 - updated macros.cmake.

+ 34 - 30
c/cogl/cogl-vl.spec

@@ -1,7 +1,8 @@
 Name:           cogl
 Name:           cogl
 Version:        1.22.8
 Version:        1.22.8
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        A small open source library for using 3D graphics hardware to draw pretty pictures
 Summary:        A small open source library for using 3D graphics hardware to draw pretty pictures
+Group:          system
 Vendor:	        Project Vine
 Vendor:	        Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
@@ -9,8 +10,19 @@ License:        LGPLv2+
 URL:            https://www.clutter-project.org/
 URL:            https://www.clutter-project.org/
 %global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
 %global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
 Source0:        https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 Source0:        https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+# Vaguely related to https://bugzilla.gnome.org/show_bug.cgi?id=772419
+# but on the 1.22 branch, and the static inline in the header is gross
+# ajax promises he'll clean this up.
+Patch0:			0001-egl-Use-eglGetPlatformDisplay-not-eglGetDisplay.patch
+# "GL_ARB_shader_texture_lod" is used to do lod biased texturing. It
+# make achieve faster blurring of images instead of using large blur radius.
+Patch1:			0002-add-GL_ARB_shader_texture_lod-support.patch
+# "copy_sub_image" is used to implement feature similar with kwin blur
+# effect by being abel to copy partial of framebuffer contents as texture
+# and do post blurring.
+Patch2:			0003-texture-support-copy_sub_image.patch
+
+BuildRoot:		%{_tmppath}/%{name}-%{version}-root
 
 
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	libXcomposite-devel
 BuildRequires:	libXcomposite-devel
@@ -22,6 +34,10 @@ BuildRequires:	pango-devel
 BuildRequires:	gdk-pixbuf2-devel
 BuildRequires:	gdk-pixbuf2-devel
 BuildRequires:	gstreamer1-plugins-base-devel
 BuildRequires:	gstreamer1-plugins-base-devel
 BuildRequires:	gtk-doc
 BuildRequires:	gtk-doc
+BuildRequires:	pkgconfig(wayland-server)
+BuildRequires:	pkgconfig(wayland-client)
+BuildRequires:	pkgconfig(wayland-cursor)
+BuildRequires:	pkgconfig(wayland-egl)
 
 
 %description
 %description
 Cogl is a small open source library for using 3D graphics hardware to draw
 Cogl is a small open source library for using 3D graphics hardware to draw
@@ -33,7 +49,7 @@ can render without stepping on each others toes.
 %package		devel
 %package		devel
 Summary:        Development tools for cogl
 Summary:        Development tools for cogl
 Summary(ja):    cogl の開発環境
 Summary(ja):    cogl の開発環境
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       pkgconfig
 
 
@@ -45,7 +61,7 @@ cogl.
 %package		gstreamer
 %package		gstreamer
 Summary:        Cogl GStreamer library
 Summary:        Cogl GStreamer library
 Summary(ja):    cogl gstreamer ライブラリ
 Summary(ja):    cogl gstreamer ライブラリ
-Group:          System Environment/Libraries
+Group:          system
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 
 
 %description	gstreamer
 %description	gstreamer
@@ -55,31 +71,22 @@ Requires:       %{name} = %{version}-%{release}
 %package        docs
 %package        docs
 Summary:        Documentation for cogl
 Summary:        Documentation for cogl
 Summary(ja):    cogl 用のドキュメント
 Summary(ja):    cogl 用のドキュメント
-Group:          Documentation
+Group:          documentation
 Provides:       %{name}-doc = %{version}-%{release}
 Provides:       %{name}-doc = %{version}-%{release}
 BuildArch:		noarch
 BuildArch:		noarch
 
 
-
 %description    docs
 %description    docs
 This package contains documentation for cogl.
 This package contains documentation for cogl.
 
 
 
 
-%prep
-%setup -q
+%debug_package
 
 
-for i in `grep -rl "<note>" ./`;
-do
-  sed -i 's/<note>//' $i
-done
 
 
-for i in `grep -rl "<\/note>" ./`;
-do
-  sed -i 's/<\/note>//' $i
-done
+%prep
+%autosetup -p1
 
 
 
 
 %build
 %build
-
 %configure \
 %configure \
 	--enable-gtk-doc \
 	--enable-gtk-doc \
 	--disable-static \
 	--disable-static \
@@ -90,14 +97,14 @@ done
 	--enable-glx=yes \
 	--enable-glx=yes \
 	--enable-introspection=yes \
 	--enable-introspection=yes \
 	--enable-kms-egl-platform=yes \
 	--enable-kms-egl-platform=yes \
-	--enable-xlib-egl-platform=yes
+	--enable-xlib-egl-platform=yes \
+	--enable-wayland-egl-platform \
+	--enable-wayland-egl-server
 
 
-make V=1
+make %{_smp_mflags} V=1
 
 
 
 
 %install
 %install
-rm -rf $RPM_BUILD_ROOT
-#make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL="%{__install} -p -c"
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL="%{__install} -p -c"
 
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -105,14 +112,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 %find_lang %{name}
 %find_lang %{name}
 
 
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license COPYING
 %license COPYING
@@ -140,6 +139,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.22.8-2
+- rebuilt with wayland.
+- dropped ldconfig scriptlets.
+- imported Patch0-2 from rawhdie.
+
 * Sun Aug 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.22.8-1
 * Sun Aug 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.22.8-1
 - new upstream release.
 - new upstream release.
 - dropped Patch0: fixed in upstream.
 - dropped Patch0: fixed in upstream.

+ 11 - 28
c/control-center/control-center-vl.spec

@@ -22,16 +22,16 @@
 Summary: GNOME Control Center.
 Summary: GNOME Control Center.
 Summary(ja): GNOME コントロールセンター
 Summary(ja): GNOME コントロールセンター
 Name: control-center
 Name: control-center
-Version: 3.36.4
+Version: 40.0
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
-Vendor: Project Vine
 Group: desktop-gnome,admin-tools
 Group: desktop-gnome,admin-tools
+Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 Packager: inagaki, daisuke
 Packager: inagaki, daisuke
 
 
 License: GPLv2+ and GFDL+
 License: GPLv2+ and GFDL+
 URL: http://www.gnome.org
 URL: http://www.gnome.org
-%global shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+%global shortver %(echo %{version} | cut -d . -f 1)
 Source0: https://download.gnome.org/sources/gnome-%{name}/%{shortver}/gnome-%{name}-%{version}.tar.xz
 Source0: https://download.gnome.org/sources/gnome-%{name}/%{shortver}/gnome-%{name}-%{version}.tar.xz
 # patch for Vine
 # patch for Vine
 Patch1000: 0001-disable-NTP-and-auto-timezone.patch
 Patch1000: 0001-disable-NTP-and-auto-timezone.patch
@@ -131,19 +131,18 @@ Development tool for GNOME Control Center
 GNOME コントロールセンターの開発用ファイルが含まれています。
 GNOME コントロールセンターの開発用ファイルが含まれています。
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n gnome-control-center-%{version}
 %setup -q -n gnome-control-center-%{version}
 %if !%{with systemd}
 %if !%{with systemd}
 %patch1000 -p1
 %patch1000 -p1
 %endif
 %endif
 
 
-chmod +x tests/network/test-network-panel.py
-
 
 
 %build
 %build
-%meson \
-  -Dwayland=false
-
+%meson
 %meson_build
 %meson_build
 
 
 
 
@@ -173,26 +172,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 
 
-%post
-/sbin/ldconfig
-
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-update-mime-database %{_datadir}/mime > /dev/null
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-%postun
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-update-mime-database %{_datadir}/mime > /dev/null
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-, root, root)
 %defattr(-, root, root)
 %license COPYING
 %license COPYING
@@ -231,6 +210,10 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 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.4-1
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.4-1
 - new upstream release.
 - new upstream release.
 - dropped Patch0: fixed in upstream.
 - dropped Patch0: fixed in upstream.

+ 26 - 46
e/evolution-data-server/evolution-data-server-vl.spec

@@ -4,15 +4,14 @@
 %define largefile_support 1
 %define largefile_support 1
 %{!?with_docs: %global with_docs 0}
 %{!?with_docs: %global with_docs 0}
 
 
-%define glib2_version 2.34.0
-%define gtk3_version 3.6.0
+%define glib2_version 2.46
+%define gtk3_version 3.16
 %define gtk_doc_version 1.18
 %define gtk_doc_version 1.18
 %define intltool_version 0.35.5
 %define intltool_version 0.35.5
-%define orbit2_version 2.14.19
-%define soup_version 2.36.0
-%define libgweather_version 3.2.0
-%define libical_version 0.43
-%define libgdata_version 0.10.1
+%define soup_version 2.25
+%define libgweather_version 3.10
+%define libical_version 3.0.7
+%define libgdata_version 0.15.1
 
 
 %define use_gnome_keyring 1
 %define use_gnome_keyring 1
 %define support_imap4_provider 0
 %define support_imap4_provider 0
@@ -29,9 +28,9 @@
 Summary: Backend data server for evolution
 Summary: Backend data server for evolution
 Summary(ja): Evolution バックエンドデータサーバ
 Summary(ja): Evolution バックエンドデータサーバ
 Name: evolution-data-server
 Name: evolution-data-server
-Version: 3.36.4
+Version: 3.40.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Group: System Environment/Libraries
+Group: system,desktop-gnome
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
@@ -42,18 +41,12 @@ Source0: https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{versio
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
 ### Patches ###
 ### Patches ###
-Patch0: evolution-data-server-strstr.patch
 
 
 ### Dependencies ###
 ### Dependencies ###
 
 
-#Requires: ORBit2 >= %{orbit2_version}
-Requires: libsoup >= %{soup_version}
-
 ### Build Dependencies ###
 ### Build Dependencies ###
 
 
-#BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: cmake
 BuildRequires: cmake
-BuildRequires: libdb-devel
 BuildRequires: flex
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: gettext
 BuildRequires: glib2-devel
 BuildRequires: glib2-devel
@@ -79,8 +72,7 @@ BuildRequires: gcr-devel
 BuildRequires: libaccounts-glib-devel
 BuildRequires: libaccounts-glib-devel
 BuildRequires: libcanberra-gtk3-devel
 BuildRequires: libcanberra-gtk3-devel
 
 
-BuildRequires: vala
-BuildRequires: vala-tools
+BuildRequires: vala, vala-devel
 
 
 BuildRequires: nspr-devel
 BuildRequires: nspr-devel
 BuildRequires: nss-devel
 BuildRequires: nss-devel
@@ -109,7 +101,7 @@ is now used by other packages.
 
 
 %package devel
 %package devel
 Summary: Development files for building against evolution-data-server
 Summary: Development files for building against evolution-data-server
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 Requires: pkgconfig
 Requires: pkgconfig(goa-1.0)
 Requires: pkgconfig(goa-1.0)
@@ -130,7 +122,7 @@ evolution-data-server.
 %package        vala
 %package        vala
 Summary:        Vala bindings for %{name}
 Summary:        Vala bindings for %{name}
 Summary(ja):    %{name} の Vala バインディング
 Summary(ja):    %{name} の Vala バインディング
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 Requires:       vala
 Requires:       vala
 
 
@@ -138,17 +130,15 @@ Requires:       vala
 Vala bindings for %{name}.
 Vala bindings for %{name}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1
-
-%build
 
 
-mkdir -p _build
-cd _build
 
 
+%build
 %if %{ldap_support}
 %if %{ldap_support}
-
 %if %{static_ldap}
 %if %{static_ldap}
 %define ldap_flags -DWITH_OPENLDAP=ON -DWITH_STATIC_LDAP=ON
 %define ldap_flags -DWITH_OPENLDAP=ON -DWITH_STATIC_LDAP=ON
 # Set LIBS so that configure will be able to link with static LDAP libraries,
 # Set LIBS so that configure will be able to link with static LDAP libraries,
@@ -206,7 +196,7 @@ export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-d
 
 
 %cmake -G "Unix Makefiles" \
 %cmake -G "Unix Makefiles" \
         -DENABLE_MAINTAINER_MODE=OFF \
         -DENABLE_MAINTAINER_MODE=OFF \
-        -DWITH_LIBDB=/usr \
+        -DWITH_LIBDB=OFF \
         -DENABLE_FILE_LOCKING=fcntl \
         -DENABLE_FILE_LOCKING=fcntl \
         -DENABLE_DOT_LOCKING=OFF \
         -DENABLE_DOT_LOCKING=OFF \
         -DENABLE_INTROSPECTION=ON \
         -DENABLE_INTROSPECTION=ON \
@@ -216,15 +206,13 @@ export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-d
         -DENABLE_UOA=OFF \
         -DENABLE_UOA=OFF \
         %ldap_flags %krb5_flags %ssl_flags \
         %ldap_flags %krb5_flags %ssl_flags \
         %largefile_flags %gtkdoc_flags \
         %largefile_flags %gtkdoc_flags \
-        ..
+        %{nil}
+%cmake_build
 
 
-make %{?_smp_mflags}
 
 
 %install
 %install
-cd _build
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
+%cmake_install
 
 
 # make sure the directory exists, because it's owned by eds
 # make sure the directory exists, because it's owned by eds
 mkdir $RPM_BUILD_ROOT/%{uimodules_dir} || :
 mkdir $RPM_BUILD_ROOT/%{uimodules_dir} || :
@@ -237,22 +225,8 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/systemd
 
 
 %find_lang %{name}
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ]; then
-  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-fi
-
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-
-
-%files -f _build/%{name}.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license COPYING
 %license COPYING
 %doc README ChangeLog NEWS
 %doc README ChangeLog NEWS
@@ -319,6 +293,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{ecal_backends_dir}/libecalbackendgtasks.so
 %{ecal_backends_dir}/libecalbackendgtasks.so
 %{ecal_backends_dir}/libecalbackendhttp.so
 %{ecal_backends_dir}/libecalbackendhttp.so
 %{ecal_backends_dir}/libecalbackendweather.so
 %{ecal_backends_dir}/libecalbackendweather.so
+%{ecal_backends_dir}/libecalbackendwebdavnotes.so
 %{modules_dir}/module-cache-reaper.so
 %{modules_dir}/module-cache-reaper.so
 %{modules_dir}/module-google-backend.so
 %{modules_dir}/module-google-backend.so
 %{modules_dir}/module-gnome-online-accounts.so
 %{modules_dir}/module-gnome-online-accounts.so
@@ -342,7 +317,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %dir %{_datadir}/vala/vapi
 %dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/*
 %{_datadir}/vala/vapi/*
 
 
+
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.40.0-1
+- new upstream release.
+- dropped scriptlets.
+
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.4-1
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.4-1
 - new upstream release.
 - new upstream release.
 
 

+ 27 - 65
e/evolution/evolution-vl.spec

@@ -27,8 +27,9 @@
 Summary: GNOME's next-generation groupware suite
 Summary: GNOME's next-generation groupware suite
 Summary(ja): GNOME 次世代グループウェアスイート
 Summary(ja): GNOME 次世代グループウェアスイート
 Name: evolution
 Name: evolution
-Version: 3.36.4
+Version: 3.40.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: desktop-gnome,communication,internet
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
@@ -39,9 +40,6 @@ Source0: https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{versio
 
 
 ### Patches ###
 ### Patches ###
 
 
-# to build with libical-3
-Patch1000: evolution-libical3.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
 ### Dependencies ###
 ### Dependencies ###
@@ -114,7 +112,7 @@ Evolution はメーラ,カレンダー,アドレス帳, TO DO リスト,
 %package devel
 %package devel
 Summary: Development files for building against evolution
 Summary: Development files for building against evolution
 Summary(ja): Evolution の開発用ファイル
 Summary(ja): Evolution の開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}
 Requires: %{name} = %{version}
 Requires: gtkhtml4-devel >= %{gtkhtml_version}
 Requires: gtkhtml4-devel >= %{gtkhtml_version}
 Requires: libsoup-devel >= %{soup_version}
 Requires: libsoup-devel >= %{soup_version}
@@ -129,7 +127,7 @@ evolution をリンクするプログラムをビルドするために必要な
 %package        docs
 %package        docs
 Summary:        Documentation for %{name}
 Summary:        Documentation for %{name}
 Summary(ja):    %{name} 用のドキュメント
 Summary(ja):    %{name} 用のドキュメント
-Group:          Documentation
+Group:          documentation
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 BuildArch:	noarch
 BuildArch:	noarch
 
 
@@ -140,7 +138,7 @@ This package contains documentation for %{name}.
 %package help
 %package help
 Summary: Help files for %{name}
 Summary: Help files for %{name}
 Summary(ja): %{name} 用ヘルプファイル
 Summary(ja): %{name} 用ヘルプファイル
-Group: Applications/Documentation
+Group: documentation
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 
 
 %description help
 %description help
@@ -153,7 +151,7 @@ This package contains user documentation for %{name}.
 %package bogofilter
 %package bogofilter
 Summary: Bogofilter plugin for Evolution
 Summary: Bogofilter plugin for Evolution
 Summary(ja): Evolution 用 Bogofilter プラグイン
 Summary(ja): Evolution 用 Bogofilter プラグイン
-Group: Applications/Productivity
+Group: desktop-gnome,communication,internet
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: bogofilter
 Requires: bogofilter
 
 
@@ -167,7 +165,7 @@ Bogofilter を使って迷惑メールをフィルタリングするためのプ
 %package spamassassin
 %package spamassassin
 Summary: SpamAssassin plugin for Evolution
 Summary: SpamAssassin plugin for Evolution
 Summary(ja): Evolution 用 SpamAssassin プラグイン
 Summary(ja): Evolution 用 SpamAssassin プラグイン
-Group: Applications/Productivity
+Group: desktop-gnome,communication,internet
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: spamassassin
 Requires: spamassassin
 
 
@@ -178,14 +176,14 @@ This package contains the plugin to filter junk mail using SpamAssassin.
 SpamAssassin を使って迷惑メールをフィルタリングするためのプラグインです.
 SpamAssassin を使って迷惑メールをフィルタリングするためのプラグインです.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 
 
 
 
 %build
 %build
-mkdir -p _build
-cd _build
-
 # define all of our flags, this is kind of ugly :(
 # define all of our flags, this is kind of ugly :(
 %if %{ldap_support}
 %if %{ldap_support}
 %define ldap_flags -DWITH_OPENLDAP=ON
 %define ldap_flags -DWITH_OPENLDAP=ON
@@ -207,7 +205,7 @@ CFLAGS=`echo "$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-depr
 	-DCMAKE_BUILD_TYPE=Release \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DENABLE_MAINTAINER_MODE=OFF \
 	-DENABLE_MAINTAINER_MODE=OFF \
 	-DVERSION_SUBSTRING=" (%{version}-%{release})" \
 	-DVERSION_SUBSTRING=" (%{version}-%{release})" \
-	%ldap_flags %ssl_flags %gtkdoc_flags %tests_flags \
+	%ldap_flags %ssl_flags \
 	-DENABLE_PLUGINS=all \
 	-DENABLE_PLUGINS=all \
 	-DENABLE_YTNEF=OFF \
 	-DENABLE_YTNEF=OFF \
 	-DENABLE_GSPELL=OFF \
 	-DENABLE_GSPELL=OFF \
@@ -215,11 +213,9 @@ CFLAGS=`echo "$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-depr
 	-DENABLE_INSTALLED_TESTS=OFF \
 	-DENABLE_INSTALLED_TESTS=OFF \
 	-DENABLE_TEXT_HIGHLIGHT=OFF \
 	-DENABLE_TEXT_HIGHLIGHT=OFF \
 	-DENABLE_PST_IMPORT=OFF \
 	-DENABLE_PST_IMPORT=OFF \
-	..
-
-make %{?_smp_mflags}
+	%{nil}
 
 
-cd ..
+%cmake_build
 
 
 # Replace identical images in the help by links.
 # Replace identical images in the help by links.
 # This reduces the RPM size by several megabytes.
 # This reduces the RPM size by several megabytes.
@@ -241,22 +237,7 @@ done
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-cd _build
-make install DESTDIR=$RPM_BUILD_ROOT 
-
-# remove libtool archives for importers and the like
-find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \;
-
-# remove statically built libraries:
-find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \;
-
-rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys
-rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
-
-# evolution link
-#ln -sf ./evolution-%{shortver} $RPM_BUILD_ROOT/%{_bindir}/evolution
-
-cd ..
+%cmake_install
 
 
 %find_lang %name-%{shortver} --all-name --with-gnome
 %find_lang %name-%{shortver} --all-name --with-gnome
 
 
@@ -265,36 +246,10 @@ grep -v "%{_datadir}/locale" evolution-%{shortver}.lang > help.lang
 
 
 
 
 %post
 %post
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %postun
 %postun
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-if [ $1 -eq 0 ]; then
-  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-fi
-
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-
-%postun bogofilter
-if [ $1 -eq 0 ]; then
-  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-fi
-
-%posttrans bogofilter
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-
-%postun spamassassin
-if [ $1 -eq 0 ]; then
-  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-fi
-
-%posttrans spamassassin
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %clean
 %clean
@@ -308,11 +263,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/*.so
 %{_libdir}/evolution/*.so
 
 
 %{_datadir}/GConf/gsettings/evolution.convert
 %{_datadir}/GConf/gsettings/evolution.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.text-highlight.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml
@@ -322,9 +279,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.publish-calendar.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.publish-calendar.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.sender-validator.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.text-highlight.gschema.xml
 
 
 # The main executable
 # The main executable
 %{_bindir}/evolution
 %{_bindir}/evolution
@@ -381,6 +337,9 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-external-editor.eplug
 %{evo_plugin_dir}/org-gnome-external-editor.eplug
 %{evo_plugin_dir}/liborg-gnome-external-editor.so
 %{evo_plugin_dir}/liborg-gnome-external-editor.so
 
 
+%{evo_plugin_dir}/org-gnome-face.eplug
+%{evo_plugin_dir}/liborg-gnome-face.so
+
 %{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug
 %{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug
 %{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so
 %{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so
 
 
@@ -399,15 +358,15 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-save-calendar.eplug
 %{evo_plugin_dir}/org-gnome-save-calendar.eplug
 %{evo_plugin_dir}/liborg-gnome-save-calendar.so
 %{evo_plugin_dir}/liborg-gnome-save-calendar.so
 
 
+%{evo_plugin_dir}/org-gnome-evolution-sender-validation.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-sender-validation.so
+
 %{evo_plugin_dir}/org-gnome-templates.eplug
 %{evo_plugin_dir}/org-gnome-templates.eplug
 %{evo_plugin_dir}/liborg-gnome-templates.so
 %{evo_plugin_dir}/liborg-gnome-templates.so
 
 
 %{evo_plugin_dir}/org-gnome-dbx-import.eplug
 %{evo_plugin_dir}/org-gnome-dbx-import.eplug
 %{evo_plugin_dir}/liborg-gnome-dbx-import.so
 %{evo_plugin_dir}/liborg-gnome-dbx-import.so
 
 
-%{evo_plugin_dir}/org-gnome-face.eplug
-%{evo_plugin_dir}/liborg-gnome-face.so
-
 # Web extensions
 # Web extensions
 %dir %{web_extensions_dir}
 %dir %{web_extensions_dir}
 %{web_extensions_dir}/libewebextension.so
 %{web_extensions_dir}/libewebextension.so
@@ -449,6 +408,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.40.0-1
+- new upstream release.
+
 * Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.4-1
 * Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.4-1
 - new upstream release.
 - new upstream release.
 
 

+ 18 - 32
f/folks/folks-vl.spec

@@ -1,9 +1,10 @@
-%global folks_module_version 46
+%bcond_with     test
 
 
 Summary:        GObject contact aggregation library
 Summary:        GObject contact aggregation library
 Name:           folks
 Name:           folks
-Version:        0.14.0
+Version:        0.15.2
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
+Group:          desktop-gnome,communication,system
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
@@ -12,7 +13,6 @@ URL:            https://telepathy.freedesktop.org/wiki/Folks
 %global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
 %global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
 Source0:        https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 Source0:        https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 
 
-
 BuildRequires:  meson
 BuildRequires:  meson
 BuildRequires:  chrpath
 BuildRequires:  chrpath
 BuildRequires:  evolution-data-server-devel >= 3.0.1
 BuildRequires:  evolution-data-server-devel >= 3.0.1
@@ -29,12 +29,10 @@ BuildRequires:  tracker-devel
 BuildRequires:  python3-dbusmock
 BuildRequires:  python3-dbusmock
 
 
 BuildRequires:  vala
 BuildRequires:  vala
-BuildRequires:  vala-tools
+BuildRequires:  vala-devel
 BuildRequires:  libgee-vala
 BuildRequires:  libgee-vala
 BuildRequires:  evolution-data-server-vala
 BuildRequires:  evolution-data-server-vala
 
 
-Requires(postun,posttrans):	glib2
-
 %description
 %description
 libfolks is a library that aggregates people from multiple sources (e.g. 
 libfolks is a library that aggregates people from multiple sources (e.g. 
 Telepathy connection managers and eventually evolution data server, 
 Telepathy connection managers and eventually evolution data server, 
@@ -43,7 +41,7 @@ Facebook, etc.) to create meta-contacts.
 
 
 %package        devel
 %package        devel
 Summary:        Development files for %{name}
 Summary:        Development files for %{name}
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 Requires:		libgee-devel
 Requires:		libgee-devel
 Requires:		glib2-devel
 Requires:		glib2-devel
@@ -57,7 +55,7 @@ developing applications that use %{name}.
 %package        vala
 %package        vala
 Summary:        Vala bindings for %{name}
 Summary:        Vala bindings for %{name}
 Summary(ja):    %{name} の Vala バインディング
 Summary(ja):    %{name} の Vala バインディング
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 Requires:       vala
 Requires:       vala
 Requires:       libgee-vala
 Requires:       libgee-vala
@@ -67,6 +65,9 @@ Requires:		evolution-data-server-vala
 Vala bindings for %{name}.
 Vala bindings for %{name}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 
 
@@ -84,36 +85,19 @@ Vala bindings for %{name}.
 
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
-# Remove lib64 rpaths
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/folks/%{folks_module_version}/backends/key-file/key-file.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/folks/%{folks_module_version}/backends/ofono/ofono.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/folks/%{folks_module_version}/backends/bluez/bluez.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/folks/%{folks_module_version}/backends/eds/eds.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/folks/%{folks_module_version}/backends/dummy/dummy.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libfolks-dummy.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libfolks-eds.so
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/folks-import
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/folks-inspect
-
 %find_lang %{name}
 %find_lang %{name}
 
 
 
 
-%post -p /sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ]; then
-  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-fi
-
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+%if %{with test}
+%check
+%meson_test
+%endif
 
 
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license COPYING
 %license COPYING
-%doc AUTHORS ChangeLog README
+%doc AUTHORS README.md
 %{_bindir}/%{name}-import
 %{_bindir}/%{name}-import
 %{_bindir}/%{name}-inspect
 %{_bindir}/%{name}-inspect
 %{_libdir}/*.so.*
 %{_libdir}/*.so.*
@@ -135,13 +119,15 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/vala/vapi/folks-dummy.vapi
 %{_datadir}/vala/vapi/folks-dummy.vapi
 %{_datadir}/vala/vapi/folks-eds.deps
 %{_datadir}/vala/vapi/folks-eds.deps
 %{_datadir}/vala/vapi/folks-eds.vapi
 %{_datadir}/vala/vapi/folks-eds.vapi
-%{_datadir}/vala/vapi/folks-tracker.deps
-%{_datadir}/vala/vapi/folks-tracker.vapi
 %{_datadir}/vala/vapi/folks.deps
 %{_datadir}/vala/vapi/folks.deps
 %{_datadir}/vala/vapi/folks.vapi
 %{_datadir}/vala/vapi/folks.vapi
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.15.2-1
+- new upstream release.
+- dropped scriptlets.
+
 * Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.14.0-1
 * Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.14.0-1
 - new upstream release.
 - new upstream release.
 - disabled telepathy.
 - disabled telepathy.

+ 23 - 23
g/glslang/glslang-vl.spec

@@ -1,22 +1,14 @@
-#global commit c9b28b9f3388c607ea5506f5e6197b7150238ad3
-#global shortcommit %(c=%{commit}; echo ${c:0:7})
-#global commit_date 2020421
-#global gitrel .%{commit_date}.git%{shortcommit}
-
 Name:           glslang
 Name:           glslang
 Summary:        OpenGL and OpenGL ES shader front end and validator
 Summary:        OpenGL and OpenGL ES shader front end and validator
-Version:        8.13.3743
-Release:        1%{?gitrel}%{?_dist_release}
+Version:        11.2.0
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
 License:        BSD and GPLv3+ and ASL 2.0
 License:        BSD and GPLv3+ and ASL 2.0
 URL:            https://github.com/KhronosGroup
 URL:            https://github.com/KhronosGroup
-%if 0%{?commit_date}
-Source0:        %url/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
-%else
 Source0:        %url/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source0:        %url/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-%endif
 Patch1:         glslang-default-resource-limits_staticlib.patch
 Patch1:         glslang-default-resource-limits_staticlib.patch
 # Patch to build against system spirv-tools (rebased locally)
 # Patch to build against system spirv-tools (rebased locally)
 #Patch3:         https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch
 #Patch3:         https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch
@@ -34,6 +26,7 @@ interpretation of the specifications for these languages.
 
 
 %package        devel
 %package        devel
 Summary:        Development files for %{name}
 Summary:        Development files for %{name}
+Group:          programming
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
 %description    devel
 %description    devel
@@ -41,28 +34,27 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 ES and OpenGL shading languages. It implements a strict
 ES and OpenGL shading languages. It implements a strict
 interpretation of the specifications for these languages.
 interpretation of the specifications for these languages.
 
 
+
+%debug_package
+
+
 %prep
 %prep
-%if 0%{?commit_date}
-%autosetup -p1 -n %{name}-%{commit}
-%else
 %autosetup -p1 -n %{name}-%{version}
 %autosetup -p1 -n %{name}-%{version}
-%endif
 # Fix rpmlint warning on debuginfo
 # Fix rpmlint warning on debuginfo
 find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x
 find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x
 
 
+
 %build
 %build
-%__mkdir_p build
-pushd build
 %cmake -DCMAKE_BUILD_TYPE=Release \
 %cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
         -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
         -DCMAKE_SKIP_RPATH:BOOL=yes \
         -DCMAKE_SKIP_RPATH:BOOL=yes \
         -DBUILD_SHARED_LIBS=OFF \
         -DBUILD_SHARED_LIBS=OFF \
-        -GNinja ..
-%{ninja_build}
-popd
+        -GNinja
+%cmake_build
+
 
 
 %install
 %install
-%{ninja_install} -C build
+%cmake_install
 
 
 # we don't want them in here
 # we don't want them in here
 rm -rf %{buildroot}%{_includedir}/SPIRV
 rm -rf %{buildroot}%{_includedir}/SPIRV
@@ -70,12 +62,13 @@ rm -rf %{buildroot}%{_includedir}/SPIRV
 %ifnarch s390x ppc64
 %ifnarch s390x ppc64
 %check
 %check
 pushd Test
 pushd Test
-./runtests localResults ../build/StandAlone/glslangValidator ../build/StandAlone/spirv-remap
+./runtests localResults ../%{_vpath_builddir}/StandAlone/glslangValidator ../%{_vpath_builddir}/StandAlone/spirv-remap
 popd
 popd
 %endif
 %endif
 
 
 # Install libglslang-default-resource-limits.a
 # Install libglslang-default-resource-limits.a
-install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildroot}%{_libdir}/
+install -pm 0644 %{_vpath_builddir}/StandAlone/libglslang-default-resource-limits.a %{buildroot}%{_libdir}/
+
 
 
 %files
 %files
 %doc README.md README-spirv-remap.txt
 %doc README.md README-spirv-remap.txt
@@ -90,12 +83,19 @@ install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildro
 %{_libdir}/libSPIRV.a
 %{_libdir}/libSPIRV.a
 %{_libdir}/libSPVRemapper.a
 %{_libdir}/libSPVRemapper.a
 %{_libdir}/libglslang.a
 %{_libdir}/libglslang.a
+%{_libdir}/libGenericCodeGen.a
+%{_libdir}/libMachineIndependent.a
 %{_libdir}/libglslang-default-resource-limits.a
 %{_libdir}/libglslang-default-resource-limits.a
 %{_libdir}/pkgconfig/glslang.pc
 %{_libdir}/pkgconfig/glslang.pc
 %{_libdir}/pkgconfig/spirv.pc
 %{_libdir}/pkgconfig/spirv.pc
 %{_libdir}/cmake/*
 %{_libdir}/cmake/*
 
 
+
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 11.2.0-1
+- new upstream release.
+- updated Patch1 and 3.
+
 * Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 8.13.3743-1
 * Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 8.13.3743-1
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 - new upstream release.
 - new upstream release.

+ 14 - 16
g/gnome-desktop3/gnome-desktop3-vl.spec

@@ -11,14 +11,14 @@
 Summary:	Package containing code shared among gnome-shell, gnome-session, nautilus, etc.
 Summary:	Package containing code shared among gnome-shell, gnome-session, nautilus, etc.
 Summary(ja):	gnome-shell, gnome-session, nautilus などの共用プログラム
 Summary(ja):	gnome-shell, gnome-session, nautilus などの共用プログラム
 Name:		gnome-desktop3
 Name:		gnome-desktop3
-Version:	3.36.4
+Version:	40.0
 Release:	1%{?_dist_release}%{?with_systemd:.systemd}
 Release:	1%{?_dist_release}%{?with_systemd:.systemd}
 Vendor:		Project Vine
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Distribution:	Vine Linux
 
 
 License: 	GPL 
 License: 	GPL 
 URL:		https://www.gnome.org/
 URL:		https://www.gnome.org/
-%global		shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+%global		shortver %(echo %{version} | cut -d . -f 1)
 Source:		https://download.gnome.org/sources/%{origname}/%{shortver}/%{origname}-%{version}.tar.xz
 Source:		https://download.gnome.org/sources/%{origname}/%{shortver}/%{origname}-%{version}.tar.xz
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -95,10 +95,13 @@ Requires:       %{name} = %{version}-%{release}
 This package contains documentation for %{name}.
 This package contains documentation for %{name}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -n gnome-desktop-%{version}
 %setup -n gnome-desktop-%{version}
 %if !%{with systemd}
 %if !%{with systemd}
-%autopatch -p1
+#autopatch -p1
 %endif
 %endif
 
 
 
 
@@ -119,27 +122,16 @@ This package contains documentation for %{name}.
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 %meson_install
 %meson_install
 
 
-%find_lang %{po_package} --with-gnome
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%find_lang %{po_package} --all-name --with-gnome
 
 
 
 
 %files -f %{po_package}.lang
 %files -f %{po_package}.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license COPYING
 %license COPYING
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS NEWS README.md
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.so.*
 %{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
 %{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
-%{_libexecdir}/gnome-rr-debug
 %{_datadir}/gnome/*
 %{_datadir}/gnome/*
-%{_datadir}/help/*/*/*
 
 
 %files devel
 %files devel
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
@@ -147,12 +139,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/*
 %{_includedir}/*
 %{_datadir}/gir-1.0/GnomeDesktop-3.0.gir
 %{_datadir}/gir-1.0/GnomeDesktop-3.0.gir
+%{_libexecdir}/gnome-desktop-debug
 
 
 %files docs
 %files docs
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc
 %{_datadir}/gtk-doc
 
 
+
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 40.0-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Sun Aug 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.1-1
 * Sun Aug 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.1-1
 - new upstream release.
 - new upstream release.
 - dropped ja.po: upstream is newer.
 - dropped ja.po: upstream is newer.

+ 16 - 18
g/gnome-panel/gnome-panel-vl.spec

@@ -22,8 +22,9 @@
 Summary: GNOME panel
 Summary: GNOME panel
 Summary(ja): GNOME パネル
 Summary(ja): GNOME パネル
 Name: gnome-panel
 Name: gnome-panel
-Version: 3.36.2
+Version: 3.40.0
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
+Group: desktop-gnome
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
@@ -37,7 +38,7 @@ Source5: vine-panel-backwards-compat-config.schemas
 Source12: gnome-compiler-flags.m4
 Source12: gnome-compiler-flags.m4
 Source13: panel-default-layout.layout.vine
 Source13: panel-default-layout.layout.vine
 
 
-Patch1000: gnome-panel-3.30.0-elogind.patch
+Patch1000: gnome-panel-3.40.0-elogind.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
@@ -103,10 +104,11 @@ features for the GNOME desktop.
 GNOME パネルは、ウィンドウ一覧・ワークスペース切り換え器・メニューその他の
 GNOME パネルは、ウィンドウ一覧・ワークスペース切り換え器・メニューその他の
 特徴を GNOME デスクトップに提供します。
 特徴を GNOME デスクトップに提供します。
 
 
+
 %package libs
 %package libs
 Summary: Libraries for use in panel applets of GNOME
 Summary: Libraries for use in panel applets of GNOME
 Summary(ja): GNOME のパネルアップレットで使用するライブラリ
 Summary(ja): GNOME のパネルアップレットで使用するライブラリ
-Group: System Environment/Libraries
+Group: system
 
 
 %description libs
 %description libs
 Libraries for use in panel applets of GNOME.
 Libraries for use in panel applets of GNOME.
@@ -114,10 +116,11 @@ Libraries for use in panel applets of GNOME.
 %description libs -l ja
 %description libs -l ja
 GNOME のパネルアプレットで使用するライブラリ
 GNOME のパネルアプレットで使用するライブラリ
 
 
+
 %package devel
 %package devel
 Summary: Development environment for panel applets of GNOME
 Summary: Development environment for panel applets of GNOME
 Summary(ja): GNOME のパネルアップレット用開発環境
 Summary(ja): GNOME のパネルアップレット用開発環境
-Group: Development/Libraries
+Group: programming
 Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: pkgconfig
 Requires: pkgconfig
 Requires: glib2-devel >= %{glib2_version}
 Requires: glib2-devel >= %{glib2_version}
@@ -130,6 +133,9 @@ Header files and libraries for building a panel applets of GNOME.
 GNOME のパネルアプレットをビルドするためのヘッダファイル及びライブラリ集
 GNOME のパネルアプレットをビルドするためのヘッダファイル及びライブラリ集
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 %if !%{with systemd}
 %if !%{with systemd}
@@ -170,28 +176,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %post
 %post
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
 
 
 %postun
 %postun
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-update-desktop-database -q &> /dev/null ||:
 
 
-%posttrans
-update-desktop-database -q &> /dev/null ||:
 
 
-  
 %files -f %{gettext_package}.lang
 %files -f %{gettext_package}.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
-%license COPYING COPYING.LIB
-%doc AUTHORS COPYING-DOCS NEWS README
+%license COPYING COPYING.LESSER
+%doc AUTHORS COPYING-DOCS NEWS README.md
 %{_bindir}/*
 %{_bindir}/*
 %{_libdir}/%{name}/modules/*.so
 %{_libdir}/%{name}/modules/*.so
 %{_datadir}/applications/*.desktop
 %{_datadir}/applications/*.desktop
@@ -211,6 +205,10 @@ update-desktop-database -q &> /dev/null ||:
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.40.0-1
+- new upstream release.
+- updated Patch1000.
+
 * Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.2-1
 * Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.2-1
 - new upstream release.
 - new upstream release.
 
 

+ 44 - 22
g/gnome-session/gnome-session-vl.spec

@@ -7,23 +7,23 @@
 %define dbus_version 1.6.4
 %define dbus_version 1.6.4
 %define libnotify_version 0.7
 %define libnotify_version 0.7
 
 
-%define po_package gnome-session-3.0
+%define po_package gnome-session-40
 
 
 %define _unpackaged_files_terminate_build 1
 %define _unpackaged_files_terminate_build 1
 
 
 Summary: GNOME session manager
 Summary: GNOME session manager
 Summary(ja): GNOME セッションマネージャ
 Summary(ja): GNOME セッションマネージャ
 Name: gnome-session
 Name: gnome-session
-Version: 3.36.0
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Version: 40
+Release: 0.1.beta.%{?_dist_release}%{?with_systemd:.systemd}
 Group: desktop-gnome
 Group: desktop-gnome
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
 License: GPLv2+ 
 License: GPLv2+ 
 URL: http://www.gnome.org/
 URL: http://www.gnome.org/
-%global shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
-Source0: https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
+%global shortver %(echo %{version} | cut -d . -f 1)
+Source0: https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.beta.tar.xz
 Source1: vine-default-session
 Source1: vine-default-session
 Source2: gnome.desktop 
 Source2: gnome.desktop 
 
 
@@ -75,8 +75,34 @@ gnome-session manages a GNOME desktop session. It starts up the other core
 GNOME components and handles logout and saving the session.
 GNOME components and handles logout and saving the session.
 
 
 
 
+%package xsession
+Summary: Desktop file for gnome-session
+Group: desktop-gnome
+Obsoletes: gnome-session < 40
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: xorg-x11-server-Xorg%{?_isa}
+Requires: gnome-shell
+
+%description xsession
+Desktop file to add GNOME to display manager session menu.
+
+
+%package wayland-session
+Summary: Desktop file for wayland based gnome session
+Group: desktop-gnome
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: xorg-x11-server-Xwayland%{?_isa}
+Requires: gnome-shell
+
+%description wayland-session
+Desktop file to add GNOME on wayland to display manager session menu.
+
+
+%debug_package
+
+
 %prep
 %prep
-%setup
+%setup -n %{name}-%{version}.beta
 %patch0 -p1
 %patch0 -p1
 %patch1 -p1
 %patch1 -p1
 %patch4 -p1
 %patch4 -p1
@@ -129,10 +155,6 @@ rm -rf %{buildroot}%{_docdir}/gnome-session
 #rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/*
 #rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/*
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
 
 
-# remove wayland-session
-rm -rf $RPM_BUILD_ROOT%{_datadir}/wayland-sessions
-
-#
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
 
 %find_lang %{po_package}
 %find_lang %{po_package}
@@ -142,20 +164,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 
 
-%post -p /sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-
-
 %files -f %{po_package}.lang
 %files -f %{po_package}.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
 %license COPYING
 %license COPYING
-%doc AUTHORS ChangeLog NEWS README gnome-session.html
+%doc AUTHORS NEWS README
 %{_sysconfdir}/xdg/autostart
 %{_sysconfdir}/xdg/autostart
 %{_bindir}/*
 %{_bindir}/*
 %{_libexecdir}/gnome-session-binary
 %{_libexecdir}/gnome-session-binary
@@ -169,7 +181,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/gnome-session/*.ui
 %{_datadir}/gnome-session/*.ui
 %{_datadir}/gnome-session/hardware-compatibility
 %{_datadir}/gnome-session/hardware-compatibility
 %{_datadir}/gnome-session/sessions/*
 %{_datadir}/gnome-session/sessions/*
-%{_datadir}/xsessions/*
 %dir %{_datadir}/pixmaps/splash
 %dir %{_datadir}/pixmaps/splash
 %{_mandir}/man*/*
 %{_mandir}/man*/*
 %if %{with systemd}
 %if %{with systemd}
@@ -177,8 +188,19 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_userunitdir}/*
 %{_userunitdir}/*
 %endif
 %endif
 
 
+%files xsession
+%{_datadir}/xsessions/*
+
+%files wayland-session
+%{_datadir}/wayland-sessions/*
+
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 40-0.1.beta.
+- new upstream release.
+- dropped scriptlets.
+- added subpackages: xsession and wayland-session.
+
 * Fri Aug 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.0-2
 * Fri Aug 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.0-2
 - added R:xdg-desktop-portal-gtk.
 - added R:xdg-desktop-portal-gtk.
 - updated Patch1001.
 - updated Patch1001.

+ 7 - 17
g/gnome-shell/gnome-shell-vl.spec

@@ -3,15 +3,15 @@
 Summary:	Window management and application launching for GNOME
 Summary:	Window management and application launching for GNOME
 Summary(ja):	GNOME 上でウィンドウの管理及びアプリケーションの起動を行うインターフェース
 Summary(ja):	GNOME 上でウィンドウの管理及びアプリケーションの起動を行うインターフェース
 Name:		gnome-shell
 Name:		gnome-shell
-Version:	3.36.5
+Version:	40.0
 Release:	1%{?_dist_release}%{?with_systemd:.systemd}
 Release:	1%{?_dist_release}%{?with_systemd:.systemd}
-Group:      desktop-gnome
+Group:		desktop-gnome
 Vendor:		Project Vine
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Distribution:	Vine Linux
 
 
 License:	GPLv2+
 License:	GPLv2+
 URL:		http://live.gnome.org/GnomeShell
 URL:		http://live.gnome.org/GnomeShell
-%global		shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+%global		shortver %(echo %{version} | cut -d . -f 1)
 Source0:	https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 Source0:	https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 
 
 Requires: mutter
 Requires: mutter
@@ -30,7 +30,7 @@ BuildRequires: gnome-common
 BuildRequires: at-spi2-atk-devel
 BuildRequires: at-spi2-atk-devel
 BuildRequires: evolution-data-server-devel
 BuildRequires: evolution-data-server-devel
 BuildRequires: gcr-devel
 BuildRequires: gcr-devel
-BuildRequires: gtk3-devel
+BuildRequires: gtk4-devel
 BuildRequires: gdk-pixbuf-devel
 BuildRequires: gdk-pixbuf-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: glib2-devel
 BuildRequires: glib2-devel
@@ -79,6 +79,9 @@ BuildArch:		noarch
 This package contains documentation for %{name}.
 This package contains documentation for %{name}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 
 
@@ -101,28 +104,15 @@ export LANG=ja_JP.UTF-8
 %find_lang %{name}
 %find_lang %{name}
 
 
 
 
-
 %clean
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 
 
 
 %post 
 %post 
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
 
 
 %postun
 %postun
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang

+ 11 - 15
g/gsettings-desktop-schemas/gsettings-desktop-schemas-vl.spec

@@ -2,14 +2,15 @@
 Summary:	A collection of GSettings schemas
 Summary:	A collection of GSettings schemas
 Summary(ja):	GSettingsスキーマのコレクション
 Summary(ja):	GSettingsスキーマのコレクション
 Name:		gsettings-desktop-schemas
 Name:		gsettings-desktop-schemas
-Version:	3.36.1
+Group:		desktop-gnome
+Version:	40.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 Vendor:		Project Vine
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Distribution:	Vine Linux
 
 
 License:	GPLv2
 License:	GPLv2
 URL:		https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas
 URL:		https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas
-%global		shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+%global		shortver %(echo %{version} | cut -d . -f 1)
 Source:		https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 Source:		https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 
 
 # settings for Vine
 # settings for Vine
@@ -35,7 +36,7 @@ GSettingsスキーマのコレクションを含んでいます。
 %package devel
 %package devel
 Summary:        Development tools for gsettings-desktop-schemas
 Summary:        Development tools for gsettings-desktop-schemas
 Summary(ja):    gsettings-desktop-schemas の開発環境
 Summary(ja):    gsettings-desktop-schemas の開発環境
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       pkgconfig
 
 
@@ -44,6 +45,9 @@ Header files and libraries for building a extension library for the
 gsettings-desktop-schemas.
 gsettings-desktop-schemas.
 
 
 
 
+%global debug_package %{nil}
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 %autosetup -p1
 %autosetup -p1
@@ -64,18 +68,6 @@ gsettings-desktop-schemas.
 %check
 %check
 # Test that the schemas compile
 # Test that the schemas compile
 glib-compile-schemas --dry-run --strict %{buildroot}%{_datadir}/glib-2.0/schemas
 glib-compile-schemas --dry-run --strict %{buildroot}%{_datadir}/glib-2.0/schemas
- 
- 
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-
-%postun
-if [ $1 -eq 0 ]; then
-  glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-fi
-
-%clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
 
 
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
@@ -95,6 +87,10 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 40.0-1
+- new upstream release.
+- dropped scriptlets.
+
 * Sun Aug 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.1-1
 * Sun Aug 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.1-1
 - new upstream release.
 - new upstream release.
 
 

+ 35 - 18
g/gtk-doc/gtk-doc-vl.spec

@@ -1,32 +1,41 @@
+%bcond_with     test
+
 Name:           gtk-doc
 Name:           gtk-doc
 Summary:        API documentation generation tool for GTK+ and GNOME
 Summary:        API documentation generation tool for GTK+ and GNOME
 Summary(ja):    GTK+/GNOME 用 API ドキュメント生成ツール
 Summary(ja):    GTK+/GNOME 用 API ドキュメント生成ツール
-Version:        1.32
-Release:        3%{_dist_release}
-License:        LGPL
-Group:          Development/Tools
-
+Version:        1.33.2
+Release:        1%{_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 Packager:       daisuke
 Packager:       daisuke
 
 
+License:        LGPL
 URL:            https://www.gtk.org/gtk-doc/
 URL:            https://www.gtk.org/gtk-doc/
-Source:         https://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.xz
+%global shortver %(echo %{version} | cut -d . -f 1,2)
+Source:         https://ftp.gnome.org/pub/GNOME/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 Source1:        filter-requires-gtk-doc.sh
 Source1:        filter-requires-gtk-doc.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
 BuildArch:      noarch
 
 
+BuildRequires:	meson
 BuildRequires:	yelp-tools
 BuildRequires:	yelp-tools
 BuildRequires:	docbook-utils
 BuildRequires:	docbook-utils
 BuildRequires:	docbook-style-xsl
 BuildRequires:	docbook-style-xsl
+BuildRequires:	glib2-devel
 BuildRequires:	openjade
 BuildRequires:	openjade
 BuildRequires:	libxslt
 BuildRequires:	libxslt
 BuildRequires:	vim
 BuildRequires:	vim
 BuildRequires:	python3
 BuildRequires:	python3
 BuildRequires:	python3-pygments
 BuildRequires:	python3-pygments
+BuildRequires:	python3-lxml
+%if %{with test}
+BuildRequires:	python3-parameterized
+%endif
 
 
 Requires:	docbook-utils
 Requires:	docbook-utils
 Requires:	docbook-style-xsl
 Requires:	docbook-style-xsl
+Requires:	glib2
 Requires:	openjade
 Requires:	openjade
 Requires:	libxslt
 Requires:	libxslt
 Requires:	vim
 Requires:	vim
@@ -41,32 +50,37 @@ gtk-doc is a tool for generating API reference documentation.
 It is used for generating the documentation for GTK+, GLib
 It is used for generating the documentation for GTK+, GLib
 and GNOME.
 and GNOME.
 
 
+
+%global debug_package %{nil}
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 # Move this doc file to avoid name collisions
 # Move this doc file to avoid name collisions
 mv doc/README doc/README.docs
 mv doc/README doc/README.docs
 
 
+
 %build
 %build
-%configure \
-	--docdir=%{_datadir}/gnome/help/gtk-doc-manual \
-	--with-highlight=vim
-make
+%meson
+%meson_build
 
 
-%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%install
+%meson_install
 
 
 sed -i -e "s|^pkg_config = .*$|pkg_config = '/usr/bin/pkg-config'|" %{buildroot}/%{_datadir}/gtk-doc/python/gtkdoc/config.py
 sed -i -e "s|^pkg_config = .*$|pkg_config = '/usr/bin/pkg-config'|" %{buildroot}/%{_datadir}/gtk-doc/python/gtkdoc/config.py
 
 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%if %{with test}
+%check
+%meson_test
+%endif
 
 
 
 
 %files
 %files
 %defattr(-, root, root)
 %defattr(-, root, root)
 %license COPYING
 %license COPYING
-%doc AUTHORS ChangeLog INSTALL NEWS README doc/* examples
+%doc AUTHORS ChangeLog NEWS README doc/* examples
 %{_bindir}/*
 %{_bindir}/*
 %{_datadir}/aclocal/gtk-doc.m4
 %{_datadir}/aclocal/gtk-doc.m4
 %{_datadir}/gtk-doc
 %{_datadir}/gtk-doc
@@ -74,10 +88,13 @@ sed -i -e "s|^pkg_config = .*$|pkg_config = '/usr/bin/pkg-config'|" %{buildroot}
 %dir %{_datadir}/help/*
 %dir %{_datadir}/help/*
 %{_datadir}/help/*/gtk-doc-manual
 %{_datadir}/help/*/gtk-doc-manual
 %{_datadir}/pkgconfig/*.pc
 %{_datadir}/pkgconfig/*.pc
-%dir %{_datadir}/cmake
-%{_datadir}/cmake/GtkDoc
+%dir %{_libdir}/cmake
+%{_libdir}/cmake/GtkDoc
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.33-1
+- new upstream release.
+
 * Sat Feb 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.32-3
 * Sat Feb 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.32-3
 - added R:python3-pygments.
 - added R:python3-pygments.
 
 

+ 16 - 6
g/gtk3/gtk3-vl.spec

@@ -12,7 +12,7 @@
 %define gdkpixbuf2_version %{gdkpixbuf2_base_version}-1
 %define gdkpixbuf2_version %{gdkpixbuf2_base_version}-1
 %define gobject_introspection_version 1.46.0
 %define gobject_introspection_version 1.46.0
 
 
-%define base_version 3.24.26
+%define base_version 3.24.28
 %define bin_version 3.0.0
 %define bin_version 3.0.0
 
 
 # biarch support
 # biarch support
@@ -28,7 +28,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Summary(ja): X 用 GUI 作成ライブラリ: GIMP ツールキット(GTK+)
 Summary(ja): X 用 GUI 作成ライブラリ: GIMP ツールキット(GTK+)
 Name: gtk3
 Name: gtk3
 Version: %{base_version}
 Version: %{base_version}
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 Group: system
 Group: system
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -72,10 +72,18 @@ BuildRequires: libXfixes-devel
 BuildRequires: libXinerama-devel
 BuildRequires: libXinerama-devel
 BuildRequires: libXcomposite-devel
 BuildRequires: libXcomposite-devel
 BuildRequires: libXdamage-devel
 BuildRequires: libXdamage-devel
+BuildRequires: pkgconfig(egl)
+BuildRequires: pkgconfig(wayland-client)
+BuildRequires: pkgconfig(wayland-cursor)
+BuildRequires: pkgconfig(wayland-egl)
+BuildRequires: pkgconfig(wayland-protocols)
+BuildRequires: pkgconfig(xkbcommon)
 
 
 # required for icon themes apis to work
 # required for icon themes apis to work
 Requires: hicolor-icon-theme
 Requires: hicolor-icon-theme
 Requires: libXrandr >= 1.3.0
 Requires: libXrandr >= 1.3.0
+Requires: libwayland-client%{?_isa}
+Requires: libwayland-cursor%{?_isa}
 Provides: gtk-update-icon-cache = %{version}-%{release}
 Provides: gtk-update-icon-cache = %{version}-%{release}
 
 
 # We need to prereq these so we can run gtk-query-immodules-2.0
 # We need to prereq these so we can run gtk-query-immodules-2.0
@@ -175,9 +183,11 @@ export CFLAGS='-fno-strict-aliasing %optflags'
 	--enable-xcomposite=yes \
 	--enable-xcomposite=yes \
 	--enable-xdamage=yes \
 	--enable-xdamage=yes \
 	--enable-x11-backend \
 	--enable-x11-backend \
+	--enable-wayland-backend \
 	--disable-packagekit \
 	--disable-packagekit \
 	--enable-colord=yes
 	--enable-colord=yes
 
 
+
 # fight unused direct deps
 # fight unused direct deps
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
 
@@ -217,7 +227,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/Raleigh
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 %post
 %post
-/sbin/ldconfig
 if [ $1 = 1 ]; then
 if [ $1 = 1 ]; then
 	update-alternatives \
 	update-alternatives \
 		--install %{_bindir}/gtk-update-icon-cache gtk-update-icon-cache \
 		--install %{_bindir}/gtk-update-icon-cache gtk-update-icon-cache \
@@ -225,7 +234,6 @@ if [ $1 = 1 ]; then
 fi
 fi
 
 
 %postun 
 %postun 
-/sbin/ldconfig
 if [ $1 -gt 0 ]; then
 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
 else
@@ -248,8 +256,6 @@ if [ ! -L %{_bindir}/gtk-update-icon-cache ]; then
 fi
 fi
 
 
 %if %{build_compat32}
 %if %{build_compat32}
-%ldconfig_scriptlets -n compat32-%{name}
-
 %transfiletriggerin -n compat32-%{name} -- %{_libdir}/gtk-3.0/3.0.0/immodules
 %transfiletriggerin -n compat32-%{name} -- %{_libdir}/gtk-3.0/3.0.0/immodules
 gtk-query-immodules-3.0%{_query_suffix} --update-cache &>/dev/null || :
 gtk-query-immodules-3.0%{_query_suffix} --update-cache &>/dev/null || :
 
 
@@ -323,6 +329,10 @@ gtk-query-immodules-3.0%{_query_suffix} --update-cache &>/dev/null || :
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.24.28-1
+- new upstream release.
+- added wayland support.
+
 * Mon Mar 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.24.26-2
 * Mon Mar 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.24.26-2
 - added "Provides: /usr/bin/gtk-update-icon-cache".
 - added "Provides: /usr/bin/gtk-update-icon-cache".
 
 

+ 513 - 0
g/gtk4/gtk4-vl.spec

@@ -0,0 +1,513 @@
+%bcond_with gtk_update_icon_cache
+
+# biarch support
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+%define _query_suffix %{nil}
+%if %{build_compat32}
+%define _query_suffix -32
+%endif
+
+Summary: GTK graphical user interface library
+Summary(ja): GTK GUI ライブラリ
+Name: gtk4
+Version: 4.0.3
+Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: LGPL
+URL: https://www.gtk.org
+%define bin_version 4.0.0
+%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: cairo-devel
+BuildRequires: colord-devel
+BuildRequires: cups-devel
+BuildRequires: desktop-file-utils
+BuildRequires: docbook-style-xsl
+BuildRequires: fribidi-devel
+BuildRequires: gdk-pixbuf2-devel
+BuildRequires: glib2-devel
+BuildRequires: gobject-introspection-devel
+BuildRequires: gtk-doc >= 1.20
+BuildRequires: json-glib-devel
+BuildRequires: libepoxy-devel
+BuildRequires: libICE-devel
+BuildRequires: libXcomposite-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXdamage-devel
+BuildRequires: libXfixes-devel
+BuildRequires: libXi-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXrandr-devel
+BuildRequires: libXrender-devel
+BuildRequires: meson
+BuildRequires: pandoc
+BuildRequires: pango-devel
+BuildRequires: pkgconfig(avahi-gobject)
+BuildRequires: pkgconfig(egl)
+BuildRequires: pkgconfig(graphene-gobject-1.0)
+BuildRequires: pkgconfig(gstreamer-player-1.0)
+BuildRequires: pkgconfig(vulkan)
+BuildRequires: pkgconfig(wayland-client)
+BuildRequires: pkgconfig(wayland-cursor)
+BuildRequires: pkgconfig(wayland-egl)
+BuildRequires: pkgconfig(wayland-protocols)
+BuildRequires: pkgconfig(xkbcommon)
+BuildRequires: rest-devel
+
+# required for icon themes apis to work
+Requires: hicolor-icon-theme
+Requires: libXrandr >= 1.3.0
+%if %{with gtk_update_icon_cache}
+# enable when GTK4 becomes standard version.
+Provides: gtk-update-icon-cache = %{version}-%{release}
+%endif
+
+%description
+GTK is a multi-platform toolkit for creating graphical user
+interfaces. Offering a complete set of widgets, GTK is suitable for
+projects ranging from small one-off tools to complete application
+suites.
+
+
+%package devel
+Summary: Development tools for GTK applications.
+Summary(ja): GTK アプリケーション開発ツール
+Group: programming
+Requires: %{name} = %{version}-%{release}
+Requires: pango-devel
+Requires: atk-devel
+Requires: glib2-devel
+Requires: gdk-pixbuf2-devel
+Requires: libX11-devel, libXcursor-devel, libXinerama-devel
+Requires: libXext-devel, libXi-devel, libXrandr-devel
+Requires: libXfixes-devel, libXcomposite-devel
+Requires: libpng-devel
+
+%description devel
+The gtk4-devel package contains the header files and developer
+docs for the GTK widget toolkit.
+
+
+%package docs
+Summary: Developer documentation for GTK
+Summary(ja): GTK による開発のドキュメント
+Group: documentation
+Requires: gtk4 = %{version}-%{release}
+
+%description docs
+This package contains developer documentation for version 4 of the GTK
+widget toolkit.
+
+
+#######################################################################
+# compat32
+%package -n compat32-%{name}
+Summary: GTK graphical user interface library
+Summary(ja): GTK GUI ライブラリ
+Group: system
+Requires: compat32-libXrandr >= 1.3.0
+
+%description -n compat32-%{name}
+GTK is a multi-platform toolkit for creating graphical user
+interfaces. Offering a complete set of widgets, GTK is suitable for
+projects ranging from small one-off tools to complete application
+suites.
+
+%package -n compat32-%{name}-devel
+Summary: Development tools for GTK applications.
+Summary(ja): GTK アプリケーション開発ツール
+Group: programming
+Requires: compat32-%{name} = %{version}-%{release}
+Requires: %{name}-devel = %{version}
+Requires: compat32-libX11-devel, compat32-libXcursor-devel, compat32-libXinerama-devel
+Requires: compat32-libXext-devel, compat32-libXi-devel, compat32-libXrandr-devel
+Requires: compat32-libXfixes-devel, compat32-libXcomposite-devel
+Requires: compat32-libpng-devel
+
+%description -n compat32-%{name}-devel
+The gtk4-devel package contains the header files and developer
+docs for the GTK GUI toolkit.  
+
+
+%debug_package
+
+
+%prep
+%setup -q -n gtk-%{version}
+%patch100 -p1 -b .vine-default-theme
+
+
+%build
+export CFLAGS='-fno-strict-aliasing -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT %{build_cflags}'
+%meson \
+        -Dx11-backend=true \
+        -Dwayland-backend=true \
+        -Dbroadway-backend=true \
+        -Dmedia-ffmpeg=disabled \
+        -Dmedia-gstreamer=enabled \
+        -Dxinerama=enabled \
+        -Dcolord=enabled \
+        -Dsassc=disabled \
+        -Dgtk_doc=true \
+        -Dman-pages=true \
+        -Dinstall-tests=false
+%meson_build
+# Workaround for https://github.com/mesonbuild/meson/issues/8117
+%meson_build gtk4-doc:custom
+
+
+%install
+%meson_install
+%find_lang gtk40
+%find_lang gtk40-properties
+
+cat gtk40.lang gtk40-properties.lang > all.lang
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-4.0
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-4.0/modules
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-4.0/%{bin_version}/theming-engines
+
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-4.0/%{bin_version}/immodules
+
+
+%post
+if [ $1 = 1 ]; then
+	update-alternatives \
+		--install %{_bindir}/gtk-update-icon-cache gtk-update-icon-cache \
+			%{_bindir}/gtk4-update-icon-cache 40
+fi
+
+%postun 
+if [ $1 -eq 0 ]; then
+	update-alternatives \
+		--remove gtk-update-icon-cache %{_bindir}/gtk4-update-icon-cache
+fi
+
+%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}/gtk4-update-icon-cache 40
+fi
+
+
+%files -f gtk40.lang
+%license COPYING
+%doc AUTHORS NEWS README.md
+%{_bindir}/gtk4-broadwayd
+%{_bindir}/gtk4-launch
+%{_bindir}/gtk4-update-icon-cache
+%{_libdir}/libgtk-4.so.*
+%dir %{_libdir}/gtk-4.0
+%dir %{_libdir}/gtk-4.0/%{bin_version}
+%{_libdir}/gtk-4.0/%{bin_version}/immodules/
+%{_libdir}/gtk-4.0/%{bin_version}/media/
+%{_libdir}/gtk-4.0/%{bin_version}/printbackends/
+%{_libdir}/gtk-4.0/%{bin_version}/theming-engines/
+%{_libdir}/gtk-4.0/modules
+%{_libdir}/girepository-1.0
+%{_datadir}/glib-2.0/schemas/org.gtk.gtk4.Settings.ColorChooser.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gtk.gtk4.Settings.Debug.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gtk.gtk4.Settings.EmojiChooser.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gtk.gtk4.Settings.FileChooser.gschema.xml
+%dir %{_datadir}/gtk-4.0
+%dir %{_sysconfdir}/gtk-4.0
+%{_datadir}/gtk-4.0/emoji/
+%{_mandir}/man1/gtk4-broadwayd.1*
+%{_mandir}/man1/gtk4-launch.1*
+%{_mandir}/man1/gtk4-update-icon-cache.1*
+
+%files devel -f gtk40-properties.lang
+%{_libdir}/libgtk-4.so
+%{_includedir}/*
+%{_libdir}/pkgconfig/*
+%{_bindir}/gtk4-builder-tool
+%{_bindir}/gtk4-demo
+%{_bindir}/gtk4-demo-application
+%{_bindir}/gtk4-encode-symbolic-svg
+%{_bindir}/gtk4-icon-browser
+%{_bindir}/gtk4-print-editor
+%{_bindir}/gtk4-query-settings
+%{_bindir}/gtk4-widget-factory
+%{_datadir}/applications/org.gtk.Demo4.desktop
+%{_datadir}/applications/org.gtk.IconBrowser4.desktop
+%{_datadir}/applications/org.gtk.PrintEditor4.desktop
+%{_datadir}/applications/org.gtk.WidgetFactory4.desktop
+%{_datadir}/icons/hicolor/*/apps/org.gtk.Demo4*.svg
+%{_datadir}/icons/hicolor/*/apps/org.gtk.IconBrowser4*.svg
+%{_datadir}/icons/hicolor/*/apps/org.gtk.PrintEditor4*.svg
+%{_datadir}/icons/hicolor/*/apps/org.gtk.WidgetFactory4*.svg
+%{_datadir}/gettext/*
+%{_datadir}/gir-1.0/*
+%{_datadir}/glib-2.0/schemas/org.gtk.Demo4.gschema.xml
+%{_datadir}/gtk-4.0/gtk4builder.rng
+%{_datadir}/gtk-4.0/valgrind/
+%{_datadir}/metainfo/org.gtk.Demo4.appdata.xml
+%{_datadir}/metainfo/org.gtk.IconBrowser4.appdata.xml
+%{_datadir}/metainfo/org.gtk.PrintEditor4.appdata.xml
+%{_datadir}/metainfo/org.gtk.WidgetFactory4.appdata.xml
+%{_mandir}/man1/gtk4-builder-tool.1*
+%{_mandir}/man1/gtk4-demo.1*
+%{_mandir}/man1/gtk4-demo-application.1*
+%{_mandir}/man1/gtk4-encode-symbolic-svg.1*
+%{_mandir}/man1/gtk4-icon-browser.1*
+%{_mandir}/man1/gtk4-query-settings.1*
+%{_mandir}/man1/gtk4-widget-factory.1*
+
+%files docs
+%{_datadir}/gtk-doc
+
+# compat32
+%if %{build_compat32}
+%files -n compat32-%{name}
+%{_libdir}/libgtk-4.so.*
+%dir %{_libdir}/gtk-4.0
+%dir %{_libdir}/gtk-4.0/%{bin_version}
+%{_libdir}/gtk-4.0/%{bin_version}/immodules/
+%{_libdir}/gtk-4.0/%{bin_version}/media/
+%{_libdir}/gtk-4.0/%{bin_version}/printbackends/
+%{_libdir}/gtk-4.0/%{bin_version}/theming-engines/
+%dir %{_libdir}/gtk-4.0/modules
+%dir %{_sysconfdir}/gtk-4.0
+
+%files -n compat32-%{name}-devel
+%defattr(-, root, root)
+%{_libdir}/lib*.so
+%dir %{_libdir}/gtk-4.0
+%endif
+
+%changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.3-1
+- new upstream release.
+
+* 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.
+
+* Fri Aug 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.24.22-1
+- new upstream release.
+
+* Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.24.21-1
+- new upstream release.
+
+* Tue May 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.24.20-1
+- new upstream release.
+- dropped Patch0, 10010, 10019 and 10020.
+- dropped Source10001.
+
+* Sat Dec 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.22.30-1
+- update to 3.22.30
+- dropped Patch10019.
+- imported Patch10019 and 10020 from CentOS.
+
+* Mon Mar 26 2018 IWAI, Masaharu <iwaim.sub@gmail.com> 3.22.10-1
+- update to 3.22.10
+- sync CentOS 7 - 3.22.10-5.el7_4
+ - add ja.po (Source10001)
+ - add patches (Patch10018, 10019)
+
+* Thu Jul 14 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.20.6-1
+- new upstream release
+
+* Sat Dec 19 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.18.6-1
+- new upstream release
+
+* Fri Nov 20 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.18.5-1
+- new upstream release
+
+* Fri Nov 13 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.18.4-1
+- new upstream release
+
+* Thu Oct 29 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.18.2-1
+- new upstream release
+
+* Sat Oct 10 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.16.7-1
+- new upstream release
+
+* Sun Jul 26 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.16.6-1
+- new upstream release
+
+* Fri Jul 10 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.16.5-1
+- new upstream release
+
+* Thu Jun 11 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.16.4-1
+- new upstream release
+
+* Thu May 14 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.16.3-1
+- new upstream release
+
+* Wed Apr 15 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.16.2-1
+- new upstream release
+
+* Sat Mar 28 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.16.0-1
+- new upstream release
+- add BuildRequires: libepoxy-devel
+
+* Sun Mar 01 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.9-1
+- new upstream release
+
+* Sun Feb 01 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.8-1
+- new upstream release
+
+* Mon Jan 12 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.7-1
+- new upstream release
+
+* Mon Dec 22 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.6-1
+- new upstream release
+
+* Sun Nov 16 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.5-1
+- new upstream release
+- add BuildRequires: gtk2-devel, rest-devel, json-glib-devel
+
+* Sun Oct 26 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.4-1
+- new upstream release
+- update Patch100 (gtk+-3.14.0-vine-default-theme.patch)
+
+* Wed May 14 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.12.2-1
+- new upstream release
+
+* Sun Apr 13 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.12.1-1
+- new upstream release
+
+* Sat Mar 29 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.12.0-1
+- new upstream release
+- update Patch100 (gtk+-3.12.0-vine-default-theme.patch)
+
+* Sat Feb 08 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.10.7-1
+- new upstream release
+
+* Sat Dec 07 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.10.6-1
+- new upstream release
+
+* Sat Nov 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.10.5-1
+- new upstream release
+
+* Sat Oct 26 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.10.2-1
+- new upstream release
+- update Patch0 (gtk3-3.10.0-gtk-widget-size-allocate.patch)
+- remove Patch1 (gtk3-3.8.2-immodule.patch)
+
+* Fri Sep 06 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.8.4-1
+- new upstream release
+
+* Tue Aug 13 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.8.2-2
+- add Patch1 (gtk3-3.8.2-immodule.patch)
+
+* Sat May 18 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.8.2-1
+- new upstream release
+
+* Fri Apr 26 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.8.1-1
+- new upstream release
+
+* Tue Jan 08 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.4-1
+- new upstream release
+
+* Fri Jan 04 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.3-1
+- new upstream release
+
+* Sun Nov 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.2-1
+- new upstream release
+
+* Tue Oct 16 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.1-1
+- new upstream release
+
+* Wed Sep 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add BuildRequires: at-spi2-atk-devel
+
+* Mon Jul 16 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
+- new upstream release
+
+* Sat May 12 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.3-1
+- new upstream release
+
+* Sun May 06 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
+- new upstream release
+
+* Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
+- new upstream release
+- update Patch100 (gtk+-3.4.0-vine-default-theme.patch)
+
+* Sun Mar 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.4-1
+- new upstream release
+
+* Fri Dec 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.3-1
+- new upstream release
+
+* Wed Nov 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.2-1
+- new upstream release
+- remove Patch1
+
+* Sun Oct 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.1-1
+- new upstream release
+- add Patch1 (gtk3-3.2.1-bug658772.patch)
+
+* Wed Sep 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.0-1
+- new upstream release
+
+* Fri Sep 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.92-1
+- new upstream release
+
+* Tue Sep 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.18-1
+- new upstream release
+
+* Sat Sep 03 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.16-1
+- new upstream release
+
+* Tue Aug 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.12-1
+- new upstream release
+- add Patch0 (gtk3-3.1.12-gtk-widget-size-allocate.patch)
+
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.10-2
+- fix %%files
+
+* Sat Jul 30 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.10-1
+- new upstream release
+- add BuildRequires: colord-devel
+
+* Sun Jun 26 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.11-1
+- new upstream release
+
+* Sun Apr 24 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.9-1
+- new upstream release
+
+* Sat Apr 09 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.8-1
+- new upstream release
+
+* Sun Apr 03 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.7-1
+- new upstream release
+
+* Sun Mar 27 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.6-1
+- new upstream release
+
+* Wed Mar 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.4-1
+- new upstream release
+
+* Sat Mar 19 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.3-1
+- new upstream release
+
+* Sun Mar 13 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.2-1
+- new upstream release
+
+* Tue Feb 22 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.1-1
+- new upstream release
+
+* Fri Feb 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- initial build for Vine Linux
+

+ 14 - 15
lib/libg/libgweather/libgweather-vl.spec

@@ -1,14 +1,15 @@
 Summary: Library for accessing weather information
 Summary: Library for accessing weather information
 Summary(ja): 天気予報情報にアクセスするライブラリ
 Summary(ja): 天気予報情報にアクセスするライブラリ
 Name: libgweather
 Name: libgweather
-Version: 3.36.1
+Version: 40.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: desktop-gnome
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
 URL: http://www.gnome.org/
 URL: http://www.gnome.org/
 License: GPL 
 License: GPL 
-%global shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+%global shortver %(echo %{version} | cut -d . -f 1)
 Source0: https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 Source0: https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -17,7 +18,7 @@ BuildRequires: glib2-devel
 BuildRequires: gtk3-devel
 BuildRequires: gtk3-devel
 BuildRequires: libsoup-devel
 BuildRequires: libsoup-devel
 BuildRequires: geocode-glib-devel
 BuildRequires: geocode-glib-devel
-BuildRequires: vala-devel
+BuildRequires: vala, vala-devel
 
 
 %description
 %description
 libgweather is a library to access weather information from online
 libgweather is a library to access weather information from online
@@ -32,7 +33,7 @@ libgweather はオンラインサービス上にある世界中の天気予報
 %package l10n
 %package l10n
 Summary: Localized xml files for %{name}
 Summary: Localized xml files for %{name}
 Summary(ja): %{name} の多言語データ
 Summary(ja): %{name} の多言語データ
-Group: System Environment/Libraries
+Group: localization,desktop-gnome
 Requires: %{name} = %{version}
 Requires: %{name} = %{version}
 
 
 %description l10n
 %description l10n
@@ -47,7 +48,7 @@ This package contains localized xml files for libgweather.
 %package devel
 %package devel
 Summary: Libraries and headers for libgweather
 Summary: Libraries and headers for libgweather
 Summary(ja): libgweather 用ライブラリとヘッダ
 Summary(ja): libgweather 用ライブラリとヘッダ
-Group: Development/Libraries
+Group: programming,desktop-gnome
 Requires: %{name} = %{version}
 Requires: %{name} = %{version}
 Requires: gtk3-devel
 Requires: gtk3-devel
 Requires: libsoup-devel
 Requires: libsoup-devel
@@ -59,6 +60,9 @@ Libraries and headers for libgweather.
 libgweather 用ライブラリとヘッダ
 libgweather 用ライブラリとヘッダ
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 
 
@@ -81,22 +85,13 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 
 
-%post -p /sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-
-  
 %files -f %{name}-3.0.lang
 %files -f %{name}-3.0.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
 %license COPYING
 %license COPYING
 %doc AUTHORS NEWS README.md
 %doc AUTHORS NEWS README.md
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.so.*
 %{_libdir}/girepository-1.0/GWeather-3.0.typelib
 %{_libdir}/girepository-1.0/GWeather-3.0.typelib
+%{_libdir}/libgweather/Locations.bin
 %dir %{_datadir}/libgweather
 %dir %{_datadir}/libgweather
 %{_datadir}/libgweather/Locations.xml
 %{_datadir}/libgweather/Locations.xml
 %{_datadir}/libgweather/locations.dtd
 %{_datadir}/libgweather/locations.dtd
@@ -123,6 +118,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 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.1-1
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.1-1
 - new upstream release.
 - new upstream release.
 
 

+ 172 - 0
lib/libh/libhandy/libhandy-vl.spec

@@ -0,0 +1,172 @@
+%bcond_with test
+
+Name:           libhandy
+Summary:        Building blocks for modern adaptive GNOME apps
+Version:        1.2.0
+Release:        3%{?_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        LGPLv2+
+URL:            https://gitlab.gnome.org/GNOME/libhandy
+%global majmin %(echo %{version} | cut -d . -f -2)
+Source0:        https://download.gnome.org/sources/libhandy/%{majmin}/libhandy-%{version}.tar.xz
+
+BuildRequires:  gcc
+BuildRequires:  gtk-doc
+BuildRequires:  meson
+BuildRequires:  vala, vala-devel
+
+BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(gladeui-2.0)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.44
+BuildRequires:  pkgconfig(gmodule-2.0)
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
+BuildRequires:  gtk3-devel
+
+%if %{with test}
+# Support graphical tests in non-graphical environment
+BuildRequires:  xorg-x11-server-Xvfb
+%endif
+
+# Retired in F34
+Provides:       libhandy1 = %{version}-%{release}
+Provides:       libhandy1%{?_isa} = %{version}-%{release}
+
+%description
+libhandy provides GTK+ widgets and GObjects to ease developing
+applications for mobile phones.
+
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          programming
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+# Retired in F34
+Obsoletes:      libhandy1-devel < 1.1.90-2
+Conflicts:      libhandy1-devel < 1.1.90-2
+Provides:       libhandy1-devel = %{version}-%{release}
+Provides:       libhandy1-devel%{?_isa} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%debug_package
+
+
+%prep
+%autosetup -n libhandy-%{version} -p1
+
+
+%build
+%meson -Dgtk_doc=true -Dexamples=false -Dtests=true
+%meson_build
+
+
+%install
+%meson_install
+
+%find_lang libhandy
+
+
+%if %{with test}
+%check
+%{shrink:xvfb-run -a %meson_test}
+%endif
+
+
+%files -f libhandy.lang
+%license COPYING
+%doc AUTHORS
+%doc HACKING.md
+%doc NEWS
+%doc README.md
+
+%{_libdir}/girepository-1.0/*
+%{_libdir}/libhandy-1.so.0
+
+%files devel
+%{_includedir}/libhandy-1/
+
+%dir %{_libdir}/glade
+%{_libdir}/glade/*
+%{_libdir}/libhandy-1.so
+%{_libdir}/pkgconfig/libhandy-1.pc
+
+%{_datadir}/gir-1.0/*
+%dir %{_datadir}/glade/
+%{_datadir}/glade/*
+%{_datadir}/gtk-doc/*
+%dir %{_datadir}/vala/
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/*
+
+
+%changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.0-3
+- initial build for Vine Linux.
+
+* Fri Mar 19 2021 Kalev Lember <klember@redhat.com> - 1.2.0-2
+- Add conflicts with libhandy1 packages to help with the upgrade path
+
+* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 1.2.0-1
+- Update to 1.2.0
+
+* Wed Mar 03 2021 Kalev Lember <klember@redhat.com> - 1.1.90-2
+- Update to 1.1.90 and libhandy 1 ABI, based on earlier libhandy1 packaging
+- Obsolete separate libhandy1 and libhandy1-devel packages
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.13-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sun Sep 13 2020 Kalev Lember <klember@redhat.com> - 0.0.13-6
+- Disable glade catalog for F33+
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.13-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri May 22 2020 Kalev Lember <klember@redhat.com> - 0.0.13-3
+- Rebuilt for libgladeui soname bump
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 20 2020 Kalev Lember <klember@redhat.com> - 0.0.13-1
+- Update to 0.0.13
+
+* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 0.0.11-1
+- Update to 0.0.11
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jul 22 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 0.0.10-2
+- Add patch to fix installation of glade resources for flatpak builds
+
+* Thu Jun 13 2019 Yanko Kaneti <yaneti@declera.com> - 0.0.10-1
+- Update to 0.0.10
+
+* Thu Mar 07 2019 Kalev Lember <klember@redhat.com> - 0.0.9-1
+- Update to 0.0.9
+
+* Fri Mar 1 2019 Yanko Kaneti <yaneti@declera.com> - 0.0.8-2
+- Pull an upstream fix to prevent broken translations in
+  libhandy using apps
+
+* Sat Feb 16 2019 Kalev Lember <klember@redhat.com> - 0.0.8-1
+- Update to 0.0.8
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 24 2019 Kalev Lember <klember@redhat.com> - 0.0.7-1
+- Update to 0.0.7
+
+* Fri Jan 11 2019 Yanko Kaneti <yaneti@declera.com> - 0.0.6-2
+- Swap some runtime vs devel bits
+
+* Wed Jan 09 2019 Kalev Lember <klember@redhat.com> - 0.0.6-1
+- Initial Fedora packaging

+ 21 - 19
m/mutter/mutter-vl.spec

@@ -2,14 +2,15 @@
 
 
 Summary:        Window and compositing manager based on Clutter
 Summary:        Window and compositing manager based on Clutter
 Name:           mutter
 Name:           mutter
-Version:        3.36.4
+Version:        40.0
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Group:          deskotp-gnome
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
 License:        GPLv2+
 License:        GPLv2+
 URL:            http://git.gnome.org/browse/mutter
 URL:            http://git.gnome.org/browse/mutter
-%global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+%global         shortver %(echo %{version} | cut -d . -f 1)
 Source0:        https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 Source0:        https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 
 
 Patch100:       mutter-3.18.1-roundf.patch
 Patch100:       mutter-3.18.1-roundf.patch
@@ -48,6 +49,10 @@ BuildRequires:	systemd-devel
 %else
 %else
 BuildRequires:	elogind-devel
 BuildRequires:	elogind-devel
 %endif
 %endif
+BuildRequires:	pkgconfig(wayland-server)
+BuildRequires:	pkgconfig(wayland-eglstream)
+BuildRequires:	pkgconfig(xwayland)
+BuildRequires:	pkgconfig(wayland-protocols)
 
 
 Requires:		%{name}-libs = %{version}-%{release}
 Requires:		%{name}-libs = %{version}-%{release}
 Requires(postun,posttrans):	desktop-file-utils
 Requires(postun,posttrans):	desktop-file-utils
@@ -58,7 +63,7 @@ Mutter is a minimal X window manager aimed at nontechnical users and is designed
 
 
 %package        devel
 %package        devel
 Summary:        Development files of the mutter library.
 Summary:        Development files of the mutter library.
-Group:          Development/Libraries
+Group:          programming
 
 
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       pkgconfig
@@ -73,13 +78,16 @@ Development files of the mutter library.
 %package        libs
 %package        libs
 Summary:        Libraries for %{name}
 Summary:        Libraries for %{name}
 Summary(ja):    %{name} の共有ライブラリ
 Summary(ja):    %{name} の共有ライブラリ
-Group:          System Environment/Libraries
+Group:          system
 
 
 %description    libs
 %description    libs
 The %{name}-libs package contains the runtime shared libraries for
 The %{name}-libs package contains the runtime shared libraries for
 %{name}.
 %{name}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 %patch100 -p1 
 %patch100 -p1 
@@ -88,10 +96,11 @@ The %{name}-libs package contains the runtime shared libraries for
 export CFLAGS="$RPM_OPT_FLAGS -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=format"
 export CFLAGS="$RPM_OPT_FLAGS -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=format"
 #intltoolize --force --copy
 #intltoolize --force --copy
 %meson \
 %meson \
-	-Dwayland=false \
 	-Dprofiler=false \
 	-Dprofiler=false \
 	-Dtests=false \
 	-Dtests=false \
-	-Dinstalled_tests=false
+	-Dinstalled_tests=false \
+	-Degl_device=true \
+	-Dwayland_eglstream=true
 %meson_build
 %meson_build
 
 
 
 
@@ -102,27 +111,14 @@ export CFLAGS="$RPM_OPT_FLAGS -Wno-error=unused-variable -Wno-error=sign-compare
 %find_lang %{name}
 %find_lang %{name}
 
 
 
 
-%clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
-
-
 %post 
 %post 
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 
 
 %postun
 %postun
 if [ "$1" -eq 0 ]; then
 if [ "$1" -eq 0 ]; then
 	touch --no-create %{_datadir}/icons/hicolor
 	touch --no-create %{_datadir}/icons/hicolor
-	gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-	update-desktop-database -q > /dev/null || :
 fi
 fi
 
 
-%posttrans
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-update-desktop-database -q > /dev/null || :
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
@@ -131,12 +127,14 @@ update-desktop-database -q > /dev/null || :
 %{_bindir}/mutter
 %{_bindir}/mutter
 %{_libdir}/mutter-*/plugins/libdefault.so
 %{_libdir}/mutter-*/plugins/libdefault.so
 %{_libexecdir}/mutter-restart-helper
 %{_libexecdir}/mutter-restart-helper
+/lib/udev/rules.d/61-mutter.rules
 %{_datadir}/GConf/gsettings/mutter-schemas.convert
 %{_datadir}/GConf/gsettings/mutter-schemas.convert
 %{_datadir}/applications/*
 %{_datadir}/applications/*
 %{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
 %{_datadir}/gnome-control-center/keybindings/50-mutter-navigation.xml
 %{_datadir}/gnome-control-center/keybindings/50-mutter-navigation.xml
 %{_datadir}/gnome-control-center/keybindings/50-mutter-system.xml
 %{_datadir}/gnome-control-center/keybindings/50-mutter-system.xml
+%{_datadir}/gnome-control-center/keybindings/50-mutter-wayland.xml
 %{_datadir}/gnome-control-center/keybindings/50-mutter-windows.xml
 %{_datadir}/gnome-control-center/keybindings/50-mutter-windows.xml
 %{_mandir}/man1/mutter.1.gz
 %{_mandir}/man1/mutter.1.gz
 
 
@@ -158,6 +156,10 @@ update-desktop-database -q > /dev/null || :
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 40.0-1
+- new upstream release.
+- built with wayland.
+
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.4-1
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.4-1
 - new upstream release.
 - new upstream release.
 - added systemd support (disabled as default).
 - added systemd support (disabled as default).

+ 6 - 4
p/python-dbusmock/python-dbusmock-vl.spec

@@ -2,16 +2,15 @@
 
 
 Summary:          Mock D-Bus objects
 Summary:          Mock D-Bus objects
 Name:             python-%{modname}
 Name:             python-%{modname}
-Version:          0.18.3
-Release:          6%{?_dist_release}
+Version:          0.23.0
+Release:          1%{?_dist_release}
+Group:            programming
 Vendor:           Project Vine
 Vendor:           Project Vine
 Distribution:     Vine Linux
 Distribution:     Vine Linux
 
 
 License:          LGPLv3+
 License:          LGPLv3+
 URL:              https://pypi.python.org/pypi/python-dbusmock
 URL:              https://pypi.python.org/pypi/python-dbusmock
 Source0:          https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 Source0:          https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
-# From https://github.com/martinpitt/python-dbusmock/pull/54
-Patch0:           0001-Add-mock-server-for-low-memory-monitor.patch
 
 
 BuildArch:        noarch
 BuildArch:        noarch
 BuildRequires:    git
 BuildRequires:    git
@@ -65,6 +64,9 @@ rm -rf python-%{modname}.egg-info
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.23.0-1
+- new upstream release.
+
 * Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.18.3-6
 * Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.18.3-6
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 13 - 18
s/spirv-headers/spirv-headers-vl.spec

@@ -1,23 +1,17 @@
-#global commit 2ad0492fb00919d99500f1da74abf5ad3c870e4e
-#global shortcommit %(c=%{commit}; echo ${c:0:7})
-#global commit_date 20200414
-#global gitrel .%{commit_date}.git%{shortcommit}
-
 Name:           spirv-headers
 Name:           spirv-headers
 Summary:        Header files from the SPIR-V registry
 Summary:        Header files from the SPIR-V registry
-Version:        1.5.3
-Release:        1%{?gitrel}%{?_dist_release}
+Version:        1.5.4
+%global         ver_suffix .raytracing.fixed
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
 License:        MIT
 License:        MIT
 URL:            https://github.com/KhronosGroup
 URL:            https://github.com/KhronosGroup
-%if 0%{?commit_date}
-Source0:        %url/SPIRV-Headers/archive/%{commit}/%{name}-%{commit}.tar.gz
-%else
-Source0:        %url/SPIRV-Headers/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-%endif
-
+Source0:        %url/SPIRV-Headers/archive/%{version}%{?ver_suffix}.tar.gz#/%{name}-%{version}.tar.gz
+# git faa570afbc91ac73d594d787486bcf8f2df1ace0
+Patch0:         spirv-headers-sdk-1.2.170.0.patch
 BuildArch:      noarch
 BuildArch:      noarch
 
 
 %description
 %description
@@ -33,6 +27,7 @@ This includes:
 
 
 %package        devel
 %package        devel
 Summary:        Development files for %{name}
 Summary:        Development files for %{name}
+Group:          programming
 
 
 %description    devel
 %description    devel
 %{summary}
 %{summary}
@@ -46,11 +41,7 @@ This includes:
 
 
 
 
 %prep
 %prep
-%if 0%{?commit_date}
-%autosetup -n SPIRV-Headers-%{commit}
-%else
-%autosetup -n SPIRV-Headers-%{version}
-%endif
+%autosetup -p1 -n SPIRV-Headers-%{version}%{?ver_suffix}
 chmod a-x include/spirv/1.2/spirv.py
 chmod a-x include/spirv/1.2/spirv.py
 
 
 
 
@@ -69,6 +60,10 @@ mv include/* %buildroot%{_includedir}/
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.5.4-1
+- new upstream release.
+- imported Patch0 from upstream.
+
 * Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.5.3-1
 * Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.5.3-1
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 - new upstream release.
 - new upstream release.

+ 17 - 27
s/spirv-tools/spirv-tools-vl.spec

@@ -1,28 +1,19 @@
-#global commit 67f4838659f475d618c120e13d1a196d7e00ba4b
-#global shortcommit %(c=%{commit}; echo ${c:0:7})
-#global commit_date 20200421
-#global gitrel .%{commit_date}.git%{shortcommit}
-
 Name:           spirv-tools
 Name:           spirv-tools
 Summary:        API and commands for processing SPIR-V modules
 Summary:        API and commands for processing SPIR-V modules
-Version:        2020.3
-Release:        1%{?gitrel}%{?_dist_release}
+Version:        2020.7
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
 License:        ASL 2.0
 License:        ASL 2.0
 URL:            https://github.com/KhronosGroup/SPIRV-Tools
 URL:            https://github.com/KhronosGroup/SPIRV-Tools
-%if 0%{?commit_date}
-Source0:        %url/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz
-%else
 Source0:        %url/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source0:        %url/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-%endif
 
 
 BuildRequires:  cmake
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-c++
 BuildRequires:  ninja
 BuildRequires:  ninja
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
-BuildRequires:  python3-rpm-macros
 BuildRequires:  spirv-headers-devel
 BuildRequires:  spirv-headers-devel
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 
@@ -33,6 +24,7 @@ disassembler, and validator for SPIR-V..
 
 
 %package        libs
 %package        libs
 Summary:        Library files for %{name}
 Summary:        Library files for %{name}
+Group:          system
 Provides:       %{name}-libs%{?_isa} = %{version}
 Provides:       %{name}-libs%{?_isa} = %{version}
 
 
 %description    libs
 %description    libs
@@ -41,38 +33,32 @@ library files for %{name}
 
 
 %package        devel
 %package        devel
 Summary:        Development files for %{name}
 Summary:        Development files for %{name}
+Group:          programming
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 
 %description    devel
 %description    devel
 Development files for %{name}
 Development files for %{name}
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
-%if 0%{?commit_date}
-%autosetup -p1 -n SPIRV-Tools-%{commit}
-%else
 %autosetup -p1 -n SPIRV-Tools-%{version}
 %autosetup -p1 -n SPIRV-Tools-%{version}
-%endif
 
 
 
 
 %build
 %build
-%__mkdir_p %_target_platform
-pushd %_target_platform
-%cmake3 -DCMAKE_BUILD_TYPE=Release \
+%cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_LIBDIR=%{_lib} \
         -DCMAKE_INSTALL_LIBDIR=%{_lib} \
         -DSPIRV-Headers_SOURCE_DIR=%{_prefix} \
         -DSPIRV-Headers_SOURCE_DIR=%{_prefix} \
         -DPYTHON_EXECUTABLE=%{__python3} \
         -DPYTHON_EXECUTABLE=%{__python3} \
-        -GNinja ..
-%ninja_build
-popd
+        -DSPIRV_TOOLS_BUILD_STATIC=OFF \
+        -GNinja
+%cmake_build
 
 
 
 
 %install
 %install
-%ninja_install -C %_target_platform
-
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%cmake_install
 
 
 
 
 %files
 %files
@@ -102,6 +88,10 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2020.7-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2020.3-1
 * Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2020.3-1
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 - new upstream release.
 - new upstream release.

+ 9 - 5
v/vulkan-headers/vulkan-headers-vl.spec

@@ -1,8 +1,9 @@
 %global __python %{__python3}
 %global __python %{__python3}
 Name:           vulkan-headers
 Name:           vulkan-headers
-Version:        1.2.135.0
-Release:        2%{?_dist_release}
 Summary:        Vulkan Header files and API registry
 Summary:        Vulkan Header files and API registry
+Version:        1.2.170.0
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
@@ -22,12 +23,12 @@ Vulkan Header files and API registry
 
 
 
 
 %build
 %build
-%cmake3 -DCMAKE_INSTALL_LIBDIR=%{_libdir} .
-%make_build
+%cmake3 -DCMAKE_INSTALL_LIBDIR=%{_libdir}
+%cmake_build
 
 
 
 
 %install
 %install
-%make_install
+%cmake_install
 
 
 
 
 %files
 %files
@@ -39,6 +40,9 @@ Vulkan Header files and API registry
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.170.0-1
+- new upstream release.
+
 * Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.135.0-2
 * Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.135.0-2
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 20 - 16
v/vulkan-loader/vulkan-loader-vl.spec

@@ -1,15 +1,16 @@
 %bcond_with bootstrap
 %bcond_with bootstrap
 
 
 Name:           vulkan-loader
 Name:           vulkan-loader
-Version:        1.2.135.0
-Release:        2%{?_dist_release}
 Summary:        Vulkan ICD desktop loader
 Summary:        Vulkan ICD desktop loader
+Version:        1.2.170.0
+Release:        1%{?_dist_release}
+Group:          system
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
 License:        ASL 2.0
 License:        ASL 2.0
 URL:            https://github.com/KhronosGroup/Vulkan-Loader
 URL:            https://github.com/KhronosGroup/Vulkan-Loader
-Source0:        %url/archive/sdk-%{version}.tar.gz#/Vulkan-Loader-sdk-%{version}.tar.gz       
+Source0:        %url/archive/sdk-%{version}.tar.gz#/Vulkan-Loader-sdk-%{version}.tar.gz
 
 
 BuildRequires:  gcc
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-c++
@@ -17,10 +18,10 @@ BuildRequires:  cmake
 BuildRequires:  ninja
 BuildRequires:  ninja
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
 BuildRequires:  vulkan-headers = %{version}
 BuildRequires:  vulkan-headers = %{version}
-#BuildRequires:  pkgconfig(wayland-client)
-#BuildRequires:  pkgconfig(wayland-cursor)
-#BuildRequires:  pkgconfig(wayland-server)
-#BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-cursor)
+BuildRequires:  pkgconfig(wayland-server)
+BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xrandr)
 
 
@@ -41,6 +42,7 @@ loader for Windows, Linux, and MacOS.
 
 
 %package        devel
 %package        devel
 Summary:        Development files for %{name}
 Summary:        Development files for %{name}
+Group:          programming
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       vulkan-headers
 Requires:       vulkan-headers
 Provides:       vulkan-devel%{?_isa} = %{version}-%{release}
 Provides:       vulkan-devel%{?_isa} = %{version}-%{release}
@@ -52,6 +54,9 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 developing applications that use %{name}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %autosetup -n Vulkan-Loader-sdk-%{version}
 %autosetup -n Vulkan-Loader-sdk-%{version}
 
 
@@ -59,14 +64,12 @@ developing applications that use %{name}.
 %build
 %build
 %cmake \
 %cmake \
 	-GNinja \
 	-GNinja \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DBUILD_WSI_WAYLAND_SUPPORT=off \
-	.
-%ninja_build
+	-DCMAKE_BUILD_TYPE=Release
+%cmake_build
 
 
 
 
 %install
 %install
-%ninja_install
+%cmake_install
 
 
 # create the filesystem
 # create the filesystem
 mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
 mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
@@ -74,10 +77,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
 %{buildroot}{%{_sysconfdir},%{_datadir}}/vulkan/icd.d
 %{buildroot}{%{_sysconfdir},%{_datadir}}/vulkan/icd.d
 
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-
 %files
 %files
 %license LICENSE.txt
 %license LICENSE.txt
 %doc README.md CONTRIBUTING.md
 %doc README.md CONTRIBUTING.md
@@ -97,6 +96,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
 
 
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.170.0-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+- added wayland support.
+
 * Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.135.0-2
 * Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.135.0-2
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 19 - 7
v/vulkan-tools/vulkan-tools-vl.spec

@@ -1,7 +1,8 @@
 Name:           vulkan-tools
 Name:           vulkan-tools
-Version:        1.2.135.0
-Release:        2%{?_dist_release}
 Summary:        Vulkan tools
 Summary:        Vulkan tools
+Version:        1.2.170.0
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
@@ -16,6 +17,10 @@ BuildRequires:  glslang
 BuildRequires:  ninja
 BuildRequires:  ninja
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
 BuildRequires:  vulkan-loader-devel
 BuildRequires:  vulkan-loader-devel
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-cursor)
+BuildRequires:  pkgconfig(wayland-server)
+BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xcb)
 BuildRequires:  pkgconfig(xcb)
@@ -26,6 +31,10 @@ Obsoletes:      vulkan-demos < %{version}-%{release}
 %description
 %description
 Vulkan tools
 Vulkan tools
 
 
+
+%debug_package
+
+
 %prep
 %prep
 %autosetup -n Vulkan-Tools-sdk-%{version} -p1
 %autosetup -n Vulkan-Tools-sdk-%{version} -p1
 
 
@@ -34,21 +43,24 @@ Vulkan tools
 %cmake \
 %cmake \
 	-GNinja \
 	-GNinja \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DCMAKE_BUILD_TYPE=Release \
-	-DGLSLANG_INSTALL_DIR=%{_prefix} \
-	-DBUILD_WSI_WAYLAND_SUPPORT=off \
-	.
-%ninja_build
+	-DGLSLANG_INSTALL_DIR=%{_prefix}
+%cmake_build
 
 
 
 
 %install
 %install
-%ninja_install
+%cmake_install
+
 
 
 %files
 %files
 %license LICENSE.txt
 %license LICENSE.txt
 %doc README.md CONTRIBUTING.md
 %doc README.md CONTRIBUTING.md
 %{_bindir}/*
 %{_bindir}/*
 
 
+
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.170.0-1
+- new upstream release.
+
 * Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.135.0-2
 * Wed Jul 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.135.0-2
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 28 - 18
v/vulkan-validation-layers/vulkan-validation-layers-vl.spec

@@ -1,7 +1,8 @@
 Name:           vulkan-validation-layers
 Name:           vulkan-validation-layers
 Summary:        Vulkan validation layers
 Summary:        Vulkan validation layers
-Version:        1.2.135.0
-Release:        2%{?_dist_release}
+Version:        1.2.170.0
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
@@ -17,11 +18,12 @@ BuildRequires:  glslang-devel
 BuildRequires:  ninja
 BuildRequires:  ninja
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
 BuildRequires:  spirv-tools-devel
 BuildRequires:  spirv-tools-devel
+BuildRequires:  spirv-headers-devel
 BuildRequires:  vulkan-loader-devel
 BuildRequires:  vulkan-loader-devel
-#BuildRequires:  pkgconfig(wayland-client)
-#BuildRequires:  pkgconfig(wayland-cursor)
-#BuildRequires:  pkgconfig(wayland-server)
-#BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-cursor)
+BuildRequires:  pkgconfig(wayland-server)
+BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xcb)
 BuildRequires:  pkgconfig(xcb)
@@ -31,6 +33,7 @@ Vulkan validation layers
 
 
 %package        devel
 %package        devel
 Summary:        Development files for %{name}
 Summary:        Development files for %{name}
+Group:          programming
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       vulkan-headers
 Requires:       vulkan-headers
 
 
@@ -39,35 +42,36 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 developing applications that use %{name}.
 
 
 
 
+%ifarch x86_64
 %debug_package
 %debug_package
+%else
+%global debug_package %{nil}
+%endif
 
 
 
 
 %prep
 %prep
 %autosetup -p1 -n Vulkan-ValidationLayers-sdk-%{version}
 %autosetup -p1 -n Vulkan-ValidationLayers-sdk-%{version}
 
 
-# https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/bb145f36fc6468faeb4862b9c83ce807f33afcc5
-sed -i -e "s/kInst2MaxOutCnt/kInstMaxOutCnt/" layers/gpu_validation.cpp
-
 
 
 %build
 %build
 # Decrease debuginfo verbosity to reduce memory consumption even more
 # Decrease debuginfo verbosity to reduce memory consumption even more
+%ifarch x86_64
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+%else
+%global optflags %(echo %{optflags} | sed 's/-g /-g0 /')
+%endif
 
 
 %cmake  -GNinja \
 %cmake  -GNinja \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_BUILD_TYPE=Release \
         -DGLSLANG_INSTALL_DIR=%{_prefix} \
         -DGLSLANG_INSTALL_DIR=%{_prefix} \
         -DBUILD_LAYER_SUPPORT_FILES:BOOL=ON \
         -DBUILD_LAYER_SUPPORT_FILES:BOOL=ON \
-        -DBUILD_WSI_WAYLAND_SUPPORT=off \
-        -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/vulkan/ .
-%ninja_build
+        -DSPIRV_HEADERS_INSTALL_DIR=%{_includedir}/spirv \
+        -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/vulkan/
+%cmake_build
 
 
 
 
 %install
 %install
-%ninja_install
-
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%cmake_install
 
 
 
 
 %files
 %files
@@ -77,9 +81,15 @@ sed -i -e "s/kInst2MaxOutCnt/kInstMaxOutCnt/" layers/gpu_validation.cpp
 %{_libdir}/libVkLayer_*.so
 %{_libdir}/libVkLayer_*.so
 
 
 %files devel
 %files devel
-%{_includedir}/vulkan/
+%{_includedir}/vulkan/*
+
 
 
 %changelog
 %changelog
+* Sun Mar 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.170.0-1
+- new upstream release.
+- add wayland support.
+- dropped ldconfig scriptlets.
+
 * Thu Jul 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.135.0-2
 * Thu Jul 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.135.0-2
 - initial build for Vine Linux.
 - initial build for Vine Linux.