diff --git a/baselibs.conf b/baselibs.conf index e5584ae..e2351b3 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libcdio10 +libcdio12 obsoletes "libcdio- <= " provides "libcdio- = " libiso9660-7 diff --git a/libcdio-mini.changes b/libcdio-mini.changes index 318a6ee..ea78297 100644 --- a/libcdio-mini.changes +++ b/libcdio-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 21 16:57:18 UTC 2011 - coolo@novell.com + +- licenses package is about to die + ------------------------------------------------------------------- Tue Feb 8 09:42:31 UTC 2011 - dimstar@opensuse.org diff --git a/libcdio-mini.spec b/libcdio-mini.spec index edbfbfb..d0e86ab 100644 --- a/libcdio-mini.spec +++ b/libcdio-mini.spec @@ -24,7 +24,7 @@ Name: libcdio-mini # You want standard build unless you will work-around build dependency on itself. %define STANDARD_BUILD 0 %define _name libcdio -BuildRequires: gcc-c++ licenses pkg-config popt-devel +BuildRequires: gcc-c++ pkg-config popt-devel %if %STANDARD_BUILD BuildRequires: libcddb-devel libcdio-devel ncurses-devel vcdimager-devel #!BuildIgnore: libcdio-mini-devel @@ -32,7 +32,7 @@ BuildRequires: libcddb-devel libcdio-devel ncurses-devel vcdimager-devel #BuildRequires: cdparanoia %endif Version: 0.82 -Release: 1 +Release: 2 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: %define libcdio_name 12 %define libcdio_paranoia_name 0 @@ -47,7 +47,6 @@ Summary: Temporary Build Staging Package of CD-ROM Access Library Source: http://ftp.gnu.org/gnu/libcdio/%{_name}-%{version}.tar.bz2 Source1: %{_name}_spec-prepare.sh Source2: baselibs.conf -Requires: licenses # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -264,12 +263,6 @@ make %{?jobs:-j%jobs} %install %makeinstall mv $RPM_BUILD_ROOT%{_mandir}/jp $RPM_BUILD_ROOT%{_mandir}/ja -for FILE in COPYING ; do - MD5SUM=$(md5sum $FILE | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE - fi -done #empty depdendency libs rm -f %{buildroot}%{_libdir}/*.la diff --git a/libcdio.changes b/libcdio.changes index 318a6ee..ea78297 100644 --- a/libcdio.changes +++ b/libcdio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 21 16:57:18 UTC 2011 - coolo@novell.com + +- licenses package is about to die + ------------------------------------------------------------------- Tue Feb 8 09:42:31 UTC 2011 - dimstar@opensuse.org diff --git a/libcdio.spec b/libcdio.spec index dda4d7e..5491298 100644 --- a/libcdio.spec +++ b/libcdio.spec @@ -24,7 +24,7 @@ Name: libcdio # You want standard build unless you will work-around build dependency on itself. %define STANDARD_BUILD 1 %define _name libcdio -BuildRequires: gcc-c++ licenses pkg-config popt-devel +BuildRequires: gcc-c++ pkg-config popt-devel %if %STANDARD_BUILD BuildRequires: libcddb-devel libcdio-devel ncurses-devel vcdimager-devel #!BuildIgnore: libcdio-mini-devel @@ -32,7 +32,7 @@ BuildRequires: libcddb-devel libcdio-devel ncurses-devel vcdimager-devel #BuildRequires: cdparanoia %endif Version: 0.82 -Release: 1 +Release: 2 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: %define libcdio_name 12 %define libcdio_paranoia_name 0 @@ -47,7 +47,6 @@ Summary: CD-ROM Access Library Source: http://ftp.gnu.org/gnu/libcdio/%{_name}-%{version}.tar.bz2 Source1: %{_name}_spec-prepare.sh Source2: baselibs.conf -Requires: licenses # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -264,12 +263,6 @@ make %{?jobs:-j%jobs} %install %makeinstall mv $RPM_BUILD_ROOT%{_mandir}/jp $RPM_BUILD_ROOT%{_mandir}/ja -for FILE in COPYING ; do - MD5SUM=$(md5sum $FILE | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE - fi -done #empty depdendency libs rm -f %{buildroot}%{_libdir}/*.la