Browse Source

updated 37 packages

libFS-1.0.9-1

libICE-1.0.10-2

libSM-1.2.3-2

libX11-1.8.1-1

libXau-1.0.10-1

libXaw-1.0.14-1

libXdmcp-1.1.3-2

libXext-1.3.4-2

libXfixes-6.0.0-1

libXfont2-2.0.6-1

libXi-1.8-1

libXinerama-1.1.4-2

libXmu-1.1.3-2

libXpm-3.5.13-1

libXrender-0.9.10-2

libXres-1.2.1-1

libXt-1.2.1-1

libXtst-1.2.3-2

libXv-1.0.11-2

libdmx-1.1.4-2

libepoxy-1.5.10-1

libfontenc-1.1.6-1

libpciaccess-0.16-2

libxcb-1.15-1

libxkbcommon-1.4.1-1

libxkbfile-1.1.0-2

libxshmfence-1.3-2

pixman-0.40.0-2

xcb-proto-1.15-1

xcb-util-cursor-0.1.3-1

xcb-util-image-0.4.0-2

xcb-util-keysyms-0.4.0-2

xcb-util-renderutil-0.3.9-2

xcb-util-wm-0.4.1-3

xcb-util-0.4.0-3

xorg-x11-proto-devel-2022.2-1

xorg-x11-server-1.20.14-1
Tomohiro "Tomo-p" KATO 1 year ago
parent
commit
79f1308a2a
37 changed files with 776 additions and 505 deletions
  1. 20 9
      lib/libF/libFS/libFS-vl.spec
  2. 24 16
      lib/libI/libICE/libICE-vl.spec
  3. 25 16
      lib/libS/libSM/libSM-vl.spec
  4. 5 2
      lib/libX/libX11/libX11-vl.spec
  5. 24 15
      lib/libX/libXau/libXau-vl.spec
  6. 25 13
      lib/libX/libXaw/libXaw-vl.spec
  7. 23 15
      lib/libX/libXdmcp/libXdmcp-vl.spec
  8. 22 14
      lib/libX/libXext/libXext-vl.spec
  9. 22 15
      lib/libX/libXfixes/libXfixes-vl.spec
  10. 20 12
      lib/libX/libXfont2/libXfont2-vl.spec
  11. 24 15
      lib/libX/libXi/libXi-vl.spec
  12. 20 15
      lib/libX/libXinerama/libXinerama-vl.spec
  13. 21 14
      lib/libX/libXmu/libXmu-vl.spec
  14. 22 14
      lib/libX/libXpm/libXpm-vl.spec
  15. 20 14
      lib/libX/libXrender/libXrender-vl.spec
  16. 20 10
      lib/libX/libXres/libXres-vl.spec
  17. 24 17
      lib/libX/libXt/libXt-vl.spec
  18. 23 14
      lib/libX/libXtst/libXtst-vl.spec
  19. 23 15
      lib/libX/libXv/libXv-vl.spec
  20. 19 10
      lib/libd/libdmx/libdmx-vl.spec
  21. 6 2
      lib/libe/libepoxy/libepoxy-vl.spec
  22. 19 10
      lib/libf/libfontenc/libfontenc-vl.spec
  23. 21 14
      lib/libp/libpciaccess/libpciaccess-vl.spec
  24. 34 15
      lib/libx/libxcb/libxcb-vl.spec
  25. 56 27
      lib/libx/libxkbcommon/libxkbcommon-vl.spec
  26. 21 13
      lib/libx/libxkbfile/libxkbfile-vl.spec
  27. 17 14
      lib/libx/libxshmfence/libxshmfence-vl.spec
  28. 18 8
      p/pixman/pixman-vl.spec
  29. 13 4
      x/xcb-proto/xcb-proto-vl.spec
  30. 15 14
      x/xcb-util-cursor/xcb-util-cursor-vl.spec
  31. 16 13
      x/xcb-util-image/xcb-util-image-vl.spec
  32. 14 12
      x/xcb-util-keysyms/xcb-util-keysyms-vl.spec
  33. 16 15
      x/xcb-util-renderutil/xcb-util-renderutil-vl.spec
  34. 12 12
      x/xcb-util-wm/xcb-util-wm-vl.spec
  35. 16 14
      x/xcb-util/xcb-util-vl.spec
  36. 14 11
      x/xorg-x11-proto-devel/xorg-x11-proto-devel-vl.spec
  37. 42 42
      x/xorg-x11-server/xorg-x11-server-vl.spec

+ 20 - 9
lib/libF/libFS/libFS-vl.spec

@@ -1,12 +1,15 @@
 Summary: X.Org X11 libFS runtime library
 Summary(ja): X.Org X11 libFS ランタイムライブラリ
 Name: libFS
-Version: 1.0.8
+Version: 1.0.9
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -14,16 +17,14 @@ BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-xtrans-devel
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libFS runtime library
 
+
 %package devel
 Summary: X.Org X11 libFS development package
 Summary(ja): X.Org X11 libFS 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -32,12 +33,17 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libFS development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 %configure \
 %if ! %{with_static}
@@ -45,6 +51,7 @@ X.Org X11 libFS development package
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,11 +63,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # remove xml and txt file
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -80,7 +86,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libFS.so
 %{_libdir}/pkgconfig/libfs.pc
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.9-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Thu Sep 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.8-1
 - new upstream release.
 

+ 24 - 16
lib/libI/libICE/libICE-vl.spec

@@ -4,12 +4,14 @@ Summary: X.Org X11 libICE runtime library
 Summary(ja): X.Org X11 libICE ランタイムライブラリ
 Name: libICE
 Version: 1.0.10
-Release: 1%{?_dist_release}
-License: MIT/X11
-Group: System Environment/Libraries
-URL: http://www.x.org
+Release: 2%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+License: MIT/X11
+URL: https://www.x.org
+Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -18,15 +20,13 @@ BuildRequires: xorg-x11-xtrans-devel
 BuildRequires: xorg-x11-util-macros
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libICE runtime library
 
+
 %package devel
 Summary: X.Org X11 libICE development package
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -39,14 +39,15 @@ X.Org X11 libICE development package
 %package -n compat32-%{name}
 Summary: X.Org X11 libICE runtime library
 Summary(ja): X.Org X11 libICE ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 X.Org X11 libICE runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libICE development package
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -54,12 +55,17 @@ Requires: %{name}-devel = %{version}-%{release}
 %description -n compat32-%{name}-devel
 X.Org X11 libICE development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 autoreconf -if
 %configure \
@@ -68,6 +74,7 @@ autoreconf -if
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -79,14 +86,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # remove xml and txt file
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -119,7 +122,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libICE.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.10-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Thu Sep 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.10-1
 - new upstream release.
 

+ 25 - 16
lib/libS/libSM/libSM-vl.spec

@@ -4,12 +4,14 @@ Summary: X.Org X11 libSM runtime library
 Summary(ja): X.Org X11 libSM ランタイムライブラリ
 Name: libSM
 Version: 1.2.3
-Release: 1%{?_dist_release}
-License: MIT/X11
-Group: System Environment/Libraries
-URL: http://www.x.org
+Release: 2%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+License: MIT/X11
+URL: https://www.x.org
+Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -20,15 +22,13 @@ BuildRequires: libICE-devel
 BuildRequires: e2fsprogs-devel
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libSM runtime library
 
+
 %package devel
 Summary: X.Org X11 libSM development package
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem >= 0.99.2
 Requires: %{name} = %{version}-%{release}
 Requires: libICE-devel
@@ -38,18 +38,20 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libSM development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libSM runtime library
 Summary(ja): X.Org X11 libSM ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 X.Org X11 libSM runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libSM development package
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem >= 0.99.2
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -58,12 +60,17 @@ Requires: compat32-libICE-devel
 %description -n compat32-%{name}-devel
 X.Org X11 libSM development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 autoreconf -if
 %configure \
@@ -72,6 +79,7 @@ autoreconf -if
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,14 +91,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # remove xml and txt file
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -127,7 +131,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libSM.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.3-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Thu Sep 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.3-1
 - new upstream release.
 - dropped Patch0: fixed in upstream.

+ 5 - 2
lib/libX/libX11/libX11-vl.spec

@@ -3,7 +3,7 @@
 Summary:        X.Org X11 libX11 runtime library
 Summary(ja):    X.Org X11 libX11 ランタイムライブラリ
 Name:           libX11
-Version:        1.7.2
+Version:        1.8.1
 Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
@@ -12,7 +12,7 @@ Packager:       daisuke
 
 License:        MIT/X11
 URL:            https://www.x.org
-Source0:        https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+Source0:        https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.xz
 
 Patch0:         libX11-0.99.3-datadir-locale-dir-fix.patch
 # FIXME: https://bugs.freedesktop.org/show_bug.cgi?id=3646 seems to indicate
@@ -320,6 +320,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.1-1
+- new upstream release.
+
 * Fri Jun 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.2-1
 - new upstream release.
 - dropped ldconfig scriptlets.

+ 24 - 15
lib/libX/libXau/libXau-vl.spec

@@ -3,13 +3,15 @@
 Summary: X.Org X11 libXau runtime library
 Summary(ja): X.Org X11 libXau ランタイムライブラリ
 Name: libXau
-Version: 1.0.9
+Version: 1.0.10
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -17,15 +19,13 @@ BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-util-macros
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXau runtime library
 
+
 %package devel
 Summary: X.Org X11 libXau development package
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 
@@ -37,18 +37,20 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libXau development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libXau runtime library
 Summary(ja): X.Org X11 libXau ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 X.Org X11 libXau runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libXau development package
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -56,12 +58,17 @@ Requires: %{name}-devel = %{version}-%{release}
 %description -n compat32-%{name}-devel
 X.Org X11 libXau development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 
 %configure \
@@ -70,6 +77,7 @@ X.Org X11 libXau development package
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -78,14 +86,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -121,7 +125,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXau.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.10-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Thu Sep 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.9-1
 - new upstream release.
 

+ 25 - 13
lib/libX/libXaw/libXaw-vl.spec

@@ -1,13 +1,15 @@
 Summary: X.Org X11 libXaw runtime library
 Summary(ja): X.Org X11 libXaw ランタイムライブラリ
 Name: libXaw
-Version: 1.0.13
-Release: 2%{?_dist_release}
+Version: 1.0.14
+Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
 URL: http://www.x.org
-Group: System Environment/Libraries
-
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -21,22 +23,21 @@ BuildRequires: ed
 
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXaw runtime library
 
+
 %package compat
 Summary: X.Org X11 libXaw version 6 compatibility
-Group: System Environment/Libraries
+Group: system
 
 %description compat
 X.Org X11 libXaw version 6 compatibility
 
+
 %package devel
 Summary: X.Org X11 libXaw development package
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -48,9 +49,10 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libXaw development package
 
+
 %package compat-devel
 Summary: X.Org X11 libXaw-compat development package
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name}-compat = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -62,13 +64,19 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description compat-devel
 X.Org X11 libXaw-compat development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,11 +88,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # remove xml and txt file
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -119,7 +126,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXaw6.so
 %{_libdir}/pkgconfig/xaw6.pc
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.14-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.13-2
 - rebuilt with current environment.
 

+ 23 - 15
lib/libX/libXdmcp/libXdmcp-vl.spec

@@ -4,11 +4,14 @@ Summary: X.Org X11 libXdmcp runtime library
 Summary(ja): X.Org X11 libXdmcp ランタイムライブラリ
 Name: libXdmcp
 Version: 1.1.3
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -17,16 +20,13 @@ BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-util-macros
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 X.Org X11 libXdmcp runtime library
 
+
 %package devel
 Summary: X.Org X11 libXdmcp development package
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -35,18 +35,20 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libXdmcp development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libXdmcp runtime library
 Summary(ja): X.Org X11 libXdmcp ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 X.Org X11 libXdmcp runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libXdmcp development package
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -54,12 +56,17 @@ Requires: %{name}-devel = %{version}-%{release}
 %description -n compat32-%{name}-devel
 X.Org X11 libXdmcp development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 %configure \
 %if ! %{with_static}
@@ -67,6 +74,7 @@ X.Org X11 libXdmcp development package
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,11 +89,6 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -119,7 +122,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXdmcp.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.3-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Thu Sep 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.3-1
 - new upstream release.
 

+ 22 - 14
lib/libX/libXext/libXext-vl.spec

@@ -4,11 +4,13 @@ Summary: X.Org X11 libXext runtime library
 Summary(ja): X.Org X11 libXext ランタイムライブラリ
 Name: libXext
 Version: 1.3.4
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -20,15 +22,12 @@ BuildRequires: libXau-devel
 
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXext runtime library
 
 %package devel
 Summary: X.Org X11 libXext development package
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 Requires: libX11-devel
@@ -39,18 +38,20 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libXext development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libXext runtime library
 Summary(ja): X.Org X11 libXext ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 X.Org X11 libXext runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libXext development package
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -59,12 +60,17 @@ Requires: compat32-libX11-devel
 %description -n compat32-%{name}-devel
 X.Org X11 libXext development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 
 %configure \
@@ -73,6 +79,7 @@ X.Org X11 libXext development package
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -84,14 +91,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # remove xml and txt file
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -125,7 +128,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXext.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.4-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.4-1
 - new upstream release.
 

+ 22 - 15
lib/libX/libXfixes/libXfixes-vl.spec

@@ -3,13 +3,15 @@
 Summary: X.Org X11 libXfixes runtime library
 Summary(ja): X.Org X11 libXfixes ランタイムライブラリ
 Name: libXfixes
-Version: 5.0.3
+Version: 6.0.0
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -17,16 +19,13 @@ BuildRequires: libX11-devel
 BuildRequires: xorg-x11-proto-devel
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXfixes runtime library
 
 %package devel
 Summary: X.Org X11 libXfixes development package
 Summary(ja): X.Org X11 libXfixes 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -35,19 +34,21 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libXfixes development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libXfixes runtime library
 Summary(ja): X.Org X11 libXfixes ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system
 
 %description -n compat32-%{name}
 X.Org X11 libXfixes runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libXfixes development package
 Summary(ja): X.Org X11 libXfixes 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -55,12 +56,17 @@ Requires: %{name}-devel = %{version}-%{release}
 %description -n compat32-%{name}-devel
 X.Org X11 libXfixes development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 %configure \
 %if ! %{with_static}
@@ -68,6 +74,7 @@ X.Org X11 libXfixes development package
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,14 +83,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -121,6 +124,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0.0-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.0.3-1
 - new upstream release.
 

+ 20 - 12
lib/libX/libXfont2/libXfont2-vl.spec

@@ -1,54 +1,58 @@
 Summary: X.Org X11 libXfont2 runtime library
 Summary(ja): X.Org X11 libXfont2 ランタイムライブラリ
 Name: libXfont2
-Version: 2.0.3
-Release: 2%{?_dist_release}
+Version: 2.0.6
+Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT
-Group: System Environment/Libraries
 URL: http://www.x.org
-
-Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.xz
 
 BuildRequires: autoconf automake libtool
 BuildRequires: pkgconfig(fontsproto)
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3
 BuildRequires: libfontenc-devel
-BuildRequires: freetype-devel
-
-Vendor: Project Vine
-Distribution: Vine Linux
+BuildRequires: freetype2-devel
 
 %description
 X.Org X11 libXfont2 runtime library
 
+
 %package devel
 Summary: X.Org X11 libXfont2 development package
 Summary(ja): X.Org X11 libXfont2 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: libfontenc-devel%{?_isa}
 
 %description devel
 X.Org X11 libXfont development package
 
+
+%debug_package
+
+
 %prep
 %autosetup
 
+
 %build
 autoreconf -v --install --force
 export CFLAGS="$RPM_OPT_FLAGS -Os"
 %configure --disable-static
 make %{?_smp_mflags}  
 
+
 %install
 %make_install
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 %files
 %license COPYING
@@ -61,6 +65,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/pkgconfig/xfont2.pc
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.6-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.3-2
 - rebuilt with current environment.
 

+ 24 - 15
lib/libX/libXi/libXi-vl.spec

@@ -3,13 +3,15 @@
 Summary: X.Org X11 libXi runtime library
 Summary(ja): X.Org X11 libXi ランタイムライブラリ
 Name: libXi
-Version: 1.7.10
+Version: 1.8
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig
@@ -20,16 +22,14 @@ BuildRequires: libXext-devel
 BuildRequires: libXau-devel
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXi runtime library
 
+
 %package devel
 Summary: X.Org X11 libXi development package
 Summary(ja): X.Org X11 libXi 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -38,19 +38,21 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libXi development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libXi runtime library
 Summary(ja): X.Org X11 libXi ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 X.Org X11 libXi runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libXi development package
 Summary(ja): X.Org X11 libXi 開発パッケージ
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -58,12 +60,17 @@ Requires: %{name}-devel = %{version}-%{release}
 %description -n compat32-%{name}-devel
 X.Org X11 libXi development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 %configure \
 %if ! %{with_static}
@@ -71,6 +78,7 @@ X.Org X11 libXi development package
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,14 +91,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -123,7 +127,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXi.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.10-1
 - new upstream release.
 

+ 20 - 15
lib/libX/libXinerama/libXinerama-vl.spec

@@ -4,11 +4,13 @@ Summary: X.Org X11 libXinerama runtime library
 Summary(ja): X.Org X11 libXinerama ランタイムライブラリ
 Name: libXinerama
 Version: 1.1.4
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -20,16 +22,13 @@ BuildRequires: libXext-devel
 BuildRequires: libXau-devel
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXinerama runtime library
 
 %package devel
 Summary: X.Org X11 libXinerama development package
 Summary(ja): X.Org X11 libXinerama 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -42,7 +41,7 @@ X.Org X11 libXinerama development package
 %package -n compat32-%{name}
 Summary: X.Org X11 libXinerama runtime library
 Summary(ja): X.Org X11 libXinerama ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 X.Org X11 libXinerama runtime library
@@ -50,7 +49,7 @@ X.Org X11 libXinerama runtime library
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libXinerama development package
 Summary(ja): X.Org X11 libXinerama 開発パッケージ
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -58,14 +57,19 @@ Requires: %{name}-devel = %{version}-%{release}
 %description -n compat32-%{name}-devel
 X.Org X11 libXinerama development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
-%build
 
+%build
 %configure --disable-static
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,14 +78,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -109,7 +109,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXinerama.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.4-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.4-1
 - new upstream release.
 

+ 21 - 14
lib/libX/libXmu/libXmu-vl.spec

@@ -4,11 +4,13 @@ Summary: X.Org X11 libXmu/libXmuu runtime libraries
 Summary(ja): X.Org X11 libXmu/libXmuu ランタイムライブラリ
 Name: libXmu
 Version: 1.1.3
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -20,15 +22,13 @@ BuildRequires: libXt-devel
 BuildRequires: libXau-devel
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXmu/libXmuu runtime libraries
 
+
 %package devel
 Summary: X.Org X11 libXmu development package
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
@@ -39,11 +39,12 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libXmu development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libXmu/libXmuu runtime libraries
 Summary(ja): X.Org X11 libXmu/libXmuu ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -51,7 +52,7 @@ X.Org X11 libXmu/libXmuu runtime libraries
 
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libXmu development package
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: %{name}-devel = %{version}-%{release}
 Requires: compat32-%{name} = %{version}-%{release}
@@ -60,6 +61,10 @@ Requires: compat32-libX11-devel compat32-libXt-devel compat32-libXext-devel
 %description -n compat32-%{name}-devel
 X.Org X11 libXmu development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
@@ -73,6 +78,7 @@ X.Org X11 libXmu development package
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -84,14 +90,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # remove xml and txt file
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -157,7 +159,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXmuu.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.3-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.3-1
 - new upstream release.
 

+ 22 - 14
lib/libX/libXpm/libXpm-vl.spec

@@ -3,13 +3,15 @@
 Summary: X.Org X11 libXpm runtime library
 Summary(ja): X.Org X11 libXpm ランタイムライブラリ
 Name: libXpm
-Version: 3.5.12
+Version: 3.5.13
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gettext
@@ -27,15 +29,13 @@ BuildRequires: libXau-devel
 
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXpm runtime library
 
+
 %package devel
 Summary: X.Org X11 libXpm development package
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: libX11-devel
@@ -49,7 +49,7 @@ X.Org X11 libXpm development package
 %package -n compat32-%{name}
 Summary: X.Org X11 libXpm runtime library
 Summary(ja): X.Org X11 libXpm ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -57,22 +57,26 @@ X.Org X11 libXpm runtime library
 
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libXpm development package
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: %{name}-devel = %{version}-%{release}
 Requires: compat32-libX11-devel
 
 %description -n compat32-%{name}-devel
 X.Org X11 libXpm development package
-
 %endif
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 %configure \
 %if ! %{with_static}
@@ -80,6 +84,7 @@ X.Org X11 libXpm development package
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,11 +93,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -128,10 +132,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXpm.a
 %endif
 %{_libdir}/libXpm.so
-
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.13-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.12-1
 - new upstream release.
 

+ 20 - 14
lib/libX/libXrender/libXrender-vl.spec

@@ -4,12 +4,13 @@ Summary: X.Org X11 libXrender runtime library
 Summary(ja): X.Org X11 libXrender ランタイムライブラリ
 Name: libXrender
 Version: 0.9.10
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: system
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Vendor: Project Vine
+Distribution: Vine Linux
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -18,16 +19,13 @@ BuildRequires: xorg-x11-util-macros
 BuildRequires: libX11-devel
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXrender runtime library
 
 %package devel
 Summary: X.Org X11 libXrender development package
 Summary(ja): X.Org X11 libXrender 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -37,19 +35,21 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libXrender development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libXrender runtime library
 Summary(ja): X.Org X11 libXrender ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 X.Org X11 libXrender runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libXrender development package
 Summary(ja): X.Org X11 libXrender 開発パッケージ
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -57,12 +57,17 @@ Requires: %{name}-devel = %{version}-%{release}
 %description -n compat32-%{name}-devel
 X.Org X11 libXrender development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 %configure \
 %if ! %{with_static}
@@ -70,6 +75,7 @@ X.Org X11 libXrender development package
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,14 +86,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -124,6 +126,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.10-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.10-1
 - new upstream release.
 

+ 20 - 10
lib/libX/libXres/libXres-vl.spec

@@ -1,13 +1,15 @@
 Summary: X.Org X11 libXres runtime library
 Summary(ja): X.Org X11 libXres ランタイムライブラリ
 Name: libXres
-Version: 1.2.0
+Version: 1.2.1
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -16,16 +18,14 @@ BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXres runtime library
 
+
 %package devel
 Summary: X.Org X11 libXres development package
 Summary(ja): X.Org X11 libXres 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -34,12 +34,17 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libXres development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 %configure \
 %if ! %{with_static}
@@ -47,6 +52,7 @@ X.Org X11 libXres development package
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -55,11 +61,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -81,7 +86,12 @@ rm -rf $RPM_BUILD_ROOT
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.1-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.0-1
 - new upstream release.
 

+ 24 - 17
lib/libX/libXt/libXt-vl.spec

@@ -3,13 +3,15 @@
 Summary: X.Org X11 libXt runtime library
 Summary(ja): X.Org X11 libXt ランタイムライブラリ
 Name: libXt
-Version: 1.1.5
-Release: 2%{?_dist_release}
-License: MIT/X11
-Group: System Environment/Libraries
-URL: http://www.x.org
+Version: 1.2.1
+Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+License: MIT/X11
+URL: https://www.x.org
+Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -19,15 +21,12 @@ BuildRequires: libX11-devel
 BuildRequires: libSM-devel
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXt runtime library
 
 %package devel
 Summary: X.Org X11 libXt development package
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -38,18 +37,19 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libXt development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libXt runtime library
 Summary(ja): X.Org X11 libXt ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 X.Org X11 libXt runtime library
 
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libXt development package
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -59,12 +59,17 @@ Requires: compat32-libSM-devel
 %description -n compat32-%{name}-devel
 X.Org X11 libXt development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 # FIXME: Work around pointer aliasing warnings from compiler for now
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -76,6 +81,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,14 +93,10 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -165,7 +167,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXt.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.1-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.5-2
 - rebuilt with current environment.
 

+ 23 - 14
lib/libX/libXtst/libXtst-vl.spec

@@ -4,11 +4,13 @@ Summary: X.Org X11 libXtst runtime library
 Summary(ja): X.Org X11 libXtst ランタイムライブラリ
 Name: libXtst
 Version: 1.2.3
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -21,16 +23,14 @@ BuildRequires: libXi-devel
 
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXtst runtime library
 
+
 %package devel
 Summary: X.Org X11 libXtst development package
 Summary(ja): X.Org X11 libXtst 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -40,19 +40,21 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libXtst development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libXtst runtime library
 Summary(ja): X.Org X11 libXtst ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 X.Org X11 libXtst runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libXtst development package
 Summary(ja): X.Org X11 libXtst 開発パッケージ
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -60,12 +62,17 @@ Requires: %{name}-devel = %{version}-%{release}
 %description -n compat32-%{name}-devel
 X.Org X11 libXtst development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 
 %configure \
@@ -74,6 +81,7 @@ X.Org X11 libXtst development package
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -86,14 +94,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -126,7 +130,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXtst.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.3-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.3-1
 - new upstream release.
 

+ 23 - 15
lib/libX/libXv/libXv-vl.spec

@@ -4,11 +4,13 @@ Summary: X.Org X11 libXv runtime library
 Summary(ja): X.Org X11 libXv ランタイムライブラリ
 Name:    libXv
 Version: 1.0.11
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -19,16 +21,14 @@ BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libXv runtime library
 
+
 %package devel
 Summary: X.Org X11 libXv development package
 Summary(ja): X.Org X11 libXv 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: libXext-devel
@@ -38,20 +38,22 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libXv development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libXv runtime library
 Summary(ja): X.Org X11 libXv ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
 X.Org X11 libXv runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libXv development package
 Summary(ja): X.Org X11 libXv 開発パッケージ
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: %{name}-devel = %{version}-%{release}
 Requires: compat32-%{name} = %{version}-%{release}
@@ -60,12 +62,17 @@ Requires: compat32-libXext-devel
 %description -n compat32-%{name}-devel
 X.Org X11 libXv development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 %configure \
 %if ! %{with_static}
@@ -73,22 +80,18 @@ X.Org X11 libXv development package
 %endif
 make
 
-%install
 
+%install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -124,7 +127,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXv.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.11-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.11-1
 - new upstream release.
 

+ 19 - 10
lib/libd/libdmx/libdmx-vl.spec

@@ -2,12 +2,14 @@ Summary: X.Org X11 libdmx runtime library
 Summary(ja): X.Org X11 libdmx ランタイムライブラリ
 Name: libdmx
 Version: 1.1.4
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: System Environment/Libraries
 URL: http://www.x.org
-
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -18,16 +20,14 @@ BuildRequires: libXext-devel
 BuildRequires: libXau-devel
 Obsoletes: XFree86-libs, XOrg-libs
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 libdmx runtime library
 
+
 %package devel
 Summary: X.Org X11 libdmx development package
 Summary(ja): X.Org X11 libdmx 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -36,6 +36,10 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libdmx development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
@@ -48,6 +52,7 @@ X.Org X11 libdmx development package
        --disable-static
 %endif
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,11 +61,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -80,7 +84,12 @@ rm -rf $RPM_BUILD_ROOT
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.4-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.4-1
 - new upstream release.
 

+ 6 - 2
lib/libe/libepoxy/libepoxy-vl.spec

@@ -2,7 +2,7 @@
 
 Summary: A library for handling OpenGL function pointer management
 Name: libepoxy
-Version: 1.5.7
+Version: 1.5.10
 Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
@@ -10,7 +10,7 @@ Distribution: Vine Linux
 
 License: MIT
 URL: https://github.com/anholt/libepoxy
-Source0: https://github.com/anholt/libepoxy/releases/download/%{version}/%{name}-%{version}.tar.xz
+Source0: https://github.com/anholt/libepoxy/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,7 +112,11 @@ xvfb-run -d -s "-screen 0 640x480x24" ninja -C %{_vpath_builddir} test || \
 %{_libdir}/libepoxy.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.10-1
+- new upstream release.
+
 * Tue May 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.7-1
 - new upstream release.
 

+ 19 - 10
lib/libf/libfontenc/libfontenc-vl.spec

@@ -1,18 +1,17 @@
 Summary: X.Org X11 libfontenc runtime library
 Summary(ja): X.Org X11 libfontenc ランタイムライブラリ
 Name: libfontenc
-Version: 1.1.4
+Version: 1.1.6
 Release: 1%{?_dist_release}
-License: MIT/X11
-Group: System Environment/Libraries
-URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+License: MIT/X11
+URL: http://www.x.org
+Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.xz
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
@@ -27,10 +26,11 @@ Obsoletes: XFree86-libs, XOrg-libs
 %description
 X.Org X11 libfontenc runtime library
 
+
 %package devel
 Summary: X.Org X11 libfontenc development package
 Summary(ja): X.Org X11 libfontenc 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 
@@ -39,12 +39,17 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libfontenc development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 # FIXME: libfontenc-0.99.2-use-datadir-for-encodings.patch requires that
 # aclocal, automake, and autoconf get invoked to activate the changes.
@@ -58,6 +63,7 @@ autoconf
 %endif
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -66,11 +72,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # Remove all libtool archives (*.la)
 find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -91,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.6-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.4-1
 - new upstream release.
 

+ 21 - 14
lib/libp/libpciaccess/libpciaccess-vl.spec

@@ -4,34 +4,32 @@ Name:           libpciaccess
 Summary:        PCI access library
 Summary(ja):    PCI アクセスライブラリ
 Version:        0.16
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Group:          System Environment/Libraries
 License:        MIT
 URL:            http://gitweb.freedesktop.org/?p=xorg/lib/libpciaccess.git
-
-Source0:        https://www.x.org/archive//individual/lib/%{name}-%{version}.tar.bz2
+Source0:        https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Source1:        make-libpciaccess-snapshot.sh
 
-Patch2:		libpciaccess-0.14-rom-size.patch
+Patch2:	        libpciaccess-0.14-rom-size.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  xorg-x11-util-macros
 Requires:       hwdata
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
-
 %description
 libpciaccess is a library for portable PCI access routines across multiple
 operating systems.
 
+
 %package devel
 Summary:        PCI access library development package
 Summary(ja):    PCI access library 開発パッケージ
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
@@ -43,7 +41,7 @@ Development package for libpciaccess.
 %package -n compat32-%{name}
 Summary:        PCI access library
 Summary(ja):    PCI アクセスライブラリ
-Group:          System Environment/Libraries
+Group:          system,legacy
 Requires:       %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -53,7 +51,7 @@ operating systems.
 %package -n compat32-%{name}-devel
 Summary:        PCI access library development package
 Summary(ja):    PCI access library 開発パッケージ
-Group:          Development/Libraries
+Group:          programming,legacy
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       pkgconfig
 
@@ -61,26 +59,30 @@ Requires:       pkgconfig
 Development package for libpciaccess.
 
 
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{version}
 %patch2 -p1 -b .rom-size
 
+
 %build
 ##autoreconf -v --install
 autoreconf -fi
 %configure --disable-static
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -105,7 +107,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpciaccess.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.16-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Thu Sep 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.16-1
 - new upstream release.
 

+ 34 - 15
lib/libx/libxcb/libxcb-vl.spec

@@ -5,7 +5,7 @@
 Summary:        A C binding to the X11 protocol
 Summary(ja):    X11 プロトコルの C による実装
 Name:           libxcb
-Version:        1.14
+Version:        1.15
 Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
@@ -32,7 +32,7 @@ BuildRequires:  libxslt
 BuildRequires:  xcb-proto >= 1.6
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  xorg-x11-util-macros
-BuildRequires:  python-devel
+BuildRequires:  python3-devel
 
 Obsoletes:	%{name}-python < 1.8
 
@@ -41,6 +41,7 @@ The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a
 small footprint, latency hiding, direct access to the protocol, improved
 threading support, and extensibility.
 
+
 %package        devel
 Summary:        Development files for %{name}
 Summary(ja):    %{name} の開発用ファイル
@@ -52,6 +53,7 @@ Requires:       pkgconfig
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 %package        doc
 Summary:        Documentation for %{name}
 Group:          documentation
@@ -59,20 +61,22 @@ Group:          documentation
 %description    doc
 The %{name}-doc package contains documentation for the %{name} library.
 
+
 %package        -n compat32-%{name}
 Summary:        A C binding to the X11 protocol
 Summary(ja):    X11 プロトコルの C による実装
-Group:          programming
+Group:          system,legacy
 
 %description    -n compat32-%{name}
 The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a
 small footprint, latency hiding, direct access to the protocol, improved
 threading support, and extensibility.
 
+
 %package        -n compat32-%{name}-devel
 Summary:        Development files for %{name}
 Summary(ja):    %{name} の開発用ファイル
-Group:          programming
+Group:          programming,legacy
 Requires:       compat32-%{name} = %{version}-%{release}
 Requires:       %{name}-devel = %{version}-%{release}
 
@@ -80,36 +84,45 @@ Requires:       %{name}-devel = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 sed -i 's/pthread-stubs //' configure.ac
 autoreconf -v --install
-%configure --disable-static \
-           --docdir=%{_datadir}/doc/%{name}-%{version} \
-	   --disable-selinux \
-	   --enable-xkb \
-	   --disable-xprint
+export PYTHON=%{__python3}
+%configure \
+	--disable-static \
+	--docdir=%{_pkgdocdir} \
+	--disable-selinux \
+	--enable-xkb \
+	--disable-xprint \
+	--disable-silent-rules
+
+# Remove rpath from libtool (extra insurance if autoreconf is ever dropped)
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
 
 sed 's,@libdir@,%{_libdir},;s,@prefix@,%{_prefix},;s,@exec_prefix@,%{_exec_prefix},' %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/pthread-stubs.pc
 
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -125,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root,-)
+%doc %{_pkgdocdir}/tutorial
 %{_mandir}/man3/*
 
 %if %{build_compat32}
@@ -137,7 +151,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.15-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Fri Aug 07 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14-1
 - new upstream release.
 

+ 56 - 27
lib/libx/libxkbcommon/libxkbcommon-vl.spec

@@ -3,25 +3,23 @@
 Summary: X.Org X11 XKB parsing library
 Summary(ja): X.Org X11 XKB 解析ライブラリ
 Name: libxkbcommon
-Version: 0.6.1
+Version: 1.4.1
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT
-Group: System Environment/Libraries
 URL: http://xkbcommon.org/
-
 Source0: http://xkbcommon.org/download/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 BuildRequires: libxcb-devel
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xkeyboard-config
 BuildRequires: bison
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduchi
-
+BuildRequires: meson
+BuildRequires: libxml2-devel
 
 %description
 xkbcommon is a library to handle keyboard descriptions, including
@@ -35,7 +33,7 @@ proper keyboard support.
 %package        devel
 Summary:        Development tools for %{name}
 Summary(ja):    %{name} の開発環境
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       libxcb-devel
@@ -44,11 +42,20 @@ Requires:       libxcb-devel
 Header files and libraries for building a extension library for the %{name}.
 
 
+%package utils
+Summary:        X.Org X11 XKB parsing utilities
+Group:          admin-tools
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description utils
+%{name}-utils is a set of utilities to analyze and test XKB parsing.
+
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 XKB parsing library
 Summary(ja): X.Org X11 XKB 解析ライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -63,7 +70,7 @@ proper keyboard support.
 %package -n compat32-%{name}-devel
 Summary:        Development tools for %{name}
 Summary(ja):    %{name} の開発環境
-Group:          Development/Libraries
+Group:          programming,legacy
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       compat32-libxcb-devel
@@ -72,47 +79,63 @@ Requires:       compat32-libxcb-devel
 Header files and libraries for building a extension library for the %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
-%configure \
-	--disable-static \
-	--with-default-rules=evdev \
-	--with-default-model=pc106 \
-	--with-default-layout=jp
+%meson \
+	-Denable-docs=false \
+	-Denable-x11=true \
+	-Denable-wayland=false \
+	-Ddefault-model=pc106 \
+	-Ddefault-layout=jp
+
+%meson_build
 
-make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%meson_install
 
-make install DESTDIR=$RPM_BUILD_ROOT
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING NEWS README.md
 %{_libdir}/libxkbcommon-x11.so.*
 %{_libdir}/libxkbcommon.so.*
+%{_libdir}/libxkbregistry.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/xkbcommon/
 %{_libdir}/libxkbcommon-x11.so
 %{_libdir}/libxkbcommon.so
+%{_libdir}/libxkbregistry.so
 %{_libdir}/pkgconfig/xkbcommon-x11.pc
 %{_libdir}/pkgconfig/xkbcommon.pc
+%{_libdir}/pkgconfig/xkbregistry.pc
+
+%files utils
+%{_bindir}/xkbcli
+%{_libexecdir}/xkbcommon/xkbcli-compile-keymap
+%{_libexecdir}/xkbcommon/xkbcli-how-to-type
+%{_libexecdir}/xkbcommon/xkbcli-interactive-evdev
+%{_libexecdir}/xkbcommon/xkbcli-interactive-x11
+%{_libexecdir}/xkbcommon/xkbcli-list
+%{_mandir}/man1/xkbcli-compile-keymap.1.gz
+%{_mandir}/man1/xkbcli-how-to-type.1.gz
+%{_mandir}/man1/xkbcli-interactive-evdev.1.gz
+%{_mandir}/man1/xkbcli-interactive-x11.1.gz
+%{_mandir}/man1/xkbcli-list.1.gz
+%{_mandir}/man1/xkbcli.1.gz
 
 # compat32
 %if %{build_compat32}
@@ -120,15 +143,21 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/libxkbcommon-x11.so.*
 %{_libdir}/libxkbcommon.so.*
+%{_libdir}/libxkbregistry.so.*
 
 %files -n compat32-%{name}-devel
 %defattr(-,root,root,-)
 %{_libdir}/libxkbcommon-x11.so
 %{_libdir}/libxkbcommon.so
+%{_libdir}/libxkbregistry.so
 %endif
 
+
 %changelog
-* Sun Jul 3 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.6.1-1
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.1-1
+- new upstream release.
+
+* Sun Jul  3 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.6.1-1
 - new upstream release.
 
 * Sun Oct 26 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.3-1

+ 21 - 13
lib/libx/libxkbfile/libxkbfile-vl.spec

@@ -4,14 +4,13 @@ Summary: X.Org X11 libxkbfile runtime library
 Summary(ja): X.Org X11 libxkbfile ランタイムライブラリ
 Name: libxkbfile
 Version: 1.1.0
-Release: 1%{?_dist_release}
-License: MIT
-Group: System Environment/Libraries
-URL: http://www.x.org
-
+Release: 2%{?_dist_release}
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
+License: MIT
+URL: http://www.x.org
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -22,10 +21,11 @@ BuildRequires: libX11-devel
 %description
 X.Org X11 libxkbfile runtime library
 
+
 %package devel
 Summary: X.Org X11 libxkbfile development package
 Summary(ja): X.Org X11 libxkbfile 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires(pre): xorg-x11-filesystem
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig 
@@ -34,20 +34,22 @@ BuildRequires: xorg-x11-proto-devel
 %description devel
 X.Org X11 libxkbfile development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libxkbfile runtime library
 Summary(ja): X.Org X11 libxkbfile ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
 X.Org X11 libxkbfile runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libxkbfile development package
 Summary(ja): X.Org X11 libxkbfile 開発パッケージ
-Group: Development/Libraries
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: %{name}-devel = %{version}-%{release}
 Requires: compat32-%{name} = %{version}-%{release}
@@ -55,12 +57,17 @@ Requires: compat32-%{name} = %{version}-%{release}
 %description -n compat32-%{name}-devel
 X.Org X11 libxkbfile development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
 # FIXME: We use -fno-strict-aliasing, to work around the following bug:
 # maprules.c:1373: warning: dereferencing type-punned pointer will break strict-aliasing rules)
@@ -71,6 +78,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %endif
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -79,14 +87,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -127,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.0-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.0-1
 - new upstream release.
 

+ 17 - 14
lib/libx/libxshmfence/libxshmfence-vl.spec

@@ -2,12 +2,14 @@
 
 Name:           libxshmfence
 Version:        1.3
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        X11 shared memory fences
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 License:        MIT
 URL:            http://www.x.org/
-Group:          System Environment/Libraries
 Source0:        http://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 # upstream tarball has broken libtool because libtool is never not broken
@@ -17,25 +19,23 @@ BuildRequires:	libtool
 BuildRequires:	xorg-x11-util-macros
 BuildRequires:  xorg-x11-proto-devel
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 Shared memory fences for X11, as used in DRI3.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X11 shared memory fences
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -43,26 +43,24 @@ This package contains libraries and header files for
 developing applications that use %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 autoreconf -v -i -f
 %configure --disable-static
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,7 +85,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libxshmfence.so.1*
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3-1
 - new upstream release.
 

+ 18 - 8
p/pixman/pixman-vl.spec

@@ -2,7 +2,7 @@
 
 Name:           pixman
 Version:        0.40.0
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        Pixel manipulation library
 Summary(ja):    ピクセル操作ライブラリ
 Group:          system
@@ -20,6 +20,7 @@ Obsoletes:	libpixman <= 0.1.6
 %description
 Pixman is a pixel manipulation library for X and cairo.
 
+
 %package devel
 Summary: Pixel manipulation library development package
 Group: programming
@@ -30,47 +31,51 @@ Obsoletes: libpixman-devel <= 0.1.6
 %description devel
 Development library for pixman.
 
+
 # compat32
 %package -n compat32-%{name}
 Summary:        Pixel manipulation library
 Summary(ja):    ピクセル操作ライブラリ
-Group:          system
+Group:          system,legacy
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
 Pixman is a pixel manipulation library for X and cairo.
 
+
 %package -n compat32-%{name}-devel
 Summary: Pixel manipulation library development package
-Group: programming
+Group: programming,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 
 %description -n compat32-%{name}-devel
 Development library for pixman.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 sed -i "s|-msse2|-msse2 -mstackrealign|" configure.ac
 
+
 %build
 autoreconf -if
 %configure --disable-static
 make V=1 %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -96,7 +101,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pixman-1.pc
 %endif
 
+
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.40.0-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Fri Aug 07 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.40.0-1
 - new upstream release.
 

+ 13 - 4
x/xcb-proto/xcb-proto-vl.spec

@@ -2,19 +2,19 @@
 
 Summary:        XCB protocol descriptions
 Name:           xcb-proto
-Version:        1.14
+Version:        1.15
 Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
-Group:          programming
 License:        MIT
 URL:            https://xcb.freedesktop.org/
 Source0:        https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.xz
 BuildArch:      noarch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  python
+BuildRequires:  python3 python3-rpm-macros
 Requires:       pkgconfig
 
 %description
@@ -23,21 +23,27 @@ This package contains the protocol descriptions themselves.  Language
 bindings use these protocol descriptions to generate code for marshalling
 the protocol.
 
+
 %prep
 %setup -q
 
+
 %build
+export PYTHON=%{__python3}
 # Bit of a hack to get the pc file in /usr/share, no we can be noarch.
 %configure --libdir=%{_datadir}
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %license COPYING
@@ -46,9 +52,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/xcb/
 %{_datadir}/xcb/*.xsd
 %{_datadir}/xcb/*.xml
-%{python_sitelib}/xcbgen
+%{python3_sitelib}/xcbgen
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.15-1
+- new upstream release.
+
 * Fri Aug 07 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14-1
 - new upstream release.
 

+ 15 - 14
x/xcb-util-cursor/xcb-util-cursor-vl.spec

@@ -1,31 +1,30 @@
 Name:		xcb-util-cursor
-Version:	0.1.1
-Release:	2%{?_dist_release}
+Version:	0.1.3
+Release:	1%{?_dist_release}
 Summary:	XCB util-cursor module
+Group:		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
-Group:		System Environment/Libraries
 License:	MIT
 URL:		http://xcb.freedesktop.org
 Source0:	http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	xcb-util-devel
 BuildRequires:	xcb-util-image-devel
 BuildRequires:	xcb-util-renderutil-devel
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	Takemikaduchi
-
 %description
 XCB util-cursor module provides the following library:
 
   - cursor: Port of libxcursor
 
+
 %package 	devel
 Summary:	Development and header files for %{name}
 Summary(ja):	%{name} の開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 
@@ -33,6 +32,9 @@ Requires:	pkgconfig
 Development files for %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
@@ -54,11 +56,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm %{buildroot}%{_libdir}/*.la
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
 %clean
 rm -rf %{buildroot}
 
@@ -76,6 +73,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.1.3-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Fri Oct 31 2014 Ryoichi INAAGKI <ryo1@toki.waseda.jp> 0.1.1-2
 - moved devel package to Development/Libraries Group
 

+ 16 - 13
x/xcb-util-image/xcb-util-image-vl.spec

@@ -1,29 +1,29 @@
 Name:		xcb-util-image
 Version:	0.4.0
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Summary:	XCB util-image module
+Group:		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	Takemikaduchi
 
-Group:		System Environment/Libraries
 License:	MIT
 URL:		http://xcb.freedesktop.org
 Source0:	http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	xcb-util-devel
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	Takemikaduchi
-
 %description
 XCB util-image module provides the following library:
 
   - image: Port of Xlib's XImage and XShmImage functions.
 
+
 %package 	devel
 Summary:	Development and header files for %{name}
 Summary(ja):	%{name} の開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 
@@ -31,9 +31,13 @@ Requires:	pkgconfig
 Development files for %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %configure --with-pic --disable-static
 
@@ -52,11 +56,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm %{buildroot}%{_libdir}/*.la
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
 %clean
 rm -rf %{buildroot}
 
@@ -74,6 +73,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.0-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Thu Dec 26 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.3.9-2
 - new upstream release
 - moved devel package to Development/Libraries Group

+ 14 - 12
x/xcb-util-keysyms/xcb-util-keysyms-vl.spec

@@ -1,19 +1,18 @@
 Name:		xcb-util-keysyms
 Version:	0.4.0
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Summary:	XCB util-keysyms module
+Group:		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
-Group:		System Environment/Libraries
 License:	MIT
 URL:		http://xcb.freedesktop.org
 Source0:	http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	xcb-util-devel
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	Takemikaduchi
 
 %description
 XCB util-keysyms module provides the following library:
@@ -24,7 +23,7 @@ XCB util-keysyms module provides the following library:
 %package 	devel
 Summary:	Development and header files for %{name}
 Summary(ja):	%{name} の開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 
@@ -32,9 +31,13 @@ Requires:	pkgconfig
 Development files for %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %configure --with-pic --disable-static
 
@@ -53,11 +56,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm %{buildroot}%{_libdir}/*.la
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
 %clean
 rm -rf %{buildroot}
 
@@ -75,6 +73,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.0-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Fri Oct 31 2014 Ryoichi INAAGKI <ryo1@toki.waseda.jp> 0.4.0-1
 - new upstream release
 - moved devel package to Development/Libraries Group

+ 16 - 15
x/xcb-util-renderutil/xcb-util-renderutil-vl.spec

@@ -1,20 +1,18 @@
 Name:		xcb-util-renderutil
-Version:	0.3.9
-Release:	1%{?_dist_release}
 Summary:	XCB util-renderutil module
+Version:	0.3.9
+Release:	2%{?_dist_release}
+Group:		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
-Group:		System Environment/Libraries
 License:	MIT
 URL:		http://xcb.freedesktop.org
 Source0:	http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	xcb-util-devel
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	Takemikaduchi
-
 %description
 XCB util-renderutil module provides the following library:
 
@@ -23,8 +21,8 @@ XCB util-renderutil module provides the following library:
 
 %package 	devel
 Summary:	Development and header files for %{name}
-Summary:	%{name} の開発用ファイル
-Group:		Development/Libraries
+Summary(ja):	%{name} の開発用ファイル
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 
@@ -32,9 +30,13 @@ Requires:	pkgconfig
 Development files for %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %configure --with-pic --disable-static
 
@@ -53,11 +55,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm %{buildroot}%{_libdir}/*.la
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
 %clean
 rm -rf %{buildroot}
 
@@ -75,6 +72,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.3.9-2
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Fri Oct 31 2014 Ryoichi INAAGKI <ryo1@toki.waseda.jp> 0.3.9-1
 - new upstream release
 - moved devel package to Development/Libraries Group

+ 12 - 12
x/xcb-util-wm/xcb-util-wm-vl.spec

@@ -1,9 +1,11 @@
 Name:		xcb-util-wm
 Version:	0.4.1
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 Summary:	XCB util-wm module
+Group:		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
-Group:		System Environment/Libraries
 License:	MIT
 URL:		http://xcb.freedesktop.org
 Source0:	http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
@@ -12,10 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	xcb-util-devel
 BuildRequires:	xorg-x11-util-macros
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	Takemikaduchi
-
 %description
 XCB util-image module provides the following library:
 
@@ -26,7 +24,7 @@ XCB util-image module provides the following library:
 %package 	devel
 Summary:	Development and header files for %{name}
 Summary(ja):	%{name} の開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 
@@ -34,6 +32,9 @@ Requires:	pkgconfig
 Development files for %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
@@ -56,11 +57,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm %{buildroot}%{_libdir}/*.la
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
 %clean
 rm -rf %{buildroot}
 
@@ -82,6 +78,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.1-3
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Sat Nov  1 2014 Ryoichi INAAGKI <ryo1@toki.waseda.jp> 0.4.1-2
 - moved devel package to Development/Libraries Group
 

+ 16 - 14
x/xcb-util/xcb-util-vl.spec

@@ -2,10 +2,12 @@
 
 Name:		xcb-util
 Version:	0.4.0
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 Summary:	Convenience libraries sitting on top of libxcb
+Group:		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
-Group:		System Environment/Libraries
 License:	MIT
 URL:		http://xcb.freedesktop.org
 Source0:	http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
@@ -19,9 +21,6 @@ BuildRequires:  xorg-x11-proto-devel
 BuildRequires:	xorg-x11-util-macros
 BuildRequires:	chrpath
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 The xcb-util module provides a number of libraries which sit on top of
 libxcb, the core X protocol library, and some of the extension
@@ -34,9 +33,9 @@ the X protocol but which have traditionally been provided by Xlib.
 %package 	devel
 Summary:	Development and header files for xcb-util
 Summary(ja):	xcb-util の開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
-Requires:       pkgconfig
+Requires:	pkgconfig
 
 %description	devel
 Development files for xcb-util.
@@ -45,7 +44,7 @@ Development files for xcb-util.
 # compat32
 %package -n compat32-%{name}
 Summary: Convenience libraries sitting on top of libxcb
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -60,7 +59,7 @@ the X protocol but which have traditionally been provided by Xlib.
 %package -n compat32-%{name}-devel
 Summary:        Development and header files for xcb-util
 Summary(ja):	xcb-util の開発用ファイル
-Group:		Development/Libraries
+Group:		programming,legacy
 Requires:       compat32-%{name} = %{version}-%{release}
 Requires:       %{name}-devel = %{version}-%{release}
 
@@ -68,6 +67,9 @@ Requires:       %{name}-devel = %{version}-%{release}
 Development files for xcb-util.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
@@ -77,6 +79,7 @@ Development files for xcb-util.
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 
@@ -91,11 +94,6 @@ rm %{buildroot}%{_libdir}/*.la
 %check
 make check
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
@@ -126,6 +124,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.0-3
+- rebuilt with current environment.
+- dropped ldconfig scriptlets.
+
 * Thu Sep 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.0-2
 - rebuilt with current environment.
 

+ 14 - 11
x/xorg-x11-proto-devel/xorg-x11-proto-devel-vl.spec

@@ -5,9 +5,9 @@
 Summary: X.Org X11 Protocol headers
 Summary(ja): X.Org X11 プロトコルヘッダファイル
 Name: xorg-x11-proto-devel
-Version: 2019.2
+Version: 2022.2
 Release: 1%{?_dist_release}
-Group: Development/Libraries
+Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke
@@ -19,7 +19,8 @@ Source0: https://github.com/freedesktop/xorg-xorgproto/archive/xorgproto-%{versi
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-util-macros
+BuildRequires: meson
+#BuildRequires: xorg-x11-util-macros
 Obsoletes: XFree86-devel, XOrg-devel
 
 # NOTE: This dependency on xorg-x11-filesystem is required to work around
@@ -42,14 +43,13 @@ X.Org X11 Protocol headers
 
 
 %build
-autoreconf -fiv
-%configure --disable-specs
-make %{?_smp_mflags}
+%meson
+%meson_build
 
 
 %install
 rm -rf %{buildroot}
-%make_install
+%meson_install
 
 # trim some fat
 for i in apple windows trap ; do
@@ -67,7 +67,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%license COPYING-*
+%doc COPYING-*
 %doc *.txt
 %dir %{_includedir}/GL
 %{_includedir}/GL/glxint.h
@@ -76,7 +76,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/GL/glxtokens.h
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/glcore.h
-
 %dir %{_includedir}/X11
 %{_includedir}/X11/DECkeysym.h
 %{_includedir}/X11/HPkeysym.h
@@ -114,7 +113,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/XI2proto.h
 %{_includedir}/X11/extensions/XIproto.h
 %{_includedir}/X11/extensions/XKB.h
-#%{_includedir}/X11/extensions/XKBgeom.h
 %{_includedir}/X11/extensions/XKBproto.h
 %{_includedir}/X11/extensions/XKBsrv.h
 %{_includedir}/X11/extensions/XKBstr.h
@@ -173,7 +171,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/syncconst.h
 %{_includedir}/X11/extensions/syncproto.h
 %{_includedir}/X11/extensions/syncstr.h
-#%{_includedir}/X11/extensions/vldXvMC.h
 %{_includedir}/X11/extensions/xcmiscproto.h
 %{_includedir}/X11/extensions/xcmiscstr.h
 %{_includedir}/X11/extensions/xf86bigfont.h
@@ -195,6 +192,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/xtestext1const.h
 %{_includedir}/X11/extensions/xtestext1proto.h
 %{_includedir}/X11/extensions/xtestproto.h
+%{_includedir}/X11/extensions/xwaylandproto.h
 %dir %{_includedir}/X11/fonts
 %{_includedir}/X11/fonts/FS.h
 %{_includedir}/X11/fonts/FSproto.h
@@ -208,6 +206,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/compositeproto.pc
 %{_datadir}/pkgconfig/damageproto.pc
 %{_datadir}/pkgconfig/dmxproto.pc
+%{_datadir}/pkgconfig/dpmsproto.pc
 %{_datadir}/pkgconfig/dri2proto.pc
 %{_datadir}/pkgconfig/dri3proto.pc
 %{_datadir}/pkgconfig/fixesproto.pc
@@ -230,10 +229,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xf86vidmodeproto.pc
 %{_datadir}/pkgconfig/xineramaproto.pc
 %{_datadir}/pkgconfig/xproto.pc
+%{_datadir}/pkgconfig/xwaylandproto.pc
 %{_docdir}/xorgproto/*
 
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2022.2-1
+- new upstream release.
+
 * Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2019.2-1
 - switched to unified repository.
 - new upstream release.

+ 42 - 42
x/xorg-x11-server/xorg-x11-server-vl.spec

@@ -7,7 +7,7 @@
 Summary:        X.Org X11 X server
 Summary(ja):    X.Org X11 X サーバ
 Name:           xorg-x11-server
-Version:        1.20.11
+Version:        1.20.14
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          system
 Vendor:         Project Vine
@@ -18,7 +18,7 @@ License:        MIT/X11
 %if 0%{?gitdate}
 Source0:        ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{gitdate}.tar.xz
 %else
-Source0:        https://www.x.org/archive/individual/xserver/%{pkgname}-%{version}.tar.bz2
+Source0:        https://www.x.org/archive/individual/xserver/%{pkgname}-%{version}.tar.xz
 %endif
 Source4:        10-quirks.conf
 Source10:       xserver.pamd
@@ -30,21 +30,34 @@ Source20:       http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-r
 Patch1: 06_use-intel-only-on-pre-gen4.diff
 # Default to xf86-video-modesetting on GeForce 8 and newer
 Patch2: 0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch
+
 # Default to va_gl on intel i965 as we use the modesetting drv there
 # va_gl should probably just be the default everywhere ?
 Patch3: 0001-xf86-dri2-Use-va_gl-as-vdpau_driver-for-Intel-i965-G.patch
+
 # Submitted upstream, but not going anywhere
 Patch5: 0001-autobind-GPUs-to-the-screen.patch
+
 # because the display-managers are not ready yet, do not upstream
 Patch6: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
 
+# Backports from current stable "server-1.20-branch":
+# <empty>
+
+# Backports from "master" upstream:
+Patch100: 0001-present-Check-for-NULL-to-prevent-crash.patch
+Patch101: 0001-render-Fix-build-with-gcc-12.patch
+Patch102: 0001-xf86-Accept-devices-with-the-simpledrm-driver.patch
+Patch103: 0001-Don-t-hardcode-fps-for-fake-screen.patch
+
+# CVE-2022-2319/ZDI-CAN-16062, CVE-2022-2320/ZDI-CAN-16070
+Patch110: 0001-xkb-switch-to-array-index-loops-to-moving-pointers.patch
+Patch111: 0002-xkb-swap-XkbSetDeviceInfo-and-XkbSetDeviceInfoCheck.patch
+Patch112: 0003-xkb-add-request-length-validation-for-XkbSetGeometry.patch
+
 # security patch
 
 ## Vine Patch
-# add elogind support
-Patch10000: 0001-add-elogind-support.patch
-# autodetect nvidia driver
-Patch10010: 0001-nvidia.patch
 # autodetect fglrx driver
 Patch10020: 0002-fglrx.patch
 # autodetect virtual video device (qemu) driver
@@ -65,15 +78,6 @@ Patch20000: 0005-dont-disable-kbd-if-AEI-on.patch
 %define with_hw_servers 1
 %endif
 
-%if %{with_hw_servers}
-%define enable_xorg --enable-xorg
-%else
-%define enable_xorg --disable-xorg
-%endif
-
-%define kdrive --enable-kdrive --enable-xephyr --disable-xfake --disable-xfbdev
-%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 # FIXME: Temporary Build deps on autotools, as needed...
@@ -86,7 +90,6 @@ BuildRequires: xorg-x11-proto-devel >= 7.4-9
 
 BuildRequires: xorg-x11-xtrans-devel >= 1.2.3
 BuildRequires: xorg-x11-font-utils
-BuildRequires: libXfont-devel
 BuildRequires: libXfont2-devel
 BuildRequires: libXau-devel
 BuildRequires: libxkbfile-devel
@@ -117,6 +120,7 @@ BuildRequires: freetype2-devel
 
 BuildRequires: libgudev-devel
 BuildRequires: dbus-devel
+BuildRequires: libepoxy-devel
 
 %if %{with systemd}
 BuildRequires: systemd-devel
@@ -133,14 +137,12 @@ BuildRequires: libXi-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXaw-devel >= 1.0.5
 BuildRequires: libXfixes-devel
-BuildRequires: libXdamage-devel
 BuildRequires: libXv-devel
 BuildRequires: libxshmfence-devel
 
 BuildRequires: mesa-libGL-devel >= 7.8
 BuildRequires: mesa-libEGL-devel
 BuildRequires: mesa-libgbm-devel
-BuildRequires: libepoxy-devel
 BuildRequires: mesa-source >= 7.8
 # XXX silly...
 BuildRequires: libdrm-devel >= 2.4.0-3
@@ -148,9 +150,6 @@ BuildRequires: libdrm-devel >= 2.4.0-3
 Requires: libdrm
 %endif
 
-# Make sure libXfont has the catalogue FPE
-Requires: libXfont
-
 # All server subpackages have a virtual provide for the name of the server
 # they deliver.  The Xorg one is versioned, the others are intentionally
 # unversioned.
@@ -305,24 +304,7 @@ Xserver source code needed to build VNC server (Xvnc)
 %prep
 %setup -q -n %{pkgname}-%{version}
 #%setup -q -n %{pkgname}-%{gitdate}
-
-# fedora patches
-
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch5 -p1
-%patch6 -p1
-
-# security patch
-
-# Vine patch
-%patch10020 -p1 -b .fglrx
-%patch10030 -p1 -b .virtual-device
-%patch10040 -p1 -b .vesa-fallback
-
-# Vine 
-%patch20000 -p1 -b .dont-disable-kbd
+%autopatch -p1
 
 # Patch5: xserver-1.8.1-pic-libxf86config.patch
 sed -i \
@@ -333,6 +315,15 @@ autoreconf -vif
 
 
 %build
+%if %{with_hw_servers}
+%define enable_xorg --enable-xorg
+%else
+%define enable_xorg --disable-xorg
+%endif
+
+%define kdrive --enable-kdrive --enable-xephyr --disable-xfake --disable-xfbdev
+%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
+
 %define default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
 
 %if %{with_hw_servers}
@@ -346,6 +337,7 @@ export CXXFLAGS="%{build_cxxflags} -Wstrict-overflow -rdynamic $CFLAGS"
 export LDFLAGS="%{build_ldflags}"
 %configure \
 	%{xservers} \
+	--enable-dependency-tracking \
 	--disable-static \
 	--with-pic \
 	--with-int10=x86emu \
@@ -358,9 +350,13 @@ export LDFLAGS="%{build_ldflags}"
 	--with-xkb-output=%{_localstatedir}/lib/xkb \
 	--enable-install-libxf86config \
 	--disable-linux-acpi --disable-linux-apm \
-	--disable-xselinux --enable-record \
+	--disable-xselinux --enable-record --enable-present \
+	--enable-xcsecurity \
 	--enable-config-udev \
 	--enable-dmx \
+	--disable-unit-tests \
+	--enable-dmx \
+	--disable-xwayland \
 	%{dri_flags} \
 	--enable-systemd-logind \
 %if %{with systemd}
@@ -368,11 +364,12 @@ export LDFLAGS="%{build_ldflags}"
 %endif
 	${CONFIGURE}
 
-make -s %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+make V=1 %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT moduledir=%{moduledir} LIBTOOL=/usr/bin/libtool
+%make_install
 
 
 %if %{with_hw_servers}
@@ -565,6 +562,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.14-1
+- new upstream release.
+
 * Thu May 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.11-1
 - new upstream release.