diff --git a/.cvsignore b/.cvsignore index 0e46e20b..c35a80fe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -45,11 +45,6 @@ libcdio*.tar.gz.directive libcdio*.tar.gz.directive.asc libcdio*.tar.gz.sig libtool -libcdio.pc -libcdio.spec -libiso9660.pc -libcdio_cdda.pc -libcdio_paranoia.pc ltmain.sh mkinstalldirs stamp-h1 diff --git a/configure.ac b/configure.ac index 31bab3c7..785e0bfe 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ define(RELEASE_NUM, 72) define(CDIO_VERSION_STR, 0.$1cvs) AC_PREREQ(2.52) -AC_REVISION([$Id: configure.ac,v 1.128 2005/01/16 13:08:25 rocky Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.129 2005/01/25 02:00:19 rocky Exp $])dnl AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_CONFIG_SRCDIR(src/cd-info.c) AM_INIT_AUTOMAKE @@ -516,11 +516,6 @@ AC_CONFIG_COMMANDS([checks], AC_CONFIG_FILES([ \ Makefile \ - libcdio_cdda.pc \ - libcdio.pc \ - libcdio_paranoia.pc \ - libcdio.spec \ - libiso9660.pc \ example/Makefile \ include/Makefile \ include/cdio/Makefile \ @@ -532,6 +527,12 @@ AC_CONFIG_FILES([ \ lib/driver/Makefile \ lib/iso9660/Makefile \ lib/paranoia/Makefile \ + package/libcdio-suse.spec \ + package/libcdio.pc \ + package/libcdio.spec \ + package/libcdio_cdda.pc \ + package/libcdio_paranoia.pc \ + package/libiso9660.pc \ src/cd-paranoia/Makefile \ src/cd-paranoia/usage.txt \ src/cd-paranoia/doc/cd-paranoia.1 \ diff --git a/example/paranoia2.c b/example/paranoia2.c index 23a85b1d..7a402c17 100644 --- a/example/paranoia2.c +++ b/example/paranoia2.c @@ -17,8 +17,8 @@ * */ /* Simple program to show using libcdio's version of the CD-DA - paranoia library. In this version, we'll open a cdio object before - calling paranoia's open. I image in many cases such as media + paranoia library. But in this version, we'll open a cdio object before + calling paranoia's open. I imagine in many cases such as media players this may be what will be done since, one may want to get CDDB/CD-Text info beforehand. */ @@ -38,7 +38,7 @@ int main(int argc, const char *argv[]) { - cdrom_drive_t *d = NULL; /* Place to store handle given by cd-parapnioa. */ + cdrom_drive_t *d = NULL; /* Place to store handle given by cd-paranoia. */ char **ppsz_cd_drives; /* List of all drives with a loaded CDDA in it. */ CdIo_t *p_cdio = NULL; diff --git a/package/libcdio.pc.in b/package/libcdio.pc.in new file mode 100644 index 00000000..73dc2396 --- /dev/null +++ b/package/libcdio.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: @PACKAGE_NAME@ +Description: Portable CD-ROM I/O library +Version: @PACKAGE_VERSION@ +#Requires: glib-2.0 +Libs: -L${libdir} -lcdio @LIBS@ @DARWIN_PKG_LIB_HACK@ +Cflags: -I${includedir} diff --git a/package/libcdio.spec.in b/package/libcdio.spec.in new file mode 100644 index 00000000..82ca4236 --- /dev/null +++ b/package/libcdio.spec.in @@ -0,0 +1,132 @@ +### $Id: libcdio.spec.in,v 1.1 2005/01/25 02:00:20 rocky Exp $ +### autogenerated---edit *.spec.in + +%define name @PACKAGE@ +%define ver @VERSION@ +%define rel 0 + +Name: %{name} +Summary: CD-ROM access library +Summary(de): CD-ROM Zugriffsbibliothek +Version: %{ver} +Release: %{rel} +Copyright: GPL +Group: Development/Libraries +URL: http://www.gnu.org/software/libcdio/ + +Source0: %{name}-%{version}.tar.gz + +Packager: Manfred Tremmel +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root + +%description +This library is to encapsulate CD-ROM reading and +control. Applications wishing to be oblivious of the OS- and +device-dependent properties of a CD-ROM can use this library. + +%description -l de +Diese Bibliothek dient zur Kapselung von CD-ROM Zugriffen und +dessen Kontrolle. Anwendungen brauchen sich nicht um die +Betriebssystemspezifischen oder Device-Abhängigen Eigenschaften +des CD-ROM zu kümmern, dies erledigt die Bibliothek. + +%package devel +Summary: libcdio development package +Summary(de): libcdio Entwicklerpaket +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +libcdio development package + +%description devel -l de +libcdio Entwicklerpaket + +%package -n cdinfo +Summary: cd-info +Summary(de): cd-info +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} +#Requires: libvcd >= 0.7.20 +Requires: libcddb +BuildRequires: libcddb-devel +#BuildRequires: libvcd-devel >= 0.7.20 + +%description -n cdinfo + +cd-info prints various information about a CD or CD image, analyzes +and gives information about each of the tracks, and tries to detect +the type of CD (e.g. VCD, Audio CD, PhotoCD, a bootable CD, etc.). For +audio CD's more information is given if libcddb is installed. For +Video CD's more information is given if the libvcdinfo library is +installed. + + +%description -n cdinfo -l de + +cd-info gibt verschiedene informationen über eine CD oder ein CD-Image +aus, analysiert und informiert über jeden der Tracks und versucht, den +Typ der CD zu ermitteln (z.B. VCD, Audio-CD, PhotoCD, eine bootbare CD +usw.). +Zu Audio-CDs werden weitere Informationen ausgegeben, wenn die libcddb +installiert ist. Zu Video-CDs werden mehr Informationen ausgegeben, wenn +die libvcdinfo installiert ist. + +%prep +%setup + +%build +%configure +%__make + +%install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +%makeinstall +rm -rf ${RPM_BUILD_ROOT}/%{_mandir} + +%clean +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files +%defattr(-,root,root) +%doc AUTHORS INSTALL NEWS THANKS TODO +%{_libdir}/lib*.so.* + +%files devel +%defattr(-, root, root) +%doc ChangeLog COPYING README +%{_libdir}/lib*.so +%{_libdir}/*.*a +%{_includedir}/cdio/* +%{_infodir}/* +%{_libdir}/pkgconfig/*.pc + +%files -n cdinfo +%defattr(-,root,root) +%{_bindir}/* + +%changelog +* Sun Feb 15 2004 Manfred Tremmel +- some little changes + +* Sat Feb 14 2004 Rocky Bernstein +- require vcdimager 0.7.20, small rpm fixes + +* Tue Sep 9 2003 Rocky Bernstein +- small fixes really from Frantisek Dvorak + +* Sun Aug 30 2003 Frantisek Dvorak +- two files added + +* Wed Aug 06 2003 Rocky Bernstein +- fixes really Manfred Tremmel + at http://www.iiv.de/schwinde/buerger/tremmel/ + +* Fri Apr 25 2003 Manfred Tremmel +- first spec file diff --git a/package/libcdio_cdda.pc.in b/package/libcdio_cdda.pc.in new file mode 100644 index 00000000..88155e86 --- /dev/null +++ b/package/libcdio_cdda.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: @PACKAGE_NAME@ +Description: Portable CD-ROM I/O library +Version: @PACKAGE_VERSION@ +#Requires: glib-2.0 +Libs: -L${libdir} -lcdda_interface +Cflags: -I${includedir} diff --git a/package/libcdio_paranoia.pc.in b/package/libcdio_paranoia.pc.in new file mode 100644 index 00000000..eff5591a --- /dev/null +++ b/package/libcdio_paranoia.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: @PACKAGE_NAME@ +Description: Portable CD-ROM I/O library +Version: @PACKAGE_VERSION@ +#Requires: glib-2.0 +Libs: -L${libdir} -lcdio_paranoia -lcdda_interface +Cflags: -I${includedir} diff --git a/package/libiso9660.pc.in b/package/libiso9660.pc.in new file mode 100644 index 00000000..f1cf4ba2 --- /dev/null +++ b/package/libiso9660.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +libiconv=@LIBICONV@ + +Name: libiso9660 +Description: ISO-9660 library +Version: @PACKAGE_VERSION@ +Requires: libcdio +Libs: -L${libdir} -liso9660 @LIBICONV@ +Cflags: -I${includedir}