From ac57deaf5ded6b45e62f18629f9c893784e9beb937df5fbe9e9ac4740d8d383a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 7 Aug 2009 13:50:09 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcddb?expand=0&rev=9 --- libcddb-1.3.0.tar.bz2 | 3 - libcddb-1.3.2.tar.bz2 | 3 + ...xamples.patch => libcddb-no-examples.patch | 0 libcddb-utils.changes | 108 +++++++++++ libcddb-utils.spec | 180 ++++++++++++++++++ libcddb.changes | 10 + libcddb.spec | 146 +++++++------- libcddb_spec-prepare.sh | 25 +++ pre_checkin.sh | 3 + 9 files changed, 406 insertions(+), 72 deletions(-) delete mode 100644 libcddb-1.3.0.tar.bz2 create mode 100644 libcddb-1.3.2.tar.bz2 rename libcddb-1.3.0-no-examples.patch => libcddb-no-examples.patch (100%) create mode 100644 libcddb-utils.changes create mode 100644 libcddb-utils.spec create mode 100644 libcddb_spec-prepare.sh create mode 100644 pre_checkin.sh diff --git a/libcddb-1.3.0.tar.bz2 b/libcddb-1.3.0.tar.bz2 deleted file mode 100644 index 15af47b..0000000 --- a/libcddb-1.3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e7d3aae339cf5037d972cd5f3ab23a3b643f6b05e4125430da4f22682770bf9 -size 329319 diff --git a/libcddb-1.3.2.tar.bz2 b/libcddb-1.3.2.tar.bz2 new file mode 100644 index 0000000..2c7cba6 --- /dev/null +++ b/libcddb-1.3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b +size 352909 diff --git a/libcddb-1.3.0-no-examples.patch b/libcddb-no-examples.patch similarity index 100% rename from libcddb-1.3.0-no-examples.patch rename to libcddb-no-examples.patch diff --git a/libcddb-utils.changes b/libcddb-utils.changes new file mode 100644 index 0000000..290c2ee --- /dev/null +++ b/libcddb-utils.changes @@ -0,0 +1,108 @@ +------------------------------------------------------------------- +Thu Aug 6 15:00:44 CEST 2009 - sbrabec@suse.cz + +- Updated to version 1.3.2: + * ported to more platforms + * new functions in the API + * minor fixes +- Build in two stages to break build loop without removing + utilities. + +------------------------------------------------------------------- +Wed Dec 10 12:34:56 CET 2008 - olh@suse.de + +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) + +------------------------------------------------------------------- +Thu Dec 4 12:34:56 CET 2008 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + +------------------------------------------------------------------- +Thu Nov 27 14:14:33 CET 2008 - ro@suse.de + +- update baselibs.conf + +------------------------------------------------------------------- +Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de + +- added baselibs.conf file to build xxbit packages + for multilib support + +------------------------------------------------------------------- +Tue Oct 9 08:23:50 CEST 2007 - crrodriguez@suse.de + +- fix build using library packaging policy +- remove static libraries and useless libtool archive +- permanently break build loop by removing the example code that caused it + +------------------------------------------------------------------- +Tue Sep 11 12:46:28 CEST 2007 - sbrabec@suse.cz + +- Break build loop libcddb -> libcdio -> libcddb. + +------------------------------------------------------------------- +Fri Oct 20 15:26:57 CEST 2006 - sbrabec@suse.cz + +- Updated to version 1.3.0: + * Support for the 'album' command of the freedb2.org. + * Functions to set or reset some flags. + +------------------------------------------------------------------- +Fri Oct 6 16:23:58 CEST 2006 - sbrabec@suse.cz + +- Updated to version 1.2.2: + * Correct character set is specified when submitting data. + +------------------------------------------------------------------- +Fri Jun 30 13:18:50 CEST 2006 - sbrabec@suse.cz + +- Fixed cyclic dependencies in a correct way. + +------------------------------------------------------------------- +Thu Jun 22 18:36:21 CEST 2006 - sbrabec@suse.cz + +- Simpler solution of cyclic dependencies. + +------------------------------------------------------------------- +Tue Jan 31 14:20:12 CET 2006 - sbrabec@suse.cz + +- Enabled parallel build. +- Fixed devel splitting. + +------------------------------------------------------------------- +Wed Jan 25 21:42:30 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Wed Oct 26 13:32:11 CEST 2005 - sbrabec@suse.cz + +- Build with libcdio-0.76. + +------------------------------------------------------------------- +Fri Aug 5 11:00:12 CEST 2005 - sbrabec@suse.cz + +- Updated to version 1.2.1. + +------------------------------------------------------------------- +Fri Jul 29 15:57:55 CEST 2005 - sbrabec@suse.cz + +- Updated to version 1.2.0. + +------------------------------------------------------------------- +Mon May 9 13:07:34 CEST 2005 - sbrabec@suse.cz + +- Updated to version 1.0.2. + +------------------------------------------------------------------- +Tue Apr 26 13:23:02 CEST 2005 - sbrabec@suse.cz + +- Updated to version 1.0.1. + +------------------------------------------------------------------- +Tue Nov 09 14:52:28 CET 2004 - sbrabec@suse.cz + +- New SuSE package, version 0.9.6. + diff --git a/libcddb-utils.spec b/libcddb-utils.spec new file mode 100644 index 0000000..ed6ffc0 --- /dev/null +++ b/libcddb-utils.spec @@ -0,0 +1,180 @@ +# +# spec file for package libcddb-utils (Version 1.3.2) +# +# Copyright (c) 2009 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + + +Name: libcddb-utils +# WARNING: Do not edit this auto generated file. +#%(sh %{_sourcedir}/libcddb_spec-prepare.sh %{_sourcedir} %{name}) +# To break libcddb<->libcdio dependency loop, this package is built in two stages. +%define BUILD_CORE 0 +%define BUILD_UTILS 1 +%define _name libcddb +Version: 1.3.2 +Release: 1 +Url: http://libcddb.sourceforge.net/ +Group: Productivity/Multimedia/Other +License: LGPL v2.1 or later +%if %BUILD_CORE +Summary: CDDB Access Library Utilities +# bug437293 +%ifarch ppc64 +Obsoletes: libcddb-64bit +%endif +%else +Summary: CDDB Access Library Utilities +%endif +Source: %{_name}-%{version}.tar.bz2 +Source1: %{_name}_spec-prepare.sh +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkg-config +%if %BUILD_UTILS +BuildRequires: libcdio-devel +%if !%BUILD_CORE +BuildRequires: libcddb-devel +%endif +%endif +Patch: libcddb-no-examples.patch + +%description +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. + +Authors: +-------- + Kris Verbeeck + +%if %BUILD_UTILS +%if %BUILD_CORE + +%package -n libcddb-utils +License: LGPL v2.1 or later +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. + +Authors: +-------- + Kris Verbeeck + +%endif +%endif +%if %BUILD_CORE + +%package -n libcddb2 +License: LGPL v2.1 or later +Summary: CDDB Access Library +Group: System/Libraries +# bug437293 +%ifarch ppc64 +Obsoletes: libcddb-64bit +%endif +# +Provides: %{_name} = %{version} +#opensuse 10.3 +Obsoletes: %{_name} <= 1.3.0 + +%description -n libcddb2 +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. + +Authors: +-------- + Kris Verbeeck + +%package devel +License: LGPL v2.1 or later +Group: Development/Libraries/C and C++ +Summary: CDDB Access Library +Requires: libcddb2 = %{version} glibc-devel +# bug437293 +%ifarch ppc64 +Obsoletes: libcddb-devel-64bit +%endif + +%description devel +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. + +Authors: +-------- + Kris Verbeeck + +%endif + +%prep +%setup -q -n %{_name}-%{version} +%if !%BUILD_UTILS +%patch +%endif +%if !%BUILD_CORE +sed -i 's:\(\.\.\|\$(top_builddir)\)/[^/]*/lib\([^ ]*\)\.la:-l\2:g' */Makefile.am +%endif + +%build +autoreconf -f -i +%configure\ + --disable-rpath\ + --disable-static\ + --with-pic +%if !%BUILD_CORE +cd examples +%endif +make %{?jobs:-j%jobs} + +%install +%if !%BUILD_CORE +cd examples +%endif +make DESTDIR=$RPM_BUILD_ROOT install +%{__rm} -f %{buildroot}%{_libdir}/libcddb.la + +%clean +rm -rf $RPM_BUILD_ROOT +%if %BUILD_UTILS + +%files -n libcddb-utils +%defattr (-, root, root) +%{_bindir}/* +%endif +%if %BUILD_CORE + +%post -n libcddb2 -p /sbin/ldconfig + +%postun -n libcddb2 -p /sbin/ldconfig + +%files -n libcddb2 +%defattr (-, root, root) +%{_libdir}/*.so.2* + +%files devel +%defattr (-, root, root) +%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc +%{_includedir}/cddb +%endif + +%changelog diff --git a/libcddb.changes b/libcddb.changes index 7bccfcf..290c2ee 100644 --- a/libcddb.changes +++ b/libcddb.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 6 15:00:44 CEST 2009 - sbrabec@suse.cz + +- Updated to version 1.3.2: + * ported to more platforms + * new functions in the API + * minor fixes +- Build in two stages to break build loop without removing + utilities. + ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de diff --git a/libcddb.spec b/libcddb.spec index 32892e0..e3f4eb8 100644 --- a/libcddb.spec +++ b/libcddb.spec @@ -1,7 +1,7 @@ # -# spec file for package libcddb (Version 1.3.0) +# spec file for package libcddb (Version 1.3.2) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -19,95 +19,147 @@ Name: libcddb -Version: 1.3.0 -Release: 67 +# WARNING: After editing this file please call Re or rpmbuild to update spec file: +#%(sh %{_sourcedir}/libcddb_spec-prepare.sh %{_sourcedir} %{name}) +# To break libcddb<->libcdio dependency loop, this package is built in two stages. +%define BUILD_CORE 1 +%define BUILD_UTILS 0 +%define _name libcddb +Version: 1.3.2 +Release: 1 Url: http://libcddb.sourceforge.net/ Group: Productivity/Multimedia/Other License: LGPL v2.1 or later -Summary: CDDB Access Library -Source: %{name}-%{version}.tar.bz2 -AutoReqProv: on +%if %BUILD_CORE +Summary: CDDB Access Library Utilities # bug437293 %ifarch ppc64 Obsoletes: libcddb-64bit %endif -# +%else +Summary: CDDB Access Library Utilities +%endif +Source: %{_name}-%{version}.tar.bz2 +Source1: %{_name}_spec-prepare.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: pkgconfig -Patch0: libcddb-1.3.0-no-examples.patch +BuildRequires: pkg-config +%if %BUILD_UTILS +BuildRequires: libcdio-devel +%if !%BUILD_CORE +BuildRequires: libcddb-devel +%endif +%endif +Patch: libcddb-no-examples.patch %description 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. +Authors: +-------- + Kris Verbeeck +%if %BUILD_UTILS +%if %BUILD_CORE + +%package -n libcddb-utils +License: LGPL v2.1 or later +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. Authors: -------- Kris Verbeeck +%endif +%endif +%if %BUILD_CORE + %package -n libcddb2 License: LGPL v2.1 or later Summary: CDDB Access Library -Group: Productivity/Multimedia/Other +Group: System/Libraries # bug437293 %ifarch ppc64 Obsoletes: libcddb-64bit %endif # -Provides: %{name} = %{version} +Provides: %{_name} = %{version} #opensuse 10.3 -Obsoletes: %{name} <= 1.3.0 +Obsoletes: %{_name} <= 1.3.0 %description -n libcddb2 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. - - Authors: -------- Kris Verbeeck %package devel License: LGPL v2.1 or later -Group: Productivity/Multimedia/Other +Group: Development/Libraries/C and C++ Summary: CDDB Access Library Requires: libcddb2 = %{version} glibc-devel # bug437293 %ifarch ppc64 Obsoletes: libcddb-devel-64bit %endif -# %description devel 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. - - Authors: -------- Kris Verbeeck +%endif + %prep -%setup -%patch0 +%setup -q -n %{_name}-%{version} +%if !%BUILD_UTILS +%patch +%endif +%if !%BUILD_CORE +sed -i 's:\(\.\.\|\$(top_builddir)\)/[^/]*/lib\([^ ]*\)\.la:-l\2:g' */Makefile.am +%endif %build -autoreconf -fiv -%configure --disable-rpath --disable-static --with-pic +autoreconf -f -i +%configure\ + --disable-rpath\ + --disable-static\ + --with-pic +%if !%BUILD_CORE +cd examples +%endif make %{?jobs:-j%jobs} %install +%if !%BUILD_CORE +cd examples +%endif make DESTDIR=$RPM_BUILD_ROOT install %{__rm} -f %{buildroot}%{_libdir}/libcddb.la %clean rm -rf $RPM_BUILD_ROOT +%if %BUILD_UTILS + +%files -n libcddb-utils +%defattr (-, root, root) +%{_bindir}/* +%endif +%if %BUILD_CORE %post -n libcddb2 -p /sbin/ldconfig @@ -122,51 +174,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%dir %{_includedir}/cddb -%{_includedir}/cddb/*.h +%{_includedir}/cddb +%endif %changelog -* Wed Dec 10 2008 olh@suse.de -- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade - (bnc#437293) -* Thu Dec 04 2008 olh@suse.de -- obsolete old -XXbit packages (bnc#437293) -* Thu Nov 27 2008 ro@suse.de -- update baselibs.conf -* Thu Apr 10 2008 ro@suse.de -- added baselibs.conf file to build xxbit packages - for multilib support -* Tue Oct 09 2007 crrodriguez@suse.de -- fix build using library packaging policy -- remove static libraries and useless libtool archive -- permanently break build loop by removing the example code that caused it -* Tue Sep 11 2007 sbrabec@suse.cz -- Break build loop libcddb -> libcdio -> libcddb. -* Fri Oct 20 2006 sbrabec@suse.cz -- Updated to version 1.3.0: - * Support for the 'album' command of the freedb2.org. - * Functions to set or reset some flags. -* Fri Oct 06 2006 sbrabec@suse.cz -- Updated to version 1.2.2: - * Correct character set is specified when submitting data. -* Fri Jun 30 2006 sbrabec@suse.cz -- Fixed cyclic dependencies in a correct way. -* Thu Jun 22 2006 sbrabec@suse.cz -- Simpler solution of cyclic dependencies. -* Tue Jan 31 2006 sbrabec@suse.cz -- Enabled parallel build. -- Fixed devel splitting. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Oct 26 2005 sbrabec@suse.cz -- Build with libcdio-0.76. -* Fri Aug 05 2005 sbrabec@suse.cz -- Updated to version 1.2.1. -* Fri Jul 29 2005 sbrabec@suse.cz -- Updated to version 1.2.0. -* Mon May 09 2005 sbrabec@suse.cz -- Updated to version 1.0.2. -* Tue Apr 26 2005 sbrabec@suse.cz -- Updated to version 1.0.1. -* Tue Nov 09 2004 sbrabec@suse.cz -- New SuSE package, version 0.9.6. diff --git a/libcddb_spec-prepare.sh b/libcddb_spec-prepare.sh new file mode 100644 index 0000000..e0937a3 --- /dev/null +++ b/libcddb_spec-prepare.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# Autobuild doesn't support package names with macros. This script will update versions in package names. + +ORIG_SPEC=${2%-utils} +# Never update -utils fíle when it is already opened. It will break advanced build scripts: +if test "$2" != "$ORIG_SPEC" ; then + exit +fi + +if ! test -f $1/$ORIG_SPEC.spec ; then + exit +fi + +# Edit file to fit -utils build needs: +sed ' + s/BUILD_UTILS\ 0/BUILD_UTILS 1/; + s/BUILD_CORE\ 1/BUILD_CORE 0/; + s/^.ame:.*/&-utils/; + # No more needed. + #s/^..hangelog.*/& utils/; + s/^\(# WARNING:\).*After editing.*/\1 Do not edit this auto generated file./ +' <$1/$ORIG_SPEC.spec >$1/$ORIG_SPEC-utils.spec + +cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-utils.changes diff --git a/pre_checkin.sh b/pre_checkin.sh new file mode 100644 index 0000000..5711dd1 --- /dev/null +++ b/pre_checkin.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +bash libcddb_spec-prepare.sh "$PWD" libcdio