Accepting request 985318 from home:lnussel:build

- refresh patches to apply clean
- add git url
- add requires

OBS-URL: https://build.opensuse.org/request/show/985318
OBS-URL: https://build.opensuse.org/package/show/Base:System/debugedit?expand=0&rev=3

debugedit.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 27 11:36:59 UTC 2022 - Ludwig Nussel <lnussel@suse.de>
+
+- refresh patches to apply clean
+- add git url
+- add requires
+
 -------------------------------------------------------------------
 Wed Jun 30 13:06:47 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
 

debugedit.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package debugedit
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,12 +15,14 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 Name:           debugedit
 Version:        5.0
 Release:        0
 Summary:        Debuginfo extraction
 License:        GPL-3.0-or-later
 Group:          System/Packages
+#Git-Clone:     https://sourceware.org/git/debugedit.git
 URL:            https://www.sourceware.org/debugedit
 Source0:        https://sourceware.org/ftp/%{name}/%{version}/%{name}-%{version}.tar.xz
 Source1:        https://sourceware.org/ftp/%{name}/%{version}/%{name}-%{version}.tar.xz.sig
@@ -34,15 +36,25 @@ Patch5:         remove-bad-shift.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  help2man
-BuildRequires:  pkgconfig(libelf)
 BuildRequires:  pkgconfig(libdw)
+BuildRequires:  pkgconfig(libelf)
+Requires:       /usr/bin/gdb-add-index
+Requires:       binutils
+Requires:       coreutils
+Requires:       dwz
+Requires:       elfutils
+Requires:       findutils
+Requires:       gawk
+Requires:       grep
+Requires:       sed
+Requires:       xz
 
 %description
 debugedit provides programs and scripts for creating debuginfo and source file distributions,
 collect build-ids and rewrite source paths in DWARF data for debugging, tracing and profiling.
 
 %prep
-%autosetup -p1
+%autosetup -p0
 
 %build
 autoreconf -fiv
@@ -52,7 +64,6 @@ autoreconf -fiv
 %install
 %make_install
 
-
 %files
 %license COPYING3
 %doc README

debuginfo-mono.patch

@@ -1,6 +1,8 @@
---- ./scripts/find-debuginfo.in.orig	2017-12-01 15:40:27.006764372 +0000
-+++ ./scripts/find-debuginfo.in	2017-12-01 15:41:17.270619182 +0000
-@@ -348,6 +348,16 @@ while read nlinks inum f; do
+Index: scripts/find-debuginfo.in
+===================================================================
+--- scripts/find-debuginfo.in.orig
++++ scripts/find-debuginfo.in
+@@ -434,6 +434,16 @@ while read nlinks inum f; do
        ;;
      *) continue ;;
    esac

debuglink.patch

@@ -1,6 +1,8 @@
---- ./scripts/find-debuginfo.in.orig	2017-12-01 15:39:07.239994681 +0000
-+++ ./scripts/find-debuginfo.in	2017-12-01 15:39:34.942914702 +0000
-@@ -321,7 +321,7 @@ debug_link()
+Index: scripts/find-debuginfo.in
+===================================================================
+--- scripts/find-debuginfo.in.orig
++++ scripts/find-debuginfo.in
+@@ -407,7 +407,7 @@ debug_link()
  get_debugfn()
  {
    dn=$(dirname "${1#$RPM_BUILD_ROOT}")

debugsubpkg.patch

@@ -1,6 +1,8 @@
---- ./scripts/find-debuginfo.in.orig	2017-12-01 15:35:59.023537837 +0000
-+++ ./scripts/find-debuginfo.in	2017-12-01 15:36:30.351447397 +0000
-@@ -548,19 +548,25 @@ if $run_dwz \
+Index: scripts/find-debuginfo.in
+===================================================================
+--- scripts/find-debuginfo.in.orig
++++ scripts/find-debuginfo.in
+@@ -643,19 +643,25 @@ if $run_dwz \
    fi
  fi
  

finddebuginfo.patch

@@ -1,6 +1,8 @@
---- ./scripts/find-debuginfo.in.orig	2019-09-09 07:56:53.377788842 +0000
-+++ ./scripts/find-debuginfo.in	2019-10-02 11:11:56.878979662 +0000
-@@ -348,12 +348,18 @@ trap 'rm -rf "$temp"' EXIT
+Index: scripts/find-debuginfo.in
+===================================================================
+--- scripts/find-debuginfo.in.orig
++++ scripts/find-debuginfo.in
+@@ -412,12 +412,18 @@ trap 'rm -rf "$temp"' EXIT
  
  # Build a list of unstripped ELF files and their hardlinks
  touch "$temp/primary"
@@ -24,7 +26,7 @@
    if [ $nlinks -gt 1 ]; then
      var=seen_$inum
      if test -n "${!var}"; then
-@@ -386,6 +392,8 @@ do_file()
+@@ -450,6 +456,8 @@ do_file()
    if [ "$no_recompute_build_id" = "true" ]; then
      no_recompute="-n"
    fi
@@ -33,7 +35,7 @@
    id=$(${install_dir}/debugedit -b "$debug_base_name" -d "$debug_dest_name" \
  			      $no_recompute -i \
  			      ${build_id_seed:+--build-id-seed="$build_id_seed"} \
-@@ -413,17 +421,30 @@ do_file()
+@@ -477,17 +485,30 @@ do_file()
    # just has its file names collected and adjusted.
    case "$dn" in
    /usr/lib/debug/*)
@@ -71,7 +73,7 @@
  
    # strip -g implies we have full symtab, don't add mini symtab in that case.
    # It only makes sense to add a minisymtab for executables and shared
-@@ -581,12 +602,14 @@ if [ -s "$SOURCEFILE" ]; then
+@@ -646,12 +667,14 @@ if [ -s "$SOURCEFILE" ]; then
    # and non-standard modes may be inherented from original directories, fixup
    find "${RPM_BUILD_ROOT}${debug_dest_name}" -type d -print0 |
    xargs --no-run-if-empty -0 chmod 0755