[xiph-cvs] cvs commit: paranoia-III cdparanoia.spec

[Peter Jones]

pjones      01/11/04 22:38:34

  Modified:    .        cdparanoia.spec
  Log:
  make -libs package; -devel is .h and .a files, and requires -libs.  -libs
    is .so files.  This fits the normal scheme better.
  make symlinks so "gcc -lcdda_interface" will actually work external to
    cdparanoia itself...
  add an "Obsoletes: cdparanoia-III", because there are such packages in the
    wild

Revision  Changes    Path
1.10      +35 -11    paranoia-III/cdparanoia.spec

Index: cdparanoia.spec
===================================================================
RCS file: /usr/local/cvsroot/paranoia-III/cdparanoia.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cdparanoia.spec	2001/08/28 15:24:23	1.9
+++ cdparanoia.spec	2001/11/05 06:38:33	1.10
@@ -1,18 +1,19 @@
 %define ver	9.8
 %define realver	alpha%{ver}
 
-Summary: A Compact Disc Digital Audio (CDDA) extraction tool (or ripper).
 Name: cdparanoia
 Version: %{realver}
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/Multimedia
 Source: http://www.xiph.org/paranoia/download/%{name}-III-%{realver}.src.tgz 
 Url: http://www.xiph.org/paranoia/index.html
 BuildRoot: %{_tmppath}/cdparanoia-%{version}-root
-Requires: cdparanoia-devel >= %{version}-0
+Requires: cdparanoia-libs = %{version}-%{release}
+Obsoletes: cdparanoia-III
+Summary: A Compact Disc Digital Audio (CDDA) extraction tool (or ripper).
 
-%description
+%description 
 Cdparanoia (Paranoia III) reads digital audio directly from a CD, then
 writes the data to a file or pipe in WAV, AIFC or raw 16 bit linear
 PCM format.  Cdparanoia doesn't contain any extra features (like the ones
@@ -22,14 +23,24 @@
 atomic reads.  Cdparanoia is also good at reading and repairing data from
 damaged CDs.
 
-%package devel
+%package -n cdparanoia-devel
 Summary: Development tools for libcdda_paranoia (Paranoia III).
 Group: Development/Libraries
+Requires: cdparanoia-libs = %{version}-%{release}
+Obsoletes: cdparanoia-devel
 
-%description devel
+%description -n cdparanoia-devel
 The cdparanoia-devel package contains the static libraries and header
 files needed for developing applications to read CD Digital Audio disks.
 
+%package -n cdparanoia-libs
+Summary: Libraries for libcdda_paranoia (Paranoia III).
+Group: Development/Libraries
+
+%description -n cdparanoia-libs
+The cdparanoia-libs package contains the dynamic libraries needed for
+applications which read CD Digital Audio disks.
+
 %prep
 %setup -q -n %{name}-III-%{realver}
 
@@ -56,10 +67,15 @@
         $RPM_BUILD_ROOT%{_libdir}
 install -m 0755 interface/libcdda_interface.a $RPM_BUILD_ROOT%{_libdir}
 
-%post devel
+(	cd $RPM_BUILD_ROOT%{_libdir} ; 
+	ln -s libcdda_paranoia.so.0.%{ver} libcdda_paranoia.so ; 
+	ln -s libcdda_interface.so.0.%{ver} libcdda_interface.so
+)
+
+%post -n cdparanoia-libs
 /sbin/ldconfig
 
-%postun devel
+%postun -n cdparanoia-libs
 if [ "$1" -ge "1" ]; then
   /sbin/ldconfig
 fi
@@ -67,18 +83,26 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -n cdparanoia
 %defattr(-,root,root)
 %doc README GPL FAQ.txt
 %{_bindir}/*
 %{_mandir}/man1/*
+
+%files -n cdparanoia-libs
+%defattr(-,root,root)
+%{_libdir}/*.so*
 
-%files devel
+%files -n cdparanoia-devel
 %defattr(-,root,root)
 %{_includedir}/*
-%{_libdir}/*
+%{_libdir}/*.a
 
 %changelog
+* Sun Nov  4 2001 Peter Jones <pjones at redhat.com> alpha9.8-5
+- make a -libs package which contains the .so files
+- make the cdparanoia dependancy towards that, not -devel
+
 * Thu Aug  2 2001 Peter Jones <pjones at redhat.com>
 - bump the release not to conflict with on in the RH build tree :/
 - reverse devel dependency

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.