From 2d18dcee00da2d9c2fa87fc94f475867786c3442 Mon Sep 17 00:00:00 2001 From: tigro Date: Thu, 19 Oct 2023 17:44:05 +0300 Subject: [PATCH] import cdparanoia-10.2-38.el9 --- .cdparanoia.metadata | 2 +- SOURCES/cdparanoia-10.2-add-pkgconfig.patch | 91 +++++++++++++++++++++ SPECS/cdparanoia.spec | 60 ++++++++++++-- 3 files changed, 144 insertions(+), 9 deletions(-) create mode 100644 SOURCES/cdparanoia-10.2-add-pkgconfig.patch diff --git a/.cdparanoia.metadata b/.cdparanoia.metadata index 0881208..01a3a67 100644 --- a/.cdparanoia.metadata +++ b/.cdparanoia.metadata @@ -1 +1 @@ -1901e20d3a370ca6afa4c76a9ef30d3f03044320 SOURCES/cdparanoia-III-10.2.src.tgz +1901e20d3a370ca6afa4c76a9ef30d3f03044320 SOURCES/cdparanoia-III-10.2.src.tgz diff --git a/SOURCES/cdparanoia-10.2-add-pkgconfig.patch b/SOURCES/cdparanoia-10.2-add-pkgconfig.patch new file mode 100644 index 0000000..858322f --- /dev/null +++ b/SOURCES/cdparanoia-10.2-add-pkgconfig.patch @@ -0,0 +1,91 @@ +From 5beb3983942ce92ea18a2a0f2e15f84fb25c27d8 Mon Sep 17 00:00:00 2001 +From: xiphmont +Date: Fri, 11 Jun 2010 15:42:00 +0000 +Subject: [PATCH] Add pkgconfig file to cdparanoia; closes Trac #1706 + +git-svn-id: https://svn.xiph.org/trunk/cdparanoia@17289 0101bb08-14d6-0310-b084-bc0e0c8e3800 +--- + Makefile.in | 7 +++++-- + cdparanoia-3.pc.in | 12 ++++++++++++ + configure.in | 5 ++++- + 3 files changed, 21 insertions(+), 3 deletions(-) + create mode 100644 cdparanoia-3.pc.in + +diff --git a/Makefile.in b/Makefile.in +index 25c91ce..bfef153 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -3,7 +3,7 @@ + # DO NOT EDIT BELOW! ########################################################## + # (unless, of course, you know what you are doing :) ########################## + +-VERSION=10.2 ++VERSION=@VERSION@ + VPATH=@srcdir@ + srcdir=@srcdir@ + +@@ -23,6 +23,7 @@ BINDIR=@bindir@ + MANDIR=@mandir@ + INCLUDEDIR=@includedir@ + LIBDIR=@libdir@ ++PKGCONFIGDIR=@libdir@/pkgconfig + PWD = $(shell pwd) + + OFILES = main.o report.o header.o buffering_write.o cachetest.o +@@ -85,6 +86,8 @@ install: + $(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0 + ln -fs libcdda_paranoia.so.0.$(VERSION) \ + $(DESTDIR)$(LIBDIR)/libcdda_paranoia.so ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(PKGCONFIGDIR) ++ $(INSTALL) -m 0644 $(srcdir)/cdparanoia-3.pc $(DESTDIR)$(PKGCONFIGDIR) + + cdparanoia: $(OFILES) $(LIBDEP) + $(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \ +@@ -104,6 +107,6 @@ distclean: + cd interface && $(MAKE) distclean + cd paranoia && $(MAKE) distclean + -rm -f cdparanoia *~ config.* *.o *.wav *.aifc *.raw test.file \ +- Makefile verify_test core gmon.out ++ Makefile verify_test core gmon.out cdparanoia-3.pc + + .PHONY: all debug test lib slib install clean distclean +diff --git a/cdparanoia-3.pc.in b/cdparanoia-3.pc.in +new file mode 100644 +index 0000000..3a15099 +--- /dev/null ++++ b/cdparanoia-3.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: Cdparanoia III ++Description: Compact Disc Digital Audio (CDDA) Digital Audio Extraction (DAE) library ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -lcdda_interface -lcdda_paranoia ++Cflags: -I${includedir} ++ +diff --git a/configure.in b/configure.in +index 3ad98ca..3ae6989 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,5 +1,8 @@ + AC_INIT(interface/interface.c) + ++VERSION="10.2" ++AC_SUBST(VERSION) ++ + AC_CANONICAL_HOST + + if test -z "$CC"; then +@@ -67,4 +70,4 @@ AC_SUBST(OPT) + AC_SUBST(DEBUG) + AC_SUBST(CC) + +-AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile) ++AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile cdparanoia-3.pc) +-- +2.26.2 + diff --git a/SPECS/cdparanoia.spec b/SPECS/cdparanoia.spec index 8c03544..0e23ead 100644 --- a/SPECS/cdparanoia.spec +++ b/SPECS/cdparanoia.spec @@ -1,10 +1,9 @@ Summary: Compact Disc Digital Audio (CDDA) extraction tool (or ripper) Name: cdparanoia Version: 10.2 -Release: 27%{?dist} -# the app is GPLv2, everything else is LGPLv2 -License: GPLv2 and LGPLv2 -Group: Applications/Multimedia +Release: 38%{?dist} +# the app is GPLv2 and GPLv2+, everything else is LGPLv2 +License: GPLv2 and GPLv2+ and LGPLv2 URL: http://www.xiph.org/paranoia/index.html Source: http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-%{version}.src.tgz @@ -18,10 +17,17 @@ Patch2: cdparanoia-10.2-install.patch Patch3: cdparanoia-10.2-format-security.patch Patch4: cdparanoia-use-proper-gnu-config-files.patch Patch5: cdparanoia-10.2-ldflags.patch +# https://svn.xiph.org/trunk/cdparanoia@17289 +Patch6: cdparanoia-10.2-add-pkgconfig.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%description +BuildRequires: gcc +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: make + +%description Cdparanoia (Paranoia III) reads digital audio directly from a CD, then writes the data to a file or pipe in WAV, AIFC or raw 16 bit linear PCM format. Cdparanoia doesn't contain any extra features (like the ones @@ -33,7 +39,6 @@ damaged CDs. %package static Summary: Development tools for libcdda_paranoia (Paranoia III) -Group: Development/Libraries Requires: cdparanoia-devel = %{version}-%{release} License: LGPLv2 @@ -43,7 +48,6 @@ developing applications to read CD Digital Audio disks. %package libs Summary: Libraries for libcdda_paranoia (Paranoia III) -Group: Applications/Multimedia License: LGPLv2 %description libs @@ -52,7 +56,6 @@ applications which read CD Digital Audio disks. %package devel Summary: Development tools for libcdda_paranoia (Paranoia III) -Group: Development/Libraries Requires: %{name}-libs%{?_isa} = %{version}-%{release} License: LGPLv2 @@ -68,11 +71,13 @@ for developing applications to read CD Digital Audio disks. %patch3 -p1 -b .fmt-sec %patch4 -p1 -b .config %patch5 -p1 -b .ldflags +%patch6 -p1 -b .pkgconfig # Update config.guess/sub for newer architectures cp /usr/lib/rpm/redhat/config.* . %build +autoreconf -ifv %configure --includedir=%{_includedir}/cdda # Also remove many warnings which we are aware of # Lastly, don't use _smp_mflags since it also makes the build fail @@ -94,12 +99,51 @@ make install DESTDIR=$RPM_BUILD_ROOT %files devel %{_includedir}/cdda/ +%{_libdir}/pkgconfig/*.pc %{_libdir}/*.so %files static %{_libdir}/*.a %changelog +* Thu Oct 19 2023 Arkady L. Shane - 10.2-38 +- Rebuilt for MSVSphere 9.2 + +* Wed Jul 21 2021 Fedora Release Engineering - 10.2-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Apr 20 2021 Jiri Kucera - 10.2-37 +- Include also GPLv2+ to License field (main.c and cachetest.c + are distributed under GPLv2+) + +* Tue Jan 26 2021 Fedora Release Engineering - 10.2-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Oct 26 2020 Dan Horák - 10.2-35 +- Add pkgconfig support + +* Mon Oct 05 2020 Stephen Gallagher - 10.2-34 +- Fix build on Fedora 33+ + +* Sat Aug 01 2020 Fedora Release Engineering - 10.2-33 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 10.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 10.2-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 10.2-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 10.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 10.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Mar 07 2018 Adam Jackson - 10.2-27 - Fix LDFLAGS propagation - Stop building with -O0