--- cdparanoia.spec.orig 2008-11-24 12:33:14.000000000 +0100
+++ cdparanoia.spec 2008-12-22 22:38:25.516246835 +0100
@@ -1,21 +1,20 @@
-%define ver 10
-
+Summary: Compact Disc Digital Audio (CDDA) extraction tool (or ripper)
Name: cdparanoia
Version: 10.2
-Release: 2%{?dist}
+Release: 3%{?dist}
# the app is GPLv2, everything else is LGPLv2
License: GPLv2 and LGPLv2
Group: Applications/Multimedia
-Source: http://downloads.xiph.org/releases/%{name}/%{name}-III-%{version}.src.tgz
+URL: http://www.xiph.org/paranoia/index.html
+Source: http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-%{version}.src.tgz
# Patch from upstream to fix cdda_interface.h C++ incompatibility ("private")
# https://trac.xiph.org/changeset/15338
# https://bugzilla.redhat.com/show_bug.cgi?id=463009
Patch0: cdparanoia-10.2-#463009.patch
-Url: http://www.xiph.org/paranoia/index.html
-BuildRoot: %{_tmppath}/cdparanoia-%{version}-root
+Patch1: cdparanoia-III-10.2-install.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: cdparanoia-libs = %{version}-%{release}
-Obsoletes: cdparanoia-III
-Summary: A Compact Disc Digital Audio (CDDA) extraction tool (or ripper).
+Obsoletes: cdparanoia-III <= alpha9.8
%description
Cdparanoia (Paranoia III) reads digital audio directly from a CD, then
@@ -27,86 +26,73 @@
atomic reads. Cdparanoia is also good at reading and repairing data from
damaged CDs.
-%package -n cdparanoia-devel
-Summary: Development tools for libcdda_paranoia (Paranoia III).
-Group: Development/Libraries
-Requires: cdparanoia-libs = %{version}-%{release}
+%package libs
+Summary: Libraries for libcdda_paranoia (Paranoia III)
+Group: Applications/Multimedia
License: LGPLv2
-%description -n cdparanoia-devel
-The cdparanoia-devel package contains the static libraries and header
-files needed for developing applications to read CD Digital Audio disks.
+%description libs
+The cdparanoia-libs package contains the dynamic libraries needed for
+applications which read CD Digital Audio disks.
-%package -n cdparanoia-libs
-Summary: Libraries for libcdda_paranoia (Paranoia III).
+%package devel
+Summary: Development files for libcdda_paranoia (Paranoia III)
Group: Development/Libraries
+Requires: cdparanoia-libs = %{version}-%{release}
License: LGPLv2
-%description -n cdparanoia-libs
-The cdparanoia-libs package contains the dynamic libraries needed for
-applications which read CD Digital Audio disks.
+%description devel
+The cdparanoia-devel package contains the header files needed for developing
+applications to read CD Digital Audio disks.
%prep
%setup -q -n %{name}-III-%{version}
%patch0 -p3 -b .#463009
+%patch1 -p1 -b .install
%build
-rm -rf $RPM_BUILD_ROOT
-export OPT="${CFLAGS:-%optflags} -O0 -Wno-pointer-sign -Wno-unused -Werror-implicit-function-declaration"
%configure --includedir=%{_includedir}/cdda
-make OPT="$OPT"
+# Using -O0 is mandatory, the build fails otherwise...
+# Also remove many warnings which we are aware of
+# Last, don't use _smp_mflags since it also makes the build fail
+make OPT="$RPM_OPT_FLAGS -O0 -Wno-pointer-sign -Wno-unused"
%install
rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_includedir}/cdda
-install -d $RPM_BUILD_ROOT%{_libdir}
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 0755 cdparanoia $RPM_BUILD_ROOT%{_bindir}
-install -m 0644 cdparanoia.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-install -m 0644 utils.h paranoia/cdda_paranoia.h interface/cdda_interface.h \
- $RPM_BUILD_ROOT%{_includedir}/cdda
-install -m 0755 paranoia/libcdda_paranoia.so.0.10.? \
- interface/libcdda_interface.so.0.10.? \
- $RPM_BUILD_ROOT%{_libdir}
-install -m 0755 paranoia/libcdda_paranoia.a interface/libcdda_interface.a \
- $RPM_BUILD_ROOT%{_libdir}
-
-/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
-
-pushd $RPM_BUILD_ROOT%{_libdir}
-ln -s libcdda_paranoia.so.0.10.? libcdda_paranoia.so
-ln -s libcdda_interface.so.0.10.? libcdda_interface.so
-popd
-
-%post -n cdparanoia-libs
-/sbin/ldconfig
-
-%postun -n cdparanoia-libs
-if [ "$1" -ge "1" ]; then
- /sbin/ldconfig
-fi
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
%clean
-[ "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" ] && rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
-%files -n cdparanoia
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%files
%defattr(-,root,root)
-%doc README
-%{_bindir}/*
-%{_mandir}/man1/*
+%doc COPYING* README
+%{_bindir}/cdparanoia
+%{_mandir}/man1/cdparanoia.1*
-%files -n cdparanoia-libs
+%files libs
%defattr(-,root,root)
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
-%files -n cdparanoia-devel
+%files devel
%defattr(-,root,root)
-%{_includedir}/cdda
-%{_libdir}/*.a
+%{_includedir}/cdda/
+%{_libdir}/*.so
%changelog
+* Mon Dec 22 2008 Matthias Saou 10.2-3
+- Merge review cleanups (#225638).
+- Move .so symlink to the devel sub-package (#203620).
+- Reorder and clean up the spec file.
+- Escape all macros in changelog.
+- Add highest known version to the cdparanoia-III obsoletes.
+- Include install patch to have DESTDIR work and libs +x for correct debuginfo.
+
* Tue Sep 30 2008 Kevin Kofler 10.2-2
- fix cdda_interface.h C++ incompatibility (patch from upstream) (#463009)
@@ -185,7 +171,7 @@
- rebuilt
* Tue Feb 17 2004 Peter Jones alpha9.8-20
-- take ownership of %{_includedir}/cdda
+- take ownership of %%{_includedir}/cdda
* Fri Feb 13 2004 Elliot Lee
- rebuilt
@@ -226,7 +212,7 @@
- fix broken Obsoletes of cdparanoia-devel
* Thu Dec 6 2001 Peter Jones alpha9.8-6
-- move includes to %{_includedir}/cdda/
+- move includes to %%{_includedir}/cdda/
- add utils.h to %%install
- clean up %%install some.
@@ -239,7 +225,7 @@
- reverse devel dependency
* Wed Aug 1 2001 Peter Jones
-- fix %post and %postun to only run ldconfig for devel packages
+- fix %%post and %%postun to only run ldconfig for devel packages
* Wed Jul 18 2001 Crutcher Dunnavant
- devel now depends on package