From 9b2f493351bce891ad9f4b532d70a51f1bc2b5f332429b5f378f5fad2034678e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 29 Jan 2010 14:55:11 +0000 Subject: [PATCH] Accepting request 30813 from multimedia:libs Copy from multimedia:libs/cdparanoia based on submit request 30813 from user coolo OBS-URL: https://build.opensuse.org/request/show/30813 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cdparanoia?expand=0&rev=10 --- baselibs.conf | 2 +- cdparanoia-large-pic.diff | 49 +++++++++++++++++++++++++++++++++++++++ cdparanoia.changes | 6 +++++ cdparanoia.spec | 15 +++++++----- 4 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 cdparanoia-large-pic.diff diff --git a/baselibs.conf b/baselibs.conf index 9ad5d75..c831398 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ libcdda_interface0 -libcdda_paranoia0 \ No newline at end of file +libcdda_paranoia0 diff --git a/cdparanoia-large-pic.diff b/cdparanoia-large-pic.diff new file mode 100644 index 0000000..36f1d6b --- /dev/null +++ b/cdparanoia-large-pic.diff @@ -0,0 +1,49 @@ +--- + interface/Makefile.in | 4 ++-- + paranoia/Makefile.in | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +Index: cdparanoia-III-10.2/interface/Makefile.in +=================================================================== +--- cdparanoia-III-10.2.orig/interface/Makefile.in ++++ cdparanoia-III-10.2/interface/Makefile.in +@@ -33,7 +33,7 @@ lib: + + slib: + $(MAKE) lessmessy +- $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic" ++ $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fPIC" + [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0 + + test: +@@ -46,7 +46,7 @@ libcdda_interface.a: $(OFILES) + $(RANLIB) libcdda_interface.a + + libcdda_interface.so: $(OFILES) +- $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) ++ $(CC) -fPIC -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) + [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0 + [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so + +Index: cdparanoia-III-10.2/paranoia/Makefile.in +=================================================================== +--- cdparanoia-III-10.2.orig/paranoia/Makefile.in ++++ cdparanoia-III-10.2/paranoia/Makefile.in +@@ -34,7 +34,7 @@ lib: + + slib: + $(MAKE) lessmessy +- $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic" ++ $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fPIC" + + #test: $(TFILES) + # +@@ -44,7 +44,7 @@ libcdda_paranoia.a: $(OFILES) + $(RANLIB) libcdda_paranoia.a + + libcdda_paranoia.so: $(OFILES) +- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface ++ $(CC) -fPIC -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface + [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 + [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so + diff --git a/cdparanoia.changes b/cdparanoia.changes index 8e482f5..e35c190 100644 --- a/cdparanoia.changes +++ b/cdparanoia.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 7 20:38:06 CET 2010 - jengelh@medozas.de + +- Add baselibs.conf as a source +- Switch from -fpic to -fPIC, at least SPARC needs this + ------------------------------------------------------------------- Wed Aug 5 14:21:52 CEST 2009 - vuntz@novell.com diff --git a/cdparanoia.spec b/cdparanoia.spec index 12fab96..66b3118 100644 --- a/cdparanoia.spec +++ b/cdparanoia.spec @@ -1,7 +1,7 @@ # # spec file for package cdparanoia (Version 3.10.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -21,7 +21,7 @@ Name: cdparanoia Provides: cdparano Obsoletes: cdparano -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Multimedia/CD/Grabbers AutoReqProv: on # bug437293 @@ -30,34 +30,36 @@ Obsoletes: cdparanoia-64bit %endif # Version: 3.10.2 -Release: 2 +Release: 3 Summary: A Program for Extracting, Verifying, and Fixing Audio Tracks from CDs Url: http://www.xiph.org/paranoia/index.html %define filever III-10.2 Source: cdparanoia-%{filever}.src.tar.bz2 +Source2: baselibs.conf Patch1: cdparanoia-III-ide_majors.patch Patch2: cdparanoia-III-dt_needed.patch Patch3: cdparanoia-III-c++.patch Patch10: cdparanoia-III-01-typos-and-spelling.dpatch Patch11: cdparanoia-III-05-gcc4.3.dpatch Patch12: cdparanoia-III-06-endian.dpatch +Patch13: cdparanoia-large-pic.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n libcdda_interface0 -License: GPL v2 or later +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: GPL v2 or later +License: GPLv2+ Summary: Extracting, Verifying, and Fixing Audio Tracks from CDs - runtime library Group: System/Libraries AutoReqProv: on %package devel -License: GPL v2 or later +License: GPLv2+ Requires: libcdda_interface0 = %{version} Requires: libcdda_paranoia0 = %{version} Summary: Include Files and Libraries Mandatory for Development @@ -124,6 +126,7 @@ Authors: %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch -P 13 -p1 %build cp configure.guess config.guess