Browse Source

updated 3 packages

dwz-0.15-1

libffi-3.4.6-1

rpm-4.16.1.3-4
Tomohiro "Tomo-p" KATO 8 months ago
parent
commit
3a436a7d74
3 changed files with 61 additions and 22 deletions
  1. 8 8
      d/dwz/dwz-vl.spec
  2. 34 13
      lib/libf/libffi/libffi-vl.spec
  3. 19 1
      r/rpm/rpm-vl.spec

+ 8 - 8
d/dwz/dwz-vl.spec

@@ -1,21 +1,18 @@
 Summary: DWARF optimization and duplicate removal tool
 Summary(ja): DWARF 最適化・重複排除ツール
 Name: dwz
-Version: 0.14
-Release: 4%{?_dist_release}
+Version: 0.15
+Release: 1%{?_dist_release}
 Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
 
-License: GPLv2+ and GPLv3+
+License: GPL-3.0-or-later AND (GPL-3.0-or-later WITH GCC-exception-3.1) AND GPL-2.0-or-later AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND LGPL-2.0-or-later
 URL: https://sourceware.org/dwz/
-Source: %{name}-0.14.tar.xz
-Patch1: dwz-0.14-binutils-Wn.patch
-Patch2: dwz-0.14-binutils-readelf-alt.patch
-Patch3: dwz-0.14-gdb-add-index.patch
+Source: https://sourceware.org/ftp/dwz/releases/%{name}-%{version}.tar.xz
 
 BuildRequires: gcc, gcc-c++, gdb, elfutils-libelf-devel, dejagnu
-BuildRequires: make
+BuildRequires: make elfutils xxhash-devel
 
 %description
 The dwz package contains a program that attempts to optimize DWARF
@@ -55,6 +52,9 @@ make check
 
 
 %changelog
+* Tue May 07 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.15-1
+- new upstream release.
+
 * Thu Sep 15 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.14-4
 - dropped Patch0.
 - imported Patches from rawhide.

+ 34 - 13
lib/libf/libffi/libffi-vl.spec

@@ -3,9 +3,9 @@
 Summary:        Foreign function interface library
 Summary(ja):    Foreign function interface ライブラリ
 Name:           libffi
-Version:        3.3
+Version:        3.4.6
 Release:        1%{?_dist_release}
-Group:          System Environment/Libraries
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -32,8 +32,8 @@ Foreign function interface は一般に普及しているインターフェイ
 %package        devel
 Summary:        Libraries and headers for %{name}
 Summary(ja):    %{name} 用の開発ライブラリおよびヘッダファイル
-Group:          Development/Libraries
-Requires:       %{name} = %{version}
+Group:          programmming
+Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
 %description devel
@@ -50,11 +50,27 @@ develop applications using libffi.
 libffi を使用したアプリケーションを開発するなら、このパッケージ
 をインストールしてください。
 
+#-----------------------------------------------------------------------------
+
+%package        static
+Summary:        Static libraries for %{name}
+Summary(ja):    %{name} の静的ライブラリ
+Group:          programmming
+Requires:       %{name}-devel = %{version}-%{release}
+
+%description static
+This package includes the static library of libffi.
+
+%description static -l ja
+このパッケージは ffi ライブラリの静的ライブラリを含んでいます。
+
+#-----------------------------------------------------------------------------
+
 #compat32
 %package -n     compat32-%{name}
 Summary:        Foreign function interface library
 Summary(ja):    Foreign function interface ライブラリ
-Group:          System Environment/Libraries
+Group:          system,legacy
 Requires:       %{name} = %{version}
 
 %description -n compat32-%{name}
@@ -67,10 +83,12 @@ Foreign function interface は一般に普及しているインターフェイ
 ある言語で書かれたコードから、他の言語で書かれたコードを呼び出すこ
 とを可能にします。
 
+#-----------------------------------------------------------------------------
+
 %package -n     compat32-%{name}-devel
 Summary:        Libraries and headers for %{name}
 Summary(ja):    %{name} 用の開発ライブラリおよびヘッダファイル
-Group:          Development/Libraries
+Group:          programming,legacy
 Requires:       compat32-%{name} = %{version}
 Requires:       %{name}-devel = %{version}
 
@@ -121,20 +139,20 @@ autoreconf -ifv
 %files
 %defattr(-,root,root)
 %license LICENSE
-%doc ChangeLog* README  
+%doc ChangeLog* README*
 %{_libdir}/libffi.so.*
-%{_infodir}/libffi.info*
-%{_mandir}/man3/ffi.3*
-%{_mandir}/man3/ffi_call.3*
-%{_mandir}/man3/ffi_prep_cif.3*
-%{_mandir}/man3/ffi_prep_cif_var.3*
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/*
-%{_libdir}/libffi.a
 %{_libdir}/libffi.so
 %{_includedir}/*.h
+%{_infodir}/libffi.info*
+%{_mandir}/man3/*.3*
+
+%files static
+%defattr(-,root,root)
+%{_libdir}/libffi.a
 
 # compat32
 %if %{build_compat32}
@@ -148,6 +166,9 @@ autoreconf -ifv
 %endif
 
 %changelog
+* Sat May 04 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.6-1
+- updated to 3.4.6.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.3-1
 - updated to 3.3.
 - dropped Patch0.

+ 19 - 1
r/rpm/rpm-vl.spec

@@ -52,7 +52,7 @@ Summary(ja): RPM パッケージ管理システム
 Name: rpm
 Version: 4.16.1.3
 %define rpm_version %{version}
-Release: 3%{_dist_release}%{?with_systemd:.systemd}
+Release: 4%{_dist_release}%{?with_systemd:.systemd}
 Group: admin-tools
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -97,6 +97,8 @@ Patch916: 0006-debugedit-Handle-DWARF-5-debug_line-and-debug_line_s.patch
 
 # Downstream-only patches
 Patch1000: rpm-4.16.1.3-hashtab-use-after-free-fix.patch
+Patch1001: rpm-4.16.1.3-find_debuginfo_vendor_opts.patch
+Patch1002: 0001-Macroize-find-debuginfo-script-location.patch
 
 # Patches for Vine Linux
 Patch10000: 0001-rpm-4.12.0.1-vine.patch.patch
@@ -338,6 +340,19 @@ pushd python
 %py3_install
 popd
 
+cat > $RPM_BUILD_ROOT/%{rpmhome}/debugedit << END
+#!/bin/sh
+/usr/bin/debugedit "\$@"
+END
+cat > $RPM_BUILD_ROOT/%{rpmhome}/sepdebugcrcfix << END
+#!/bin/sh
+/usr/bin/sepdebugcrcfix "\$@"
+END
+cat > $RPM_BUILD_ROOT/%{rpmhome}/find-debuginfo.sh << END
+#!/bin/sh
+/usr/bin/find-debuginfo.sh "\$@"
+END
+
 %if %{with systemd}
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/%{_unitdir}
@@ -605,6 +620,9 @@ exit 0
 
 
 %changelog
+* Wed May 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.16.1.3-4
+- imported patches from CentOS 9 stream.
+
 * Sat Nov 05 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.16.1.3-3
 - rebuilt with python3-3.11.