SHA256
1
0
forked from pool/libcdio

Accepting request 121480 from home:plater

Split cdio-utils to a linked package to prevent cycles

OBS-URL: https://build.opensuse.org/request/show/121480
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcdio?expand=0&rev=33
This commit is contained in:
Dave Plater 2012-05-18 15:30:54 +00:00 committed by Git OBS Bridge
parent e434d28900
commit 9e530619d4
4 changed files with 447 additions and 55 deletions

319
cdio-utils.changes Normal file
View File

@ -0,0 +1,319 @@
-------------------------------------------------------------------
Fri May 18 14:44:19 UTC 2012 - davejplater@gmail.com
- Created seperate linked package cdio-utils to prevent cycles.
-------------------------------------------------------------------
Sun Apr 15 09:27:39 UTC 2012 - davejplater@gmail.com
- Update to 0.83.git from 14/04/2012 git head.
- libcdio-paranoia separated from libcdio due to license issues
see bnc#756564
-------------------------------------------------------------------
Fri Apr 6 13:36:03 UTC 2012 - davejplater@gmail.com
- Update to libcdio-0.83, removed need for libcdio-mini by adding
linker library paths to sources in the spec file build section.
- Upstream changes:
*Add retrieval SCSI sense reply from the most-recent MMC command.
*Add exclusive read/write access for devices which is used for
experimental writing/burning. Currently only on GNU/Linux and FreeBSD.
*MMC bug fixes
*FreeBSD drive list now shows empty drives.
*Add ability to retrieve SCSI tuple for a name and/or fake one up for
programs that wanto to cd-record compatible.
*Tolerance for OS's without timezone in their struct tm (e.g. Solaris)
added iso9660_set_{d,l}time_with_timezone
*Add mmc_get_disk_erasable
*Update MMC Feature Profile list, DVD Book types
*Reduce range of seek in paranoia_seek to be int32_t
*Remove some potential flaws found by Coverty's static analysis tool
*Add ISRC track info to cd-info output.
*Don't wrap-around volume adjustment for cdda-player.
*Handle double-byte strings in CD-text
*--no-header on cd-info omits copyright and warranty
-------------------------------------------------------------------
Sun Nov 13 09:32:01 UTC 2011 - coolo@suse.com
- add libtool as buildrequire
-------------------------------------------------------------------
Sun Nov 13 09:29:59 UTC 2011 - coolo@suse.com
- one less _service file for factory
-------------------------------------------------------------------
Mon Mar 21 16:57:18 UTC 2011 - coolo@novell.com
- licenses package is about to die
-------------------------------------------------------------------
Tue Feb 8 09:42:31 UTC 2011 - dimstar@opensuse.org
- Rename Shared Object package to libcdio12, conforming the
libraries name.
- Adjust rpmlintrc to only ignore shared lib names of the -mini
packages. This avoids missing shlib renames for the 'main'
package.
-------------------------------------------------------------------
Sun Jan 30 18:55:42 UTC 2011 - sagiben@gmail.com
- Updated to version 0.82
- Upstream changes :
*Remove all uses of CDIO_MIN_DRIVER,
CDIO_MAX_DRIVER, CDIO_MIN_DEVICE_DRIVER or CDIO_MAX_DEVICE_DRIVER.
*FreeBSD get_media_changed fixes
*MingGW/Msys compilation issues
*Add OS/2 driver
*Cross compilations fixes and uclinix is like GNU/Linux
*Numerous other bug fixes
-------------------------------------------------------------------
Mon Apr 26 11:36:24 CEST 2010 - ro@suse.de
- add build-ignore for libcdio-mini-devel
-------------------------------------------------------------------
Sun Jan 31 21:10:55 CET 2010 - jengelh@medozas.de
- Package baselibs.conf
-------------------------------------------------------------------
Thu Aug 6 18:54:05 CEST 2009 - sbrabec@suse.cz
- Updated to version 0.81:
* license of manual now GFDL 1.2 or later
* Nero image handling more complete.
* ISRC query for image files.
* Allow reading pregap of a track via get_track_pregap_lsn().
* Fixes of iso9660 time setting/getting routines, making them
reentrant.
-------------------------------------------------------------------
Wed Jan 7 12:34:56 CET 2009 - olh@suse.de
- obsolete old -XXbit packages (bnc#437293)
-------------------------------------------------------------------
Tue Sep 9 12:30:19 CEST 2008 - sbrabec@suse.cz
- Update Summary of *mini* packages (bnc#418304).
-------------------------------------------------------------------
Wed Jun 18 15:33:14 CEST 2008 - schwab@suse.de
- Use autoreconf -i.
-------------------------------------------------------------------
Fri May 23 22:43:19 CEST 2008 - hpj@suse.de
- Add libcdio-bnc394195-install-all-pc-files.patch (bnc#394195).
-------------------------------------------------------------------
Wed May 21 19:16:24 CEST 2008 - cthiel@suse.de
- fix baselibs.conf
-------------------------------------------------------------------
Fri Apr 25 16:03:38 CEST 2008 - sbrabec@suse.cz
- Updated to version 0.80:
* Add option to log summary output in cd-paranoia
* More string bounds checking to eliminate known string overflow
conditions, Savannah#21910
* add --mode="any" on cd-read which uses a mmc_read_sectors with
read-type CDIO_MMC_READ_TYPE_ANY.
* add --log-summary option to cd-paranoia. Unused option
--output-info (-i) removed
* some small packaging bugs fixed
* probably the last GPL v2 release; GPL v3 on the horizon.
-------------------------------------------------------------------
Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
- added baselibs.conf file to build xxbit packages
for multilib support
-------------------------------------------------------------------
Wed Feb 27 18:59:31 CET 2008 - sbrabec@suse.cz
- Fixed more possible memory allocation buffer overflows
(bnc#351127).
-------------------------------------------------------------------
Wed Jan 9 17:52:24 CET 2008 - sbrabec@suse.cz
- Fixed buffer overflows for long Joliet names (#351127).
-------------------------------------------------------------------
Wed Dec 5 14:52:36 CET 2007 - ro@suse.de
- provide main package name in library package for debuginfo
for mini package
-------------------------------------------------------------------
Fri Nov 16 14:00:19 CET 2007 - sbrabec@suse.cz
- Removed unwanted NoSource preventing mirroring to Factory.
-------------------------------------------------------------------
Fri Nov 9 06:42:52 CET 2007 - crrodriguez@suse.de
- fix build with gcc43
- update to version 0.79
* libcdio cdparanoia doing the wrong thing on a single-sector read. Savannah patch #5999.
* Leds to an open file descriptor making it impossible of e.g.
unmounting a CDROM containing the file. Savannah bug #21147.
* bug #19221 (possibly): memory Leak opening an inaccessible device
* more than 30 other bugfixes
- remove libtool archives with empty dependency_libs
- exclude static libraries
-------------------------------------------------------------------
Tue Aug 7 17:01:59 CEST 2007 - sbrabec@suse.cz
- Fixed mini file list.
-------------------------------------------------------------------
Sun Aug 5 08:35:10 CEST 2007 - coolo@suse.de
- adding versioned provides for upgrade
-------------------------------------------------------------------
Fri Jul 20 17:30:18 CEST 2007 - sbrabec@suse.cz
- Updated to version 0.78.2:
* Fixed bug in libcdio.so version numbering.
* Added mmc-tool and mmc-close-tray.
* libudf: can now read (extract) file data, at least for ICB
strategy type 4.
* libcdio is starting to get updated for UTF-8 support.
* Fixes to eject.
* Other fixes.
- Split package according to shared library packaging policy.
- Added script to convert libcdio.spec to libcdio-mini.spec and
update library package names.
-------------------------------------------------------------------
Mon Mar 12 16:49:56 CET 2007 - sbrabec@suse.cz
- Fixed NoSrc and Provides of temporary package.
-------------------------------------------------------------------
Fri Oct 6 16:35:33 CEST 2006 - sbrabec@suse.cz
- Updated to version 0.77:
* Added object-oriented C++ wrapper.
* Replaced libpopt with getopt in binaries.
* Documented cd-paranoia.
* Added cdio_eject_media_drive.
* Added more generic read_sectors().
* Some provision for handling Rock-Ridge device numbers.
* Block read routines return success if asked to read 0 blocks.
* Start UDF handling
* Improved developer documentation.
* Code improvements.
* Bug fixes.
* Small cdda-player improvements.
* NRG checking parses file.
* Revised and improved example programs.
* Replaced all uses of strcat and strcpy with strncat and
strncpy.
-------------------------------------------------------------------
Mon Jul 3 16:19:33 CEST 2006 - max@suse.de
- Added gcc-c++ to neededforbuild.
-------------------------------------------------------------------
Fri Jun 30 13:19:32 CEST 2006 - sbrabec@suse.cz
- Fixed cyclic dependencies in a correct way.
-------------------------------------------------------------------
Tue Jun 27 18:43:46 CEST 2006 - sbrabec@suse.cz
- Use NoSource in libcdio-mini.
-------------------------------------------------------------------
Thu Jun 22 18:35:39 CEST 2006 - sbrabec@suse.cz
- Simpler solution of cyclic dependencies.
-------------------------------------------------------------------
Tue Jan 31 14:20:00 CET 2006 - sbrabec@suse.cz
- Do not link with invalid rpath.
- Enabled parallel build.
- Fixed devel splitting.
-------------------------------------------------------------------
Thu Jan 26 15:51:26 CET 2006 - sbrabec@suse.cz
- Added %install_info_prereq.
-------------------------------------------------------------------
Wed Jan 25 21:42:30 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Tue Nov 8 19:19:23 CET 2005 - sbrabec@suse.cz
- Fixed libiso9660.la circular dependency prevention trick.
-------------------------------------------------------------------
Wed Oct 26 13:32:25 CEST 2005 - sbrabec@suse.cz
- Updated to version 0.76.
- Build as user.
-------------------------------------------------------------------
Fri Aug 5 11:00:41 CEST 2005 - sbrabec@suse.cz
- Build with libcddb-1.2.1.
-------------------------------------------------------------------
Fri Jul 29 15:58:20 CEST 2005 - sbrabec@suse.cz
- Updated to version 0.75.
-------------------------------------------------------------------
Mon May 9 13:08:25 CEST 2005 - sbrabec@suse.cz
- Build with libcddb-1.0.2.
-------------------------------------------------------------------
Tue Apr 26 13:23:29 CEST 2005 - sbrabec@suse.cz
- Updated to version 0.73.
-------------------------------------------------------------------
Fri Apr 1 08:39:02 CEST 2005 - meissner@suse.de
- fixed gcc4 compile problem.
-------------------------------------------------------------------
Thu Feb 3 14:30:09 CET 2005 - sbrabec@suse.cz
- Updated to version 0.72.
-------------------------------------------------------------------
Mon Jan 31 15:46:35 CET 2005 - sbrabec@suse.cz
- Updated to version 0.72rc2.
-------------------------------------------------------------------
Mon Jan 24 17:28:43 CET 2005 - sbrabec@suse.cz
- Updated to version 0.71.
-------------------------------------------------------------------
Tue Nov 09 14:52:28 CET 2004 - sbrabec@suse.cz
- New SuSE package, version 0.70.
- Work-around of circular dependency on libcddb and vcdimager.

105
cdio-utils.spec Normal file
View File

@ -0,0 +1,105 @@
#
# spec file for package cdio-utils
#
# 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
# 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/
#
%define cdioutils 1
Name: cdio-utils
Version: 0.83.git
Release: 0
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: help2man
BuildRequires: libcdio-devel
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: pkg-config
BuildRequires: popt-devel
BuildRequires: pkgconfig(libcddb)
BuildRequires: pkgconfig(libvcdinfo)
Url: http://savannah.gnu.org/projects/libcdio
Summary: CD-ROM Access Library
License: GPL-3.0+
Group: Productivity/Multimedia/Other
# http://ftp.gnu.org/gnu/libcdio/
Source0: libcdio-%{version}.tar.bz2
Source1: baselibs.conf
# bug437293
%ifarch ppc64
Obsoletes: libcdio-64bit
%endif
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: libcdio-utils = %{version}
Obsoletes: libcdio-utils < %{version}
%description
This library encapsulates CD-ROM reading and control. Applications
wanting to be oblivious to the OS and device-dependent properties of a
CD-ROM can use this library.
%define _configure ./autogen.sh
%prep
%setup -q -n libcdio-%{version}
%define buildir ${PWD}
%build
export VCDINFO_CFLAGS=-I%{_includedir}/libvcd
export VCDINFO_LIBS="-L%{_libdir} -lvcdinfo -L%{buildir}/lib/iso9660/.libs/ -liso9660 -L%{buildir}/lib/driver/.libs/ -lcdio"
#autoreconf -f -i
# FIXME: Required .pc files are not installed without --enable-cpp-progs.
VCDINFO_CFLAGS=-I%{_includedir}/libvcd VCDINFO_LIBS="-L%{_libdir} -lvcdinfo -L%{buildir}/lib/iso9660/.libs -liso9660 \
-L%{buildir}/lib/driver/.libs -lcdio" \
%configure \
--disable-rpath \
--enable-static=n \
--enable-shared=yes \
--with-pic \
--disable-cxx \
--enable-vcd-info=yes
VCDINFO_CFLAGS=-I%{_includedir}/libvcd VCDINFO_LIBS="-L%{_libdir} -lvcdinfo \
-L%{buildir}/lib/iso9660/.libs/ -liso9660 -L%{buildir}/lib/driver/.libs/ -lcdio" \
VERBOSE=1 make -e %{?jobs:-j%jobs}
#-lcdioutils
%install
%makeinstall
%if 1 == 0
mv $RPM_BUILD_ROOT%{_mandir}/jp $RPM_BUILD_ROOT%{_mandir}/ja
%endif
#empty depdendency libs
rm -rf %{buildroot}%{_libdir} %{buildroot}%{_includedir} %{buildroot}%{_infodir}
%fdupes -s %{buildroot}%{_mandir}
%files -n cdio-utils
%defattr (-, root, root)
%doc AUTHORS COPYING NEWS README README.libcdio THANKS TODO
#ChangeLog
%{_bindir}/cd-*
%{_bindir}/cdda-*
%{_bindir}/iso-*
%{_bindir}/mmc-*
%doc %{_mandir}/man?/*.*
%if 1 == 0
%lang(ja) %doc %{_mandir}/ja/man?/*.*
%endif
%changelog

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri May 18 15:21:03 UTC 2012 - davejplater@gmail.com
- Split cdio-utils to a linked package to prevent cycles due to
utils dependancy on libvcdinfo and vcdimagers dependency on
libcdio.
-------------------------------------------------------------------
Sun Apr 15 09:27:39 UTC 2012 - davejplater@gmail.com

View File

@ -16,7 +16,7 @@
#
%define vcdinfo 1
%define cdioutils 0
%define build_paranoia 0
Name: libcdio
@ -26,12 +26,10 @@ BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: help2man
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: pkg-config
BuildRequires: popt-devel
BuildRequires: pkgconfig(libcddb)
#BuildRequires: libcdio-devel
BuildRequires: ncurses-devel
BuildRequires: pkgconfig(libvcdinfo)
Url: http://savannah.gnu.org/projects/libcdio
Summary: CD-ROM Access Library
License: GPL-3.0+
@ -152,20 +150,6 @@ This library encapsulates CD-ROM reading and control. Applications
wanting to be oblivious to the OS and device-dependent properties of a
CD-ROM can use this library.
%package -n cdio-utils
Summary: CD-ROM Access Library
Group: Productivity/Multimedia/Other
PreReq: %install_info_prereq
Provides: %{name}-utils = %{version}
Obsoletes: %{name}-utils < %{version}
%description -n cdio-utils
This library encapsulates CD-ROM reading and control. Applications
wanting to be oblivious to the OS and device-dependent properties of a
CD-ROM can use this library.
%package devel
Summary: CD-ROM access library
Group: Development/Languages/C and C++
@ -189,7 +173,6 @@ This library encapsulates CD-ROM reading and control. Applications
wanting to be oblivious to the OS and device-dependent properties of a
CD-ROM can use this library.
%define _configure ./autogen.sh
%prep
@ -197,26 +180,20 @@ CD-ROM can use this library.
%define buildir ${PWD}
%build
%if 1 == 1
export VCDINFO_CFLAGS=-I%{_includedir}/libvcd
export VCDINFO_LIBS="-L%{_libdir} -lvcdinfo -L%{buildir}/lib/iso9660/.libs/ -liso9660 -L%{buildir}/lib/driver/.libs/ -lcdio"
%endif
#autoreconf -f -i
# FIXME: Required .pc files are not installed without --enable-cpp-progs.
VCDINFO_CFLAGS=-I%{_includedir}/libvcd VCDINFO_LIBS="-L%{_libdir} -lvcdinfo -L%{buildir}/lib/iso9660/.libs -liso9660 \
-L%{buildir}/lib/driver/.libs -lcdio" %configure \
%configure \
--disable-rpath \
--enable-static=n \
--enable-shared=yes \
--enable-cpp-progs \
--with-pic \
%if %{vcdinfo} == 1
--enable-vcd-info=yes
%endif
VCDINFO_CFLAGS=-I%{_includedir}/libvcd VCDINFO_LIBS="-L%{_libdir} \
-lvcdinfo -L%{buildir}/lib/iso9660/.libs/ -liso9660 -L%{buildir}/lib/driver/.libs/ -lcdio" make -e %{?jobs:-j%jobs}
--enable-cpp-progs \
--without-cd-drive \
--without-cd-info \
--without-cdda-player \
--without-cd-read \
--without-iso-info \
--without-iso-read
VERBOSE=1 make -e %{?jobs:-j%jobs}
#-lcdioutils
%install
%makeinstall
@ -224,11 +201,8 @@ VCDINFO_CFLAGS=-I%{_includedir}/libvcd VCDINFO_LIBS="-L%{_libdir} \
mv $RPM_BUILD_ROOT%{_mandir}/jp $RPM_BUILD_ROOT%{_mandir}/ja
%endif
#empty depdendency libs
rm -rf %{buildroot}%{_bindir} %{buildroot}%{_mandir}
rm -f %{buildroot}%{_libdir}/*.la
%fdupes -s %{buildroot}%{_mandir}
%clean
rm -rf $RPM_BUILD_ROOT
%post -n libcdio13 -p /sbin/ldconfig
@ -246,10 +220,10 @@ rm -rf $RPM_BUILD_ROOT
%postun -n libudf0 -p /sbin/ldconfig
%post -n cdio-utils
%post devel
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%postun -n cdio-utils
%postun devel
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%files -n libcdio13
@ -269,22 +243,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr (-, root, root)
%{_libdir}/libudf.so.*
%files -n cdio-utils
%defattr (-, root, root)
%doc AUTHORS COPYING NEWS README README.libcdio THANKS TODO
#ChangeLog
%{_bindir}/cd-*
%{_bindir}/cdda-*
%{_bindir}/iso-*
%{_bindir}/mmc-*
%doc %{_infodir}/*.info*
%doc %{_mandir}/man?/*.*
%if 1 == 0
%lang(ja) %doc %{_mandir}/ja/man?/*.*
%endif
%files devel
%defattr (-, root, root)
%doc %{_infodir}/*.info*
%{_includedir}/cdio
%{_includedir}/cdio++
%{_libdir}/libcdio*.so