diff --git a/.gitignore b/.gitignore index ae12819..594272e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libcddb-1.3.2.tar.bz2 +SOURCES/libcddb-1.3.2.tar.bz2 diff --git a/.libcddb.metadata b/.libcddb.metadata new file mode 100644 index 0000000..4a0d93f --- /dev/null +++ b/.libcddb.metadata @@ -0,0 +1 @@ +2a7855918689692ff5ca3316d078a859d51959ce SOURCES/libcddb-1.3.2.tar.bz2 diff --git a/libcddb-1.3.0-multilib.patch b/SOURCES/libcddb-1.3.0-multilib.patch similarity index 100% rename from libcddb-1.3.0-multilib.patch rename to SOURCES/libcddb-1.3.0-multilib.patch diff --git a/libcddb-1.3.2-rhbz770611.patch b/SOURCES/libcddb-1.3.2-rhbz770611.patch similarity index 100% rename from libcddb-1.3.2-rhbz770611.patch rename to SOURCES/libcddb-1.3.2-rhbz770611.patch diff --git a/SOURCES/pointer-types.patch b/SOURCES/pointer-types.patch new file mode 100644 index 0000000..cc883cc --- /dev/null +++ b/SOURCES/pointer-types.patch @@ -0,0 +1,11 @@ +--- lib/cddb_net.c~ 2024-02-01 13:39:55.794671164 -0600 ++++ lib/cddb_net.c 2024-02-01 13:40:50.551398466 -0600 +@@ -329,7 +329,7 @@ + default: + /* we got connected, check error condition */ + l = sizeof(rv); +- getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &rv, &l); ++ getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &rv, (socklen_t * restrict)&l); + if (rv) { + /* something went wrong, simulate normal connect behaviour */ + errno = rv; diff --git a/libcddb.spec b/SPECS/libcddb.spec similarity index 85% rename from libcddb.spec rename to SPECS/libcddb.spec index 2397eaf..dc39c3b 100644 --- a/libcddb.spec +++ b/SPECS/libcddb.spec @@ -1,12 +1,13 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.3.2 -Release: 35%{?dist} -License: LGPLv2+ +Release: 44%{?dist} +License: LGPL-2.0-or-later URL: http://libcddb.sourceforge.net/ Source0: http://downloads.sourceforge.net/libcddb/%{name}-%{version}.tar.bz2 Patch0: libcddb-1.3.0-multilib.patch Patch1: libcddb-1.3.2-rhbz770611.patch +Patch2: pointer-types.patch BuildRequires: gcc BuildRequires: pkgconfig, libcdio-devel >= 0.67 BuildRequires: make @@ -29,8 +30,9 @@ for libcddb. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 +%patch -P 2 -p0 iconv -f ISO_8859-1 -t UTF-8 THANKS > THANKS.tmp touch -r THANKS THANKS.tmp mv THANKS.tmp THANKS @@ -68,6 +70,36 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %changelog +* Sat Dec 28 2024 Arkady L. Shane - 1.3.2-44 +- Rebuilt for MSVSphere 10 + +* Thu Jul 18 2024 Fedora Release Engineering - 1.3.2-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Feb 02 2024 Gwyn Ciesla - 1.3.2-43 +- SPDX license tag + +* Thu Feb 01 2024 Gwyn Ciesla - 1.3.2-42 +- Patch for updated compiler flags. + +* Thu Jan 25 2024 Fedora Release Engineering - 1.3.2-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.3.2-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.3.2-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.3.2-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.3.2-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.3.2-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.3.2-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources deleted file mode 100644 index dc62f7a..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -8bb4a6f542197e8e9648ae597cd6bc8a libcddb-1.3.2.tar.bz2