diff --git a/.gitignore b/.gitignore index 32d503b..e38d6b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libcdio-paranoia-10.2+0.90.tar.gz +/libcdio-paranoia-10.2+0.90+1.tar.gz diff --git a/libcdio-paranoia.spec b/libcdio-paranoia.spec index 81b8ef3..ea9103e 100644 --- a/libcdio-paranoia.spec +++ b/libcdio-paranoia.spec @@ -1,22 +1,12 @@ Name: libcdio-paranoia -Version: 10.2+0.90 -Release: 8%{?dist} +Version: 10.2+0.90+1 +Release: 1%{?dist} Summary: CD paranoia on top of libcdio Group: System Environment/Libraries License: GPLv2+ and LGPLv2+ URL: http://www.gnu.org/software/libcdio/ Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-%{version}.tar.gz -# Missing in tarball -Source1: https://raw.github.com/rocky/libcdio-paranoia/master/COPYING-GPL -# Missing in tarball -Source2: https://raw.github.com/rocky/libcdio-paranoia/master/COPYING-LGPL -# fixes from git -# wrong fsf address and missing pkgconfig requires -Patch0: most-of-4c30a84f7899ff63c9bbc39563099f98752c83d6.patch -# Patch1 and Patch2 fixes the license headers in the source files -Patch1: most-of-a500a7037729aaeaba9bfda9c007d598e8fa8adc.patch -Patch2: https://github.com/rocky/libcdio-paranoia/commit/5f8c33d04fcf7b4cede360e79cc3806e9139127f.patch -Patch3: libcdio-paranoia-manpage.patch +Patch0: libcdio-paranoia-manpage.patch BuildRequires: pkgconfig BuildRequires: gettext-devel BuildRequires: chrpath @@ -43,9 +33,6 @@ This package contains header files and libraries for %{name}. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 # fix pkgconfig files sed -i -e 's,-I${includedir},-I${includedir}/cdio,g' libcdio_paranoia.pc.in @@ -55,9 +42,6 @@ f=doc/ja/cd-paranoia.1.in iconv -f euc-jp -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f iconv -f ISO88591 -t utf-8 -o THANKS.utf8 THANKS && mv THANKS.utf8 THANKS -cp %{SOURCE1} . -cp %{SOURCE2} . - %build %configure \ --disable-dependency-tracking \ @@ -72,11 +56,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja} -# copy include files to an additional directory -# this will probably be the location for future releases see: -# https://github.com/rocky/libcdio-paranoia/commit/b2807f3c7a4126b6078d96adbd37c3760b9f41ab -mkdir -p $RPM_BUILD_ROOT%{_includedir}/cdio/paranoia -cp -a $RPM_BUILD_ROOT%{_includedir}/cdio/*.h $RPM_BUILD_ROOT%{_includedir}/cdio/paranoia +# copy include files to an additional directory for backward compatibility +# this is where most software still expects those files +cp -a $RPM_BUILD_ROOT%{_includedir}/cdio/paranoia/*.h $RPM_BUILD_ROOT%{_includedir}/cdio/ # remove rpath chrpath --delete $RPM_BUILD_ROOT%{_bindir}/* @@ -104,6 +86,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so.* %changelog +* Tue Aug 20 2013 Adrian Reber - 10.2+0.90+1-1 +- updated to 10.2+0.90+1 +- removed all patches previously taken from git + * Wed Jul 31 2013 Frantisek Kluknavsky - 10.2+0.90-8 - long name in manual page caused 'whatis' to misbehave diff --git a/sources b/sources index 8b4ae72..4fd23db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7175764764c7fa22e1b802b9526c9411 libcdio-paranoia-10.2+0.90.tar.gz +1407c62ba09ca8067e91d5c328d9508e libcdio-paranoia-10.2+0.90+1.tar.gz