diff --git a/.cvsignore b/.cvsignore index d2954d0..23a8667 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cdparanoia-III-10.0.src.tgz +cdparanoia-III-10.1.src.tgz diff --git a/cdparanoia-III-alpha9.8-headers.patch b/cdparanoia-III-alpha9.8-headers.patch deleted file mode 100644 index 6f56ccc..0000000 --- a/cdparanoia-III-alpha9.8-headers.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up cdparanoia-III-alpha9.8/header.c.jx cdparanoia-III-alpha9.8/header.c ---- cdparanoia-III-alpha9.8/header.c.jx 1999-08-15 18:34:58.000000000 -0400 -+++ cdparanoia-III-alpha9.8/header.c 2008-03-20 13:23:33.000000000 -0400 -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - static void PutNum(long num,int f,int endianness,int bytes){ - int i; -diff -up cdparanoia-III-alpha9.8/paranoia/gap.c.jx cdparanoia-III-alpha9.8/paranoia/gap.c ---- cdparanoia-III-alpha9.8/paranoia/gap.c.jx 2000-04-19 18:41:04.000000000 -0400 -+++ cdparanoia-III-alpha9.8/paranoia/gap.c 2008-03-20 13:23:12.000000000 -0400 -@@ -9,6 +9,7 @@ - #include "p_block.h" - #include "cdda_paranoia.h" - #include "gap.h" -+#include - - /**** Gap analysis code ***************************************************/ - diff --git a/cdparanoia.spec b/cdparanoia.spec index 37e5849..88e65af 100644 --- a/cdparanoia.spec +++ b/cdparanoia.spec @@ -1,9 +1,10 @@ %define ver 10 Name: cdparanoia -Version: 10.0 -Release: 3%{?dist} -License: GPLv3 +Version: 10.1 +Release: 1%{?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 Patch0: cdparanoia-III-alpha9.8.nostrip.patch @@ -39,8 +40,7 @@ damaged CDs. Summary: Development tools for libcdda_paranoia (Paranoia III). Group: Development/Libraries Requires: cdparanoia-libs = %{version}-%{release} -# Some of the headers are LGPLv3 -License: GPLv3 and LGPLv3 +License: LGPLv2 %description -n cdparanoia-devel The cdparanoia-devel package contains the static libraries and header @@ -49,7 +49,7 @@ files needed for developing applications to read CD Digital Audio disks. %package -n cdparanoia-libs Summary: Libraries for libcdda_paranoia (Paranoia III). Group: Development/Libraries -License: GPLv3 +License: LGPLv2 %description -n cdparanoia-libs The cdparanoia-libs package contains the dynamic libraries needed for @@ -128,6 +128,9 @@ fi %{_libdir}/*.a %changelog +* Wed Aug 13 2008 Adam Jackson 10.1-1 +- Update to 10.1, just changes the license back. + * Tue Jul 15 2008 Tom "spot" Callaway 10.0-3 - fix license tag - fix headers, setspeed patch to apply with fuzz=0 diff --git a/sources b/sources index 7139742..4ef604c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03a1aba5cf45ce7b83389d442a275acf cdparanoia-III-10.0.src.tgz +abf410217c4ba42f927bfd9d7b86e163 cdparanoia-III-10.1.src.tgz