Hello community, here is the log from the commit of package libcdio-paranoia for openSUSE:Factory checked in at 2013-02-23 08:23:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcdio-paranoia (Old) and /work/SRC/openSUSE:Factory/.libcdio-paranoia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcdio-paranoia", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libcdio-paranoia/libcdio-paranoia.changes 2012-06-14 22:25:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libcdio-paranoia.new/libcdio-paranoia.changes 2013-02-23 08:23:23.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Feb 17 10:22:46 UTC 2013 - reddwarf@opensuse.org + +- Update to version 10.2+0.90 + * First stable version +- Add libcdio-paranoia-10.2+0.90-include_path.patch + +------------------------------------------------------------------- Old: ---- libcdio-paranoia-4c905cc.tar.bz2 libcdio-paranoia-includes.patch New: ---- libcdio-paranoia-10.2+0.90-include_path.patch libcdio-paranoia-10.2+0.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcdio-paranoia.spec ++++++ --- /var/tmp/diff_new_pack.VJFTCZ/_old 2013-02-23 08:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.VJFTCZ/_new 2013-02-23 08:23:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libcdio-paranoia # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,19 @@ # -%define gitver 4c905cc %define sonum 1 Name: libcdio-paranoia -Version: 0.0.%{gitver} +Version: 10.2+0.90 Release: 0 Summary: CDDA reader License: GPL-2.0 Group: Productivity/Multimedia/Other -Url: https://github.com/rocky/libcdio-paranoia.git -Source0: %{name}-%{gitver}.tar.bz2 +Url: http://savannah.gnu.org/projects/libcdio +Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-10.2+0.90.tar.bz2 Source1: baselibs.conf -Patch0: libcdio-paranoia-includes.patch +# PATCH-FIX-UPSTREAM libcdio-paranoia-10.2+0.90-include_path.patch reddwarf@opensuse.org -- Fix the headers installation path. Took from upstream GIT. +Patch0: libcdio-paranoia-10.2+0.90-include_path.patch BuildRequires: libtool BuildRequires: pkgconfig @@ -77,13 +77,9 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%define _configure ./autogen.sh - %prep -%setup -q -n %{name}-%{gitver} +%setup -q %patch0 -cat include/cdio/paranoia/paranoia.h|sed 's|<cdio/cdda.h>|"cdda.h"|'>include/cdio/paranoia/paranoia.h.h && \ -mv include/cdio/paranoia/paranoia.h.h include/cdio/paranoia/paranoia.h %define buildir ${PWD} %build @@ -94,8 +90,10 @@ make install DESTDIR=%{buildroot} find %{buildroot} -name '*.la' -exec rm -f {} ';' mv %{buildroot}%{_mandir}/jp %{buildroot}%{_mandir}/ja -cat %{buildroot}%{_includedir}/cdio/paranoia.h|sed 's|"cdda.h"|<cdio/cdda.h>|'>%{buildroot}%{_includedir}/cdio/paranoia.h.h && \ -mv %{buildroot}%{_includedir}/cdio/paranoia.h.h %{buildroot}%{_includedir}/cdio/paranoia.h +# I have no idea WTF upstream is trying to do. But most software currently +# expects the headers to be in %%{_includedir}/cdio/, not in %%{_includedir}/cdio/paranoia/ +ln -s paranoia/cdda.h %{buildroot}%{_includedir}/cdio/cdda.h +ln -s paranoia/paranoia.h %{buildroot}%{_includedir}/cdio/paranoia.h %post -n libcdio_cdda%{sonum} -p /sbin/ldconfig @@ -107,7 +105,7 @@ %files -n cd-paranoia %defattr (-, root, root) -%doc COPYING-GPL README NEWS NEWS AUTHORS +%doc COPYING README NEWS NEWS AUTHORS %{_bindir}/cd-paranoia %doc %{_mandir}/ja/man1/cd-paranoia.1.gz %doc %{_mandir}/man1/cd-paranoia.1.gz ++++++ libcdio-paranoia-10.2+0.90-include_path.patch ++++++ Index: include/cdio/paranoia/Makefile.am =================================================================== --- include/cdio/paranoia/Makefile.am.orig +++ include/cdio/paranoia/Makefile.am @@ -3,7 +3,7 @@ ######################################################## # -libcdioincludedir=$(includedir)/cdio +libcdioincludedir=$(includedir)/cdio/paranoia dist_libcdioinclude_HEADERS = cdda.h paranoia.h EXTRA_DIST = version.h.in Index: include/cdio/paranoia/Makefile.in =================================================================== --- include/cdio/paranoia/Makefile.in.orig +++ include/cdio/paranoia/Makefile.in @@ -248,7 +248,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libcdioincludedir = $(includedir)/cdio +libcdioincludedir = $(includedir)/cdio/paranoia dist_libcdioinclude_HEADERS = cdda.h paranoia.h EXTRA_DIST = version.h.in BUILT_SOURCES = version.h -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org