From ad56ccbf4e8ae1caf7644971158602628a7f7d3f16424c0ba21bb580ac6a56e4 Mon Sep 17 00:00:00 2001 From: Cristian Morales Vega Date: Wed, 11 Jan 2012 23:12:51 +0000 Subject: [PATCH 1/2] - add libtool as buildrequire to avoid implicit dependency OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcddb?expand=0&rev=14 --- libcddb-utils.changes | 5 +++++ libcddb-utils.spec | 51 ++++++++++++++++++++++++++++++++++++++++++- libcddb.spec | 2 +- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/libcddb-utils.changes b/libcddb-utils.changes index 133fe17..3bc2875 100644 --- a/libcddb-utils.changes +++ b/libcddb-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 11 23:10:27 UTC 2012 - reddwarf@opensuse.org + +- add libtool as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Thu Dec 1 16:59:06 UTC 2011 - coolo@suse.com diff --git a/libcddb-utils.spec b/libcddb-utils.spec index a5fd619..0e0d127 100644 --- a/libcddb-utils.spec +++ b/libcddb-utils.spec @@ -1,7 +1,7 @@ # # spec file for package libcddb-utils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -42,6 +42,7 @@ Source: %{_name}-%{version}.tar.bz2 Source1: %{_name}_spec-prepare.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake +BuildRequires: libtool BuildRequires: pkg-config %if %BUILD_UTILS BuildRequires: libcdio-devel @@ -60,6 +61,30 @@ Libcddb is a library that implements the different protocols (CDDBP, HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It tries to be as cross-platform as possible. +Libcddb is a library that implements the different protocols (CDDBP, +HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It +tries to be as cross-platform as possible. + +Libcddb is a library that implements the different protocols (CDDBP, +HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It +tries to be as cross-platform as possible. + +Libcddb is a library that implements the different protocols (CDDBP, +HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It +tries to be as cross-platform as possible. + +Libcddb is a library that implements the different protocols (CDDBP, +HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It +tries to be as cross-platform as possible. + +Libcddb is a library that implements the different protocols (CDDBP, +HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It +tries to be as cross-platform as possible. + +Libcddb is a library that implements the different protocols (CDDBP, +HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It +tries to be as cross-platform as possible. + %if %BUILD_UTILS %if %BUILD_CORE @@ -75,6 +100,30 @@ Libcddb is a library that implements the different protocols (CDDBP, HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It tries to be as cross-platform as possible. +Libcddb is a library that implements the different protocols (CDDBP, +HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It +tries to be as cross-platform as possible. + +Libcddb is a library that implements the different protocols (CDDBP, +HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It +tries to be as cross-platform as possible. + +Libcddb is a library that implements the different protocols (CDDBP, +HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It +tries to be as cross-platform as possible. + +Libcddb is a library that implements the different protocols (CDDBP, +HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It +tries to be as cross-platform as possible. + +Libcddb is a library that implements the different protocols (CDDBP, +HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It +tries to be as cross-platform as possible. + +Libcddb is a library that implements the different protocols (CDDBP, +HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It +tries to be as cross-platform as possible. + %endif %endif %if %BUILD_CORE diff --git a/libcddb.spec b/libcddb.spec index e04ad00..6660c69 100644 --- a/libcddb.spec +++ b/libcddb.spec @@ -1,7 +1,7 @@ # # spec file for package libcddb # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 From 49a85b3c554b97e9630cab6a704cbf5663444fb1cb8e063e9d923f068578d130 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 19 Jan 2012 07:52:06 +0000 Subject: [PATCH 2/2] - fix pre_checkin.sh OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcddb?expand=0&rev=15 --- libcddb-utils.changes | 11 +++++-- libcddb-utils.spec | 67 ++++--------------------------------------- libcddb.changes | 5 ++++ libcddb.spec | 9 +++--- pre_checkin.sh | 2 +- 5 files changed, 25 insertions(+), 69 deletions(-) diff --git a/libcddb-utils.changes b/libcddb-utils.changes index 3bc2875..921357b 100644 --- a/libcddb-utils.changes +++ b/libcddb-utils.changes @@ -1,12 +1,17 @@ ------------------------------------------------------------------- -Wed Jan 11 23:10:27 UTC 2012 - reddwarf@opensuse.org +Thu Jan 19 07:51:46 UTC 2012 - coolo@suse.com -- add libtool as buildrequire to avoid implicit dependency +- fix pre_checkin.sh ------------------------------------------------------------------- Thu Dec 1 16:59:06 UTC 2011 - coolo@suse.com -- add automake as buildrequire to avoid implicit dependency +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Sun Jan 31 21:09:13 CET 2010 - jengelh@medozas.de + +- Package baselibs.conf ------------------------------------------------------------------- Thu Aug 6 15:00:44 CEST 2009 - sbrabec@suse.cz diff --git a/libcddb-utils.spec b/libcddb-utils.spec index 0e0d127..51ed678 100644 --- a/libcddb-utils.spec +++ b/libcddb-utils.spec @@ -16,7 +16,6 @@ # - Name: libcddb-utils # WARNING: Do not edit this auto generated file. #%(sh %{_sourcedir}/libcddb_spec-prepare.sh %{_sourcedir} %{name}) @@ -27,21 +26,22 @@ Name: libcddb-utils Version: 1.3.2 Release: 0 Url: http://libcddb.sourceforge.net/ -Group: Productivity/Multimedia/Other -License: LGPL-2.1+ %if %BUILD_CORE Summary: CDDB Access Library Utilities +License: LGPL-2.1+ +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcddb-64bit %endif %else Summary: CDDB Access Library Utilities +Group: Productivity/Multimedia/Other %endif Source: %{_name}-%{version}.tar.bz2 Source1: %{_name}_spec-prepare.sh +Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: automake BuildRequires: libtool BuildRequires: pkg-config %if %BUILD_UTILS @@ -57,73 +57,18 @@ Libcddb is a library that implements the different protocols (CDDBP, HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It tries to be as cross-platform as possible. -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - %if %BUILD_UTILS %if %BUILD_CORE %package -n libcddb-utils Summary: CDDB Access Library Utilities +Group: Productivity/Multimedia/Other %description -n libcddb-utils Libcddb is a library that implements the different protocols (CDDBP, HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It tries to be as cross-platform as possible. -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - -Libcddb is a library that implements the different protocols (CDDBP, -HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It -tries to be as cross-platform as possible. - %endif %endif %if %BUILD_CORE @@ -146,8 +91,8 @@ HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It tries to be as cross-platform as possible. %package devel -Group: Development/Libraries/C and C++ Summary: CDDB Access Library +Group: Development/Libraries/C and C++ Requires: libcddb2 = %{version} glibc-devel # bug437293 %ifarch ppc64 diff --git a/libcddb.changes b/libcddb.changes index fcef1d0..921357b 100644 --- a/libcddb.changes +++ b/libcddb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 19 07:51:46 UTC 2012 - coolo@suse.com + +- fix pre_checkin.sh + ------------------------------------------------------------------- Thu Dec 1 16:59:06 UTC 2011 - coolo@suse.com diff --git a/libcddb.spec b/libcddb.spec index 6660c69..6167b62 100644 --- a/libcddb.spec +++ b/libcddb.spec @@ -16,7 +16,6 @@ # - Name: libcddb # WARNING: After editing this file please call Re or rpmbuild to update spec file: #%(sh %{_sourcedir}/libcddb_spec-prepare.sh %{_sourcedir} %{name}) @@ -27,16 +26,17 @@ Name: libcddb Version: 1.3.2 Release: 0 Url: http://libcddb.sourceforge.net/ -Group: Productivity/Multimedia/Other -License: LGPL-2.1+ %if %BUILD_CORE Summary: CDDB Access Library Utilities +License: LGPL-2.1+ +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcddb-64bit %endif %else Summary: CDDB Access Library Utilities +Group: Productivity/Multimedia/Other %endif Source: %{_name}-%{version}.tar.bz2 Source1: %{_name}_spec-prepare.sh @@ -62,6 +62,7 @@ tries to be as cross-platform as possible. %package -n libcddb-utils Summary: CDDB Access Library Utilities +Group: Productivity/Multimedia/Other %description -n libcddb-utils Libcddb is a library that implements the different protocols (CDDBP, @@ -90,8 +91,8 @@ HTTP, and SMTP) to access data on a CDDB server (http://freedb.org). It tries to be as cross-platform as possible. %package devel -Group: Development/Libraries/C and C++ Summary: CDDB Access Library +Group: Development/Libraries/C and C++ Requires: libcddb2 = %{version} glibc-devel # bug437293 %ifarch ppc64 diff --git a/pre_checkin.sh b/pre_checkin.sh index 5711dd1..9f18195 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -1,3 +1,3 @@ #!/bin/sh -bash libcddb_spec-prepare.sh "$PWD" libcdio +bash libcddb_spec-prepare.sh "$PWD" libcddb