0001-fix-Werror-format-security.patch

@@ -1,39 +0,0 @@
-From 0e2d1498f1172c764eecbd1f278cf65740db0eb4 Mon Sep 17 00:00:00 2001
-From: Jun Yang <jun.yang@suse.com>
-Date: Wed, 9 Mar 2022 17:35:21 +0800
-Subject: [PATCH] fix compiler error for option -Werror=format-security
-
-Signed-off-by: Jun Yang <jun.yang@suse.com>
----
- src/cdda-player.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/cdda-player.c b/src/cdda-player.c
-index 69eddee..3566ca0 100644
---- a/src/cdda-player.c
-+++ b/src/cdda-player.c
-@@ -298,7 +298,7 @@ action(const char *psz_action)
-              psz_action);
-   else
-     snprintf(psz_action_line, sizeof(psz_action_line), "%s", "" );
--  mvprintw(LINE_ACTION, 0, psz_action_line);
-+  mvprintw(LINE_ACTION, 0, (char *) "%s", psz_action_line);
-   clrtoeol();
-   refresh();
- }
-@@ -1029,10 +1029,10 @@ display_tracks(void)
-       }
-       if (sub.track == i) {
-         attron(A_STANDOUT);
--        mvprintw(i_line++, 0, line);
-+        mvprintw(i_line++, 0, (char *) "%s", line);
-         attroff(A_STANDOUT);
-       } else
--        mvprintw(i_line++, 0, line);
-+        mvprintw(i_line++, 0, (char *) "%s", line);
-       clrtoeol();
-     }
-   }
--- 
-2.34.1
-

backport-correct-realpath-test-failure.patch

@@ -1,44 +0,0 @@
-commit 56335fff0f21d294cd0e478d49542a43e9495ed0
-Author: R. Bernstein <rocky@gnu.org>
-Date:   Wed Aug 24 14:34:33 2022 -0400
-
-    Correct realpath test failure
-    
-    See https://savannah.gnu.org/bugs/?62948
-    Patch courtesy of Martin Liška <marxin>
-
-diff --git a/test/driver/realpath.c b/test/driver/realpath.c
-index 289253e4..cd46d620 100644
---- a/test/driver/realpath.c
-+++ b/test/driver/realpath.c
-@@ -1,5 +1,7 @@
- /* -*- C -*-
--  Copyright (C) 2010-2012, 2015, 2017 Rocky Bernstein <rocky@gnu.org>
-+
-+  Copyright (C) 2010-2012, 2015, 2017, 2022 Rocky Bernstein
-+  <rocky@gnu.org>
- 
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-@@ -175,16 +177,17 @@ main(int argc, const char *argv[])
-         rc = check_rc(symlink(psz_symlink_file, psz_symlink_file),
-                       "symlink", psz_symlink_file);
-         if (0 == rc) {
--            cdio_realpath(psz_symlink_file, psz_file_check);
--            if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
-+            char *retvalue = cdio_realpath(psz_symlink_file, psz_file_check);
-+            if (0 != retvalue) {
-+	      if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
-                 fprintf(stderr, "direct cdio_realpath cycle test failed. %s vs %s\n",
-                         psz_file_check, symlink_file);
- 		rc = 5;
- 		goto err_exit;
-+	      }
-+	      check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
-             }
--            check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
-         }
--
-     }
- 
-     check_rc(unlink(psz_orig_file), "unlink", psz_orig_file);

libcdio.spec

@@ -1,16 +1,14 @@
 Name:            libcdio
 Version:         2.1.0
-Release:         6
+Release:         1
 Summary:         CD-ROM input and control library
 License:         GPLv3+
 URL:             http://www.gnu.org/software/libcdio/
 Source0:         https://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.bz2
 Source1:         https://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.bz2.sig
 Source2:         libcdio_x86_64_config.h
-Patch6000:       backport-correct-realpath-test-failure.patch
-Patch9000:       0001-fix-Werror-format-security.patch
 
-BuildRequires:   gcc gcc-c++ pkgconfig doxygen ncurses-devel help2man chrpath gettext-devel
+BuildRequires:   gcc gcc-c++ git pkgconfig doxygen ncurses-devel help2man chrpath gettext-devel
 Requires(post):  /sbin/ldconfig
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -30,7 +28,7 @@ This package contains header files and development Files for for %{name}.
 %package_help
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -n %{name}-%{version} -p1 -S git
 iconv -f ISO88591 -t utf-8 -o THANKS.utf8 THANKS && mv THANKS.utf8 THANKS
 
 %build
@@ -97,21 +95,6 @@ fi
 %{_infodir}/*
 
 %changelog
-* Tue Jan 17 2023 zhouwenpei <zhouwenpei@h-partners.com> - 2.1.0-6
-- fix test case fail
-
-* Mon Apr 18 2022 Chenxi Mao <chenxi.mao@suse.com> - 2.1.0-5
-- Remove self-dependency
-
-* Fri Mar 11 2022 JunYang <jun.yang@suse.com> - 2.1.0-4
-- Fix compiler error for option -Werror=format-security
-
-* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 2.1.0-3
-- DESC: delete -S git from %autosetup, and delete BuildRequires git
-
-* Tue Feb 9 2021 jinzhimin <jinzhimin2@huawei.com> - 2.1.0-2
-- add old so file
-
 * Fri Jan 29 2021 zhanzhimin <zhanzhimin@huawei.com> - 2.1.0-1
 - update to 2.1.0