From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 22 Dec 2013 19:02:57 +0000 (+0100)
Subject: - added texinfo patch (fixes build with texinfo 5)
X-Git-Tag: auto/th/vcdimager-0.7.24-4
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=9bb37477c4b5f57da0e999eb86a769d8cb7d9aed;p=packages%2Fvcdimager.git

- added texinfo patch (fixes build with texinfo 5)
- dropped libtool file
- release 4 (rebuild with libcdio 0.92)
---

diff --git a/vcdimager-texinfo.patch b/vcdimager-texinfo.patch
new file mode 100644
index 0000000..c30fabf
--- /dev/null
+++ b/vcdimager-texinfo.patch
@@ -0,0 +1,54 @@
+--- vcdimager-0.7.24/docs/vcd-info.texi.orig	2013-12-22 19:10:15.181644348 +0100
++++ vcdimager-0.7.24/docs/vcd-info.texi	2013-12-22 19:35:59.421579544 +0100
+@@ -663,11 +663,10 @@
+ @end ftable
+ 
+ @item --show-scandata
+-This option is relevant only if the program streams are MPEG2's. That is
+-the Video CD image is not VCD 1.0, VCD 1.1 VCD 2.0. 
+-
+ @itemx -s
+ @kindex @code{--show-scandata}
++This option is relevant only if the program streams are MPEG2's. That is
++the Video CD image is not VCD 1.0, VCD 1.1 VCD 2.0. 
+ 
+ @item --show-search
+ @itemx -X
+@@ -1270,7 +1269,7 @@
+ @printindex fn
+ 
+ @tex
+-% I think something like @colophon should be in texinfo.  In the
++% I think something like @@colophon should be in texinfo.  In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -1282,7 +1281,7 @@
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 1991.
++% Blame: doc@@cygnus.com, 1991.
+ @end tex
+ 
+ @bye
+--- vcdimager-0.7.24/docs/vcdxrip.texi.orig	2013-12-22 19:10:15.184977682 +0100
++++ vcdimager-0.7.24/docs/vcdxrip.texi	2013-12-22 19:42:53.374895506 +0100
+@@ -594,7 +594,7 @@
+ @printindex ky
+ 
+ @tex
+-% I think something like @colophon should be in texinfo.  In the
++% I think something like @@colophon should be in texinfo.  In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -606,7 +606,7 @@
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 1991.
++% Blame: doc@@cygnus.com, 1991.
+ @end tex
+ 
+ @bye
diff --git a/vcdimager.spec b/vcdimager.spec
index 06c9a56..c4e1f4a 100644
--- a/vcdimager.spec
+++ b/vcdimager.spec
@@ -6,12 +6,13 @@ Summary:	VideoCD (pre-)mastering and ripping tools
 Summary(pl.UTF-8):	Narzędzia do tworzenia i odczytu VideoCD
 Name:		vcdimager
 Version:	0.7.24
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		Applications/File
 Source0:	http://ftp.gnu.org/gnu/vcdimager/%{name}-%{version}.tar.gz
 # Source0-md5:	3af22978fd79c79d5fda6513b6811145
 Patch0:		%{name}-info.patch
+Patch1:		%{name}-texinfo.patch
 URL:		http://www.gnu.org/software/vcdimager/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1.6.0
@@ -74,6 +75,7 @@ Statyczne biblioteki vcd.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 cp -f libpopt.m4 acinclude.m4
 
@@ -94,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvcdinfo.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -131,7 +136,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libvcdinfo.so
-%{_libdir}/libvcdinfo.la
 %{_includedir}/libvcd
 %{_pkgconfigdir}/libvcdinfo.pc