diff --git a/baselibs.conf b/baselibs.conf index e2351b3..e5584ae 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libcdio12 +libcdio10 obsoletes "libcdio- <= " provides "libcdio- = " libiso9660-7 diff --git a/libcdio-0.82.tar.bz2 b/libcdio-0.82.tar.bz2 deleted file mode 100644 index 8656a33..0000000 --- a/libcdio-0.82.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4d1d63ab69d974c0140707842a2ba36cb0573e62b88877042f80a4c497bbef2 -size 1593569 diff --git a/libcdio-0.83.tar.bz2 b/libcdio-0.83.tar.bz2 new file mode 100644 index 0000000..92f08aa --- /dev/null +++ b/libcdio-0.83.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95703dbac406cb701cfa0ce1a09e9b917dbc2613d86170bbe25e183e5b04dcc2 +size 1591141 diff --git a/libcdio-mini-0.82-rpmlintrc b/libcdio-mini-0.82-rpmlintrc deleted file mode 100644 index 948d6a2..0000000 --- a/libcdio-mini-0.82-rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter(".*-mini\..* shlib-policy-name-error") diff --git a/libcdio-mini.changes b/libcdio-mini.changes deleted file mode 100644 index 6c286c2..0000000 --- a/libcdio-mini.changes +++ /dev/null @@ -1,283 +0,0 @@ -------------------------------------------------------------------- -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. - diff --git a/libcdio-mini.spec b/libcdio-mini.spec deleted file mode 100644 index 20ca7dd..0000000 --- a/libcdio-mini.spec +++ /dev/null @@ -1,345 +0,0 @@ -# -# spec file for package libcdio-mini -# -# 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/ -# - - -Name: libcdio-mini -# WARNING: Do not edit this auto generated file. -# %%(sh %%{_sourcedir}/libcdio_spec-prepare.sh %%{_sourcedir} %%{name}) -# You want standard build unless you will work-around build dependency on itself. -%define STANDARD_BUILD 0 -%define _name libcdio -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: pkg-config -BuildRequires: popt-devel -%if %STANDARD_BUILD -BuildRequires: libcddb-devel -BuildRequires: libcdio-devel -BuildRequires: ncurses-devel -BuildRequires: vcdimager-devel -#!BuildIgnore: libcdio-mini-devel -# Only for regression testing: -#BuildRequires: cdparanoia -%endif -Version: 0.82 -Release: 0 -# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: -%define libcdio_name 12 -%define libcdio_paranoia_name 0 -%define libcdio_cdda_name 0 -%define libcdio++_name 0 -%define libiso9660_name 7 -%define libudf_name 0 -Url: http://savannah.gnu.org/projects/libcdio -Summary: Temporary Build Staging Package of CD-ROM Access Library -License: GPL-2.0+ -Group: Productivity/Multimedia/Other -Source: http://ftp.gnu.org/gnu/libcdio/%{_name}-%{version}.tar.bz2 -Source1: %{_name}_spec-prepare.sh -Source2: baselibs.conf -# bug437293 -%ifarch ppc64 -Obsoletes: libcdio-64bit -%endif -# -%if %STANDARD_BUILD == 0 -Provides: %{_name} = %{version} -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%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. - - - -Authors: --------- - Herbert Valerio Riedel - Rocky Bernstein - -%package -n libcdio12-mini -Summary: Temporary Build Staging Package of CD-ROM Access Library -Group: Productivity/Multimedia/Other -# bug437293 -%ifarch ppc64 -Obsoletes: libcdio-64bit -%endif -# -# Name for <= 10.2 -Obsoletes: libcdio <= 0.78.2 -Provides: libcdio = %{version} - -%description -n libcdio12-mini -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. - - - -Authors: --------- - Herbert Valerio Riedel - Rocky Bernstein - -%package -n libcdio_cdda0-mini -Summary: Temporary Build Staging Package of CD-ROM Access Library -Group: Productivity/Multimedia/Other -# bug437293 -%ifarch ppc64 -Obsoletes: libcdio-64bit -%endif -# - -%description -n libcdio_cdda0-mini -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. - - - -Authors: --------- - Herbert Valerio Riedel - Rocky Bernstein - -%package -n libcdio_paranoia0-mini -Summary: Temporary Build Staging Package of CD-ROM Access Library -Group: Productivity/Multimedia/Other -# bug437293 -%ifarch ppc64 -Obsoletes: libcdio-64bit -%endif -# - -%description -n libcdio_paranoia0-mini -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. - - - -Authors: --------- - Herbert Valerio Riedel - Rocky Bernstein - -%package -n libcdio++0-mini -Summary: Temporary Build Staging Package of CD-ROM Access Library -Group: Productivity/Multimedia/Other -# bug437293 -%ifarch ppc64 -Obsoletes: libcdio-64bit -%endif -# - -%description -n libcdio++0-mini -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. - - - -Authors: --------- - Herbert Valerio Riedel - Rocky Bernstein - -%package -n libiso9660-7-mini -Summary: Temporary Build Staging Package of CD-ROM Access Library -Group: Productivity/Multimedia/Other -# bug437293 -%ifarch ppc64 -Obsoletes: libcdio-64bit -%endif -# - -%description -n libiso9660-7-mini -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. - - - -Authors: --------- - Herbert Valerio Riedel - Rocky Bernstein - -%package -n libudf0-mini -Summary: Temporary Build Staging Package of CD-ROM Access Library -Group: Productivity/Multimedia/Other -# bug437293 -%ifarch ppc64 -Obsoletes: libcdio-64bit -%endif -# - -%description -n libudf0-mini -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. - - - -Authors: --------- - Herbert Valerio Riedel - Rocky Bernstein - -%package utils -Summary: Temporary Build Staging Package of CD-ROM Access Library -Group: Productivity/Multimedia/Other -PreReq: %install_info_prereq - -%description 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. - - - -Authors: --------- - Herbert Valerio Riedel - Rocky Bernstein - -%package devel -Summary: Temporary Build Staging Package of CD-ROM access library -Group: Development/Languages/C and C++ -Requires: libcdio12-mini = %{version} libcdio_cdda0-mini = %{version} libcdio_paranoia0-mini = %{version} libcdio++0-mini = %{version} libiso9660-7-mini = %{version} libudf0-mini = %{version} glibc-devel -%if %STANDARD_BUILD == 0 -Provides: %{_name}-devel = %{version} -%endif -# bug437293 -%ifarch ppc64 -Obsoletes: libcdio-devel-64bit -%endif -# - -%description devel -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. - - - -Authors: --------- - Herbert Valerio Riedel - Rocky Bernstein - -%prep -%setup -q -n %{_name}-%{version} - -%build -autoreconf -f -i -# FIXME: Required .pc files are not installed without --enable-cpp-progs. -%configure\ - --disable-static\ - --enable-cpp-progs\ - --with-pic -make %{?jobs:-j%jobs} - -%install -%makeinstall -mv $RPM_BUILD_ROOT%{_mandir}/jp $RPM_BUILD_ROOT%{_mandir}/ja -#empty depdendency libs -rm -f %{buildroot}%{_libdir}/*.la - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -n libcdio12-mini -p /sbin/ldconfig - -%post -n libcdio_cdda0-mini -p /sbin/ldconfig - -%post -n libcdio_paranoia0-mini -p /sbin/ldconfig - -%post -n libcdio++0-mini -p /sbin/ldconfig - -%post -n libiso9660-7-mini -p /sbin/ldconfig - -%post -n libudf0-mini -p /sbin/ldconfig - -%postun -n libcdio12-mini -p /sbin/ldconfig - -%postun -n libcdio_cdda0-mini -p /sbin/ldconfig - -%postun -n libcdio_paranoia0-mini -p /sbin/ldconfig - -%postun -n libcdio++0-mini -p /sbin/ldconfig - -%postun -n libiso9660-7-mini -p /sbin/ldconfig - -%postun -n libudf0-mini -p /sbin/ldconfig - -%post utils -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz - -%postun utils -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz - -%files -n libcdio12-mini -%defattr (-, root, root) -%{_libdir}/libcdio.so.* - -%files -n libcdio_cdda0-mini -%defattr (-, root, root) -%{_libdir}/libcdio_cdda.so.* - -%files -n libcdio_paranoia0-mini -%defattr (-, root, root) -%{_libdir}/libcdio_paranoia.so.* - -%files -n libcdio++0-mini -%defattr (-, root, root) -%{_libdir}/libcdio++.so.* -%{_libdir}/libiso9660++.so.* - -%files -n libiso9660-7-mini -%defattr (-, root, root) -%{_libdir}/libiso9660.so.* - -%files -n libudf0-mini -%defattr (-, root, root) -%{_libdir}/libudf.so.* - -%files utils -%defattr (-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README README.libcdio THANKS TODO -%{_bindir}/cd-* -%if %STANDARD_BUILD -%{_bindir}/cdda-* -%endif -%{_bindir}/iso-* -%{_bindir}/mmc-* -%doc %{_infodir}/*.info* -%doc %{_mandir}/man?/*.* -%lang(ja) %doc %{_mandir}/ja/man?/*.* - -%files devel -%defattr (-, root, root) -%{_includedir}/cdio -%{_includedir}/cdio++ -%{_libdir}/libcdio*.so -%{_libdir}/libiso9660*.so -%{_libdir}/libudf*.so -%{_libdir}/pkgconfig/*.pc - -%changelog diff --git a/libcdio.changes b/libcdio.changes index 6c286c2..318a6ee 100644 --- a/libcdio.changes +++ b/libcdio.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/libcdio.spec b/libcdio.spec index 4d88123..5734b48 100644 --- a/libcdio.spec +++ b/libcdio.spec @@ -17,48 +17,30 @@ Name: libcdio -# WARNING: After editing this file please call Re or rpmbuild to update spec file: -# %%(sh %%{_sourcedir}/libcdio_spec-prepare.sh %%{_sourcedir} %%{name}) -# You want standard build unless you will work-around build dependency on itself. -%define STANDARD_BUILD 1 -%define _name libcdio +Version: 0.83 +Release: 0 BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: popt-devel -%if %STANDARD_BUILD -BuildRequires: libcddb-devel -BuildRequires: libcdio-devel +BuildRequires: pkgconfig(libcddb) +#BuildRequires: libcdio-devel BuildRequires: ncurses-devel -BuildRequires: vcdimager-devel +BuildRequires: pkgconfig(libvcdinfo) #!BuildIgnore: libcdio-mini-devel # Only for regression testing: -#BuildRequires: cdparanoia -%endif -Version: 0.82 -Release: 0 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: -%define libcdio_name 12 -%define libcdio_paranoia_name 0 -%define libcdio_cdda_name 0 -%define libcdio++_name 0 -%define libiso9660_name 7 -%define libudf_name 0 Url: http://savannah.gnu.org/projects/libcdio Summary: CD-ROM Access Library License: GPL-2.0+ Group: Productivity/Multimedia/Other -Source: http://ftp.gnu.org/gnu/libcdio/%{_name}-%{version}.tar.bz2 -Source1: %{_name}_spec-prepare.sh -Source2: baselibs.conf +Source0: http://ftp.gnu.org/gnu/libcdio/%{name}-%{version}.tar.bz2 +Source1: baselibs.conf # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit %endif # -%if %STANDARD_BUILD == 0 -Provides: %{_name} = %{version} -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,7 +55,7 @@ Authors: Herbert Valerio Riedel Rocky Bernstein -%package -n libcdio12 +%package -n libcdio13 Summary: CD-ROM Access Library Group: Productivity/Multimedia/Other # bug437293 @@ -85,7 +67,7 @@ Obsoletes: libcdio-64bit Obsoletes: libcdio <= 0.78.2 Provides: libcdio = %{version} -%description -n libcdio12 +%description -n libcdio13 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. @@ -97,7 +79,7 @@ Authors: Herbert Valerio Riedel Rocky Bernstein -%package -n libcdio_cdda0 +%package -n libcdio_cdda1 Summary: CD-ROM Access Library Group: Productivity/Multimedia/Other # bug437293 @@ -106,7 +88,7 @@ Obsoletes: libcdio-64bit %endif # -%description -n libcdio_cdda0 +%description -n libcdio_cdda1 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. @@ -118,7 +100,7 @@ Authors: Herbert Valerio Riedel Rocky Bernstein -%package -n libcdio_paranoia0 +%package -n libcdio_paranoia1 Summary: CD-ROM Access Library Group: Productivity/Multimedia/Other # bug437293 @@ -127,7 +109,7 @@ Obsoletes: libcdio-64bit %endif # -%description -n libcdio_paranoia0 +%description -n libcdio_paranoia1 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. @@ -160,7 +142,7 @@ Authors: Herbert Valerio Riedel Rocky Bernstein -%package -n libiso9660-7 +%package -n libiso9660-8 Summary: CD-ROM Access Library Group: Productivity/Multimedia/Other # bug437293 @@ -169,7 +151,7 @@ Obsoletes: libcdio-64bit %endif # -%description -n libiso9660-7 +%description -n libiso9660-8 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. @@ -222,10 +204,13 @@ Authors: %package devel Summary: CD-ROM access library Group: Development/Languages/C and C++ -Requires: libcdio12 = %{version} libcdio_cdda0 = %{version} libcdio_paranoia0 = %{version} libcdio++0 = %{version} libiso9660-7 = %{version} libudf0 = %{version} glibc-devel -%if %STANDARD_BUILD == 0 -Provides: %{_name}-devel = %{version} -%endif +Requires: libcdio13 = %{version} +Requires: libcdio_cdda1 = %{version} +Requires: libcdio_paranoia1 = %{version} +Requires: libcdio++0 = %{version} +Requires: libiso9660-8 = %{version} +Requires: libudf0 = %{version} +Requires: glibc-devel # bug437293 %ifarch ppc64 Obsoletes: libcdio-devel-64bit @@ -245,16 +230,28 @@ Authors: Rocky Bernstein %prep -%setup -q -n %{_name}-%{version} +%setup -q +%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. -%configure\ - --disable-static\ - --enable-cpp-progs\ - --with-pic -make %{?jobs:-j%jobs} + +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 \ + --enable-cpp-progs \ + --with-pic \ + --enable-vcd-info=no + +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} %install %makeinstall @@ -265,27 +262,27 @@ rm -f %{buildroot}%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT -%post -n libcdio12 -p /sbin/ldconfig +%post -n libcdio13 -p /sbin/ldconfig -%post -n libcdio_cdda0 -p /sbin/ldconfig +%post -n libcdio_cdda1 -p /sbin/ldconfig -%post -n libcdio_paranoia0 -p /sbin/ldconfig +%post -n libcdio_paranoia1 -p /sbin/ldconfig %post -n libcdio++0 -p /sbin/ldconfig -%post -n libiso9660-7 -p /sbin/ldconfig +%post -n libiso9660-8 -p /sbin/ldconfig %post -n libudf0 -p /sbin/ldconfig -%postun -n libcdio12 -p /sbin/ldconfig +%postun -n libcdio13 -p /sbin/ldconfig -%postun -n libcdio_cdda0 -p /sbin/ldconfig +%postun -n libcdio_cdda1 -p /sbin/ldconfig -%postun -n libcdio_paranoia0 -p /sbin/ldconfig +%postun -n libcdio_paranoia1 -p /sbin/ldconfig %postun -n libcdio++0 -p /sbin/ldconfig -%postun -n libiso9660-7 -p /sbin/ldconfig +%postun -n libiso9660-8 -p /sbin/ldconfig %postun -n libudf0 -p /sbin/ldconfig @@ -295,15 +292,15 @@ rm -rf $RPM_BUILD_ROOT %postun utils %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%files -n libcdio12 +%files -n libcdio13 %defattr (-, root, root) %{_libdir}/libcdio.so.* -%files -n libcdio_cdda0 +%files -n libcdio_cdda1 %defattr (-, root, root) %{_libdir}/libcdio_cdda.so.* -%files -n libcdio_paranoia0 +%files -n libcdio_paranoia1 %defattr (-, root, root) %{_libdir}/libcdio_paranoia.so.* @@ -312,7 +309,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libcdio++.so.* %{_libdir}/libiso9660++.so.* -%files -n libiso9660-7 +%files -n libiso9660-8 %defattr (-, root, root) %{_libdir}/libiso9660.so.* @@ -324,9 +321,7 @@ rm -rf $RPM_BUILD_ROOT %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README README.libcdio THANKS TODO %{_bindir}/cd-* -%if %STANDARD_BUILD %{_bindir}/cdda-* -%endif %{_bindir}/iso-* %{_bindir}/mmc-* %doc %{_infodir}/*.info*