Accepting request 112927 from home:plater

Enabled vcdinfo again

OBS-URL: https://build.opensuse.org/request/show/112927
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcdio?expand=0&rev=27

baselibs.conf

@@ -1,4 +1,8 @@
-libcdio10
+libcdio13
   obsoletes "libcdio-<targettype> <= <version>"
   provides "libcdio-<targettype> = <version>"
-libiso9660-7
+libiso9660-8
+libcdio_cdda1
+libcdio_paranoia1
+libcdio++0
+libudf0

libcdio.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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.
+
 -------------------------------------------------------------------
 Tue Feb  8 09:42:31 UTC 2011 - dimstar@opensuse.org
 

libcdio.spec

@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%define vcdinfo 1
 
 Name:           libcdio
 Version:        0.83
@@ -27,14 +28,11 @@ BuildRequires:  pkgconfig(libcddb)
 #BuildRequires:  libcdio-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  pkgconfig(libvcdinfo)
-#!BuildIgnore: libcdio-mini-devel
-# Only for regression testing:
-# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file:
 Url:            http://savannah.gnu.org/projects/libcdio
 Summary:        CD-ROM Access Library
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Other
-Source0:         http://ftp.gnu.org/gnu/libcdio/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnu.org/gnu/libcdio/%{name}-%{version}.tar.bz2
 Source1:        baselibs.conf
 # bug437293
 %ifarch ppc64
@@ -247,11 +245,12 @@ VCDINFO_CFLAGS=-I%{_includedir}/libvcd VCDINFO_LIBS="-L%{_libdir} -lvcdinfo -L%{
 	--enable-shared=yes \
 	--enable-cpp-progs \
 	--with-pic \
-	--enable-vcd-info=no
+%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}
+-lvcdinfo -L%{buildir}/lib/iso9660/.libs/ -liso9660 -L%{buildir}/lib/driver/.libs/ -lcdio" make -e %{?jobs:-j%jobs}
 
 %install
 %makeinstall

libcdio_spec-prepare.sh

@@ -1,50 +0,0 @@
-#!/bin/bash
-
-# Autobuild doesn't support package names with macros. This script will update versions in package names.
-
-ORIG_SPEC=${2%-mini}
-# Never update -mini 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
-
-for PKGNAME in libcdio libcdio_cdda libcdio_paranoia libcdio++ libiso9660 libudf ; do
-    # Packages with name ending by number needs separator
-    if test x`echo $PKGNAME | sed "s/.*[0-9]$//"` = x ; then
-	SEPARATOR=-
-    else
-	SEPARATOR=
-    fi
-    sed -i "
-	# Copy ${PKGNAME}_name to hold space
-	/^%define ${PKGNAME}_name / {
-	    h;
-	    s/^%define ${PKGNAME}_name //;
-	    x;
-	};
-
-	# Update ${PKGNAME}_name everywhere
-	/$PKGNAME$SEPARATOR[0-9][-_0-9]*/ {
-	    G;
-	    s/$PKGNAME$SEPARATOR[0-9][-_0-9]*\(.*\)\n\(.*\)/$PKGNAME$SEPARATOR\2\1/;
-	};" $1/$ORIG_SPEC.spec
-done
-
-# Edit file to fit -mini build needs:
-sed '
-    s/STANDARD_BUILD\ 1/STANDARD_BUILD 0/;
-    s/^.ame:.*/&-mini/;
-    # No more needed.
-    #s/^..hangelog.*/& mini/;
-    s/libcdio-cdparanoia-compat/libcdio-cdparanoia-compat-mini/g
-    s/\(libcdio_cdda\|libcdio_paranoia\|libcdio++\|libcdio\|libiso9660-\|libudf\)\([0-9][-_0-9]*\)/\1\2-mini/g
-    s/^\(# WARNING:\).*After editing.*/\1 Do not edit this auto generated file./
-    s/^%package -n libcdio7-mini/&\nProvides:       libcdio-mini = %{version}-%{release}/
-    s/^Summary:[[:space:]]*/&Temporary Build Staging Package of /
-' <$1/$ORIG_SPEC.spec >$1/$ORIG_SPEC-mini.spec
-
-cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-mini.changes

pre_checkin.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-bash libcdio_spec-prepare.sh "$PWD" libcdio