Hello community, here is the log from the commit of package cdparanoia for openSUSE:Factory checked in at 2011-12-21 09:59:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cdparanoia (Old) and /work/SRC/openSUSE:Factory/.cdparanoia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cdparanoia", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cdparanoia/cdparanoia.changes 2011-09-23 01:53:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cdparanoia.new/cdparanoia.changes 2011-12-21 09:59:28.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Dec 20 20:07:26 UTC 2011 - [email protected] + +- remove call to suse_update_config (very old work around) + +------------------------------------------------------------------- +Wed Oct 5 14:52:13 UTC 2011 - [email protected] + +- cross-build fixes: use %configure macro, set bindir and include + dir explicitly when installing + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdparanoia.spec ++++++ --- /var/tmp/diff_new_pack.3mnkS1/_old 2011-12-21 09:59:29.000000000 +0100 +++ /var/tmp/diff_new_pack.3mnkS1/_new 2011-12-21 09:59:29.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package cdparanoia (Version 3.10.2) +# spec file for package cdparanoia # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,23 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: cdparanoia Provides: cdparano Obsoletes: cdparano -License: GPLv2+ -Group: Productivity/Multimedia/CD/Grabbers -AutoReqProv: on # bug437293 %ifarch ppc64 Obsoletes: cdparanoia-64bit %endif # Version: 3.10.2 -Release: 3 +Release: 0 Summary: A Program for Extracting, Verifying, and Fixing Audio Tracks from CDs +License: GPL-2.0+ +Group: Productivity/Multimedia/CD/Grabbers Url: http://www.xiph.org/paranoia/index.html %define filever III-10.2 Source: cdparanoia-%{filever}.src.tar.bz2 @@ -44,27 +41,22 @@ Patch12: cdparanoia-III-06-endian.dpatch Patch13: cdparanoia-large-pic.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: automake %package -n libcdda_interface0 -License: GPLv2+ Summary: Extracting, Verifying, and Fixing Audio Tracks from CDs - runtime library Group: System/Libraries Suggests: ImageMagick-extra = %{version} -AutoReqProv: on %package -n libcdda_paranoia0 -License: GPLv2+ Summary: Extracting, Verifying, and Fixing Audio Tracks from CDs - runtime library Group: System/Libraries -AutoReqProv: on %package devel -License: GPLv2+ -Requires: libcdda_interface0 = %{version} -Requires: libcdda_paranoia0 = %{version} Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ -AutoReqProv: on +Requires: libcdda_interface0 = %{version} +Requires: libcdda_paranoia0 = %{version} %description This CDDA reader distribution ('cdparanoia') reads audio from the @@ -73,12 +65,6 @@ This is a beta release. See http://www.xiph.org/paranoia/. - - -Authors: --------- - Monty <[email protected]> - %description devel This CDDA reader distribution ('cdparanoia') reads audio from the CD-ROM directly as data and writes the data to a file or pipe as .wav, @@ -86,12 +72,6 @@ This is a beta release. See http://www.xiph.org/paranoia/. - - -Authors: --------- - Monty <[email protected]> - %description -n libcdda_interface0 This CDDA reader distribution ('cdparanoia') reads audio from the CD-ROM directly as data and writes the data to a file or pipe as .wav, @@ -99,12 +79,6 @@ This is a beta release. See http://www.xiph.org/paranoia/. - - -Authors: --------- - Monty <[email protected]> - %description -n libcdda_paranoia0 This CDDA reader distribution ('cdparanoia') reads audio from the CD-ROM directly as data and writes the data to a file or pipe as .wav, @@ -112,12 +86,6 @@ This is a beta release. See http://www.xiph.org/paranoia/. - - -Authors: --------- - Monty <[email protected]> - %prep %setup -q -n cdparanoia-%{filever} %patch1 @@ -126,36 +94,29 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 -%patch -P 13 -p1 +%patch13 -p1 %build -cp configure.guess config.guess -cp configure.sub config.sub -%{?suse_update_config:%{suse_update_config -f}} -cp config.guess configure.guess -cp config.sub configure.sub -autoconf -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure \ - --prefix=/usr \ - --mandir=%{_mandir} \ - --libdir=%_libdir +autoreconf +%configure make %install -mkdir -p $RPM_BUILD_ROOT/{%{_mandir}/man1,usr/{bin,include,lib}} -make prefix=$RPM_BUILD_ROOT/usr \ - LIBDIR=$RPM_BUILD_ROOT/%_libdir \ - MANDIR=$RPM_BUILD_ROOT/%{_mandir} install -JAPN_MANDIR=$RPM_BUILD_ROOT/%{_mandir}/ja/man1 +make prefix=%{buildroot}%{_prefix} \ + LIBDIR=%{buildroot}%{_libdir} \ + MANDIR=%{buildroot}%{_mandir} \ + BINDIR=%{buildroot}%{_bindir} \ + INCLUDEDIR=%{buildroot}%{_includedir} \ + install +JAPN_MANDIR=%{buildroot}%{_mandir}/ja/man1 mkdir -p $JAPN_MANDIR install -m644 cdparanoia.1.jp $JAPN_MANDIR/cdparanoia.1 # do not package static libraries. -rm $RPM_BUILD_ROOT/%_libdir/libcdda_interface.a -rm $RPM_BUILD_ROOT/%_libdir/libcdda_paranoia.a +rm %{buildroot}%{_libdir}/libcdda_interface.a +rm %{buildroot}%{_libdir}/libcdda_paranoia.a %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -n libcdda_interface0 -p /sbin/ldconfig @@ -170,21 +131,21 @@ %doc README COPYING* %{_mandir}/man1/* %{_mandir}/ja/man1/* -/usr/bin/* +%{_bindir}/* %files -n libcdda_interface0 %defattr(-,root,root) -%_libdir/libcdda_interface.so.0 -%_libdir/libcdda_interface.so.0.* +%{_libdir}/libcdda_interface.so.0 +%{_libdir}/libcdda_interface.so.0.* %files -n libcdda_paranoia0 %defattr(-,root,root) -%_libdir/libcdda_paranoia.so.0 -%_libdir/libcdda_paranoia.so.0.* +%{_libdir}/libcdda_paranoia.so.0 +%{_libdir}/libcdda_paranoia.so.0.* %files devel %defattr(-,root,root) -/usr/include/* -%_libdir/lib*.so +%{_includedir}/* +%{_libdir}/lib*.so %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
