diff --git a/cdparanoia.spec b/cdparanoia.spec
index 2506c5b..e4e7f39 100644
--- a/cdparanoia.spec
+++ b/cdparanoia.spec
@@ -1,7 +1,7 @@
-Summary: A Compact Disc Digital Audio (CDDA) extraction tool (or ripper).
+Summary: Compact Disc Digital Audio (CDDA) extraction tool (or ripper)
Name: cdparanoia
Version: 10.2
-Release: 5%{?dist}
+Release: 6%{?dist}
# the app is GPLv2, everything else is LGPLv2
License: GPLv2 and LGPLv2
Group: Applications/Multimedia
@@ -15,7 +15,7 @@ Patch0: cdparanoia-10.2-#463009.patch
Patch1: cdparanoia-10.2-endian.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: cdparanoia-libs = %{version}-%{release}
-Obsoletes: cdparanoia-III
+Obsoletes: cdparanoia-III <= alpha9.8
%description
Cdparanoia (Paranoia III) reads digital audio directly from a CD, then
@@ -28,9 +28,10 @@ atomic reads. Cdparanoia is also good at reading and repairing data from
damaged CDs.
%package devel
-Summary: Development tools for libcdda_paranoia (Paranoia III).
+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
@@ -38,7 +39,7 @@ 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).
+Summary: Libraries for libcdda_paranoia (Paranoia III)
Group: Development/Libraries
License: LGPLv2
@@ -52,7 +53,6 @@ applications which read CD Digital Audio disks.
%patch1 -p1 -b .endian
%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"
@@ -81,33 +81,43 @@ 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
+%post -n cdparanoia-libs -p /sbin/ldconfig
-%postun -n cdparanoia-libs
-if [ "$1" -ge "1" ]; then
- /sbin/ldconfig
-fi
+%postun -n cdparanoia-libs -p /sbin/ldconfig
%clean
-[ "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" ] && rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%doc README
+%doc COPYING* README
%{_bindir}/*
%{_mandir}/man1/*
%files libs
%defattr(-,root,root)
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
%files devel
%defattr(-,root,root)
%{_includedir}/cdda
%{_libdir}/*.a
+%{_libdir}/*.so
%changelog
+* Tue Dec 8 2009 Matthias Saou 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).
+- Don't prefix summaries with "A" nor suffix them with a dot.
+- Move .so symlink to the devel sub-package (#203620).
+- Add highest known version to the cdparanoia-III obsoletes.
+- Remove incorrect buildroot removal from %%build.
+- Use acceptable %%clean section.
+- Provide cdparanoia-static in the devel sub-package since the *.a is there.
+- Use single-command scriplet syntax for /sbin/ldconfig calls.
+- Escape all macros in changelog.
+- Include license file since it is present with the sources.
+
* Fri Jul 24 2009 Fedora Release Engineering - 10.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -199,7 +209,7 @@ fi
- 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
@@ -240,7 +250,7 @@ fi
- 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.
@@ -253,7 +263,7 @@ fi
- 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