--- cdparanoia.spec.orig	2009-12-08 18:21:14.975194553 +0100
+++ cdparanoia.spec	2009-12-08 18:43:53.883194975 +0100
@@ -6,13 +6,14 @@
 License: GPLv2 and LGPLv2
 Group: Applications/Multimedia
 URL: http://www.xiph.org/paranoia/index.html
-Source: http://downloads.xiph.org/releases/%{name}/%{name}-III-%{version}.src.tgz
+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
 # #466659
 Patch1: cdparanoia-10.2-endian.patch
+Patch2: cdparanoia-10.2-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: cdparanoia-libs = %{version}-%{release}
 Obsoletes: cdparanoia-III <= alpha9.8
@@ -27,72 +28,55 @@
 atomic reads.  Cdparanoia is also good at reading and repairing data from
 damaged CDs.
 
-%package devel
-Summary: Development tools for libcdda_paranoia (Paranoia III)
-Group: Development/Libraries
-Requires: cdparanoia-libs = %{version}-%{release}
-Provides: cdparanoia-static = %{version}-%{release}
-License: LGPLv2
-
-%description devel
-The cdparanoia-devel package contains the static libraries and header
-files needed for developing applications to read CD Digital Audio disks.
-
 %package libs
 Summary: Libraries for libcdda_paranoia (Paranoia III)
-Group: Development/Libraries
+Group: Applications/Multimedia
 License: LGPLv2
 
 %description libs
 The cdparanoia-libs package contains the dynamic libraries needed for
 applications which read CD Digital Audio disks.
 
+%package devel
+Summary: Development files for libcdda_paranoia (Paranoia III)
+Group: Development/Libraries
+Requires: cdparanoia-libs = %{version}-%{release}
+License: LGPLv2
+
+%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}
+%setup -q -n cdparanoia-III-%{version}
 %patch0 -p3 -b .#463009
 %patch1 -p1 -b .endian
+%patch2 -p1 -b .install
 
 %build
-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
+# Lastly, 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 -p /sbin/ldconfig
-
-%postun -n cdparanoia-libs -p /sbin/ldconfig
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc COPYING* README
-%{_bindir}/*
-%{_mandir}/man1/*
+%{_bindir}/cdparanoia
+%{_mandir}/man1/cdparanoia.1*
 
 %files libs
 %defattr(-,root,root)
@@ -100,11 +84,15 @@
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/cdda
-%{_libdir}/*.a
+%{_includedir}/cdda/
 %{_libdir}/*.so
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 10.2-7
+- Include install patch, to avoid all of the ugly manual installation.
+- Cosmetic fixes (libs group, scriplets, don't mix %%name with hardcode...).
+- Remove the static library, everyone should be using the shared library.
+
 * Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 10.2-6
 - Fix all of the problems detected during the review which aren't acceptable
   according to the current policies and guidelines (part of #225638).