[xine-devel] xine-lib-1-alpha0 problems (and fixes) for the "rpm -ta" process of building RPMs

[Bill F. <bil...@mi...>]

Here is an annotated diff of the changes I made to get the "rpm -ta"
process of building RPMs for xine-lib-1-alpha0 to work successfully
(comment lines begin with ">>>"):

diff -ur xine-lib-1-alpha0/misc/xine-lib.spec xine-lib-1-alpha0a/misc/xine-lib.spec
--- xine-lib-1-alpha0/misc/xine-lib.spec	Mon Nov  4 08:58:25 2002
+++ xine-lib-1-alpha0a/misc/xine-lib.spec	Wed Nov  6 02:50:18 2002
@@ -1,5 +1,5 @@
 %define name 	libxine
-%define version 1_alpha0
+%define version 1_alpha0a
>>>
>>> Just to distinguish my changes
>>>
 %define release 1
 
 %define major 	1
@@ -58,8 +58,8 @@
 Summary(cs): Knihovny nutné pro bìh programù dynamicky linkovaných s %{name}
 Summary(de): Benötigte Bibliotheken, um Programme, die dynamisch gegen %{name} gelinkt sind, benutzen zu können.
 Group:	   Development/Libraries
-Obsoletes: xine, xine-lib, xine-lib-oss, xine-lib-alsa09, xine-lib-arts, xine-lib-esd, xine-lib-dxr3, xine-lib-xv, xine-lib-sdl, xine-lib-aa, xine-lib-opengl, xine-lib-w32dll, xine-lib-oggvorbis
-Provides:  %{name} = %{version}-%{release}
+Obsoletes: xine, xine-lib, xine-lib-oss, xine-lib-alsa09, xine-lib-arts, xine-lib-esd, xine-lib-dxr3, xine-lib-xv, xine-lib-sdl, xine-lib-aa, xine-lib-opengl, xine-lib-w32dll, xine-lib-oggvorbis libxine0
>>>
>>> Manfred Tremmel change to obsolete libxine0.  However this was not
>>> sufficient for some reason.  When doing an "rpm -U" over libxine0-0.9.13,
>>> it still complained about some libxine0 dependencies.  I had to do a
>>> "rpm -e libxine0 libxine0-devel xine-ui" before doing the upgrade and
>>> then it worked OK
>>>
+Provides:  %{libname} = %{version}-%{release}
>>>
>>> Change %{name} to %{libname} to get proper dependencies
>>>
 Requires:  zlib
 
 %description -n %{libname}
@@ -108,8 +108,8 @@
 Summary(cs): Hlavièkové soubory a dokumentace pro vývoj programù pou¾ívajících %{name}.
 Summary(de): Headerdateien und Dokumentationen, um Programme mit %{name} entwickeln zu können.
 Group:	   Development/Libraries
-Obsoletes: xine-lib-devel
-Provides:  %{name}-devel = %{version}-%{release}
+Obsoletes: xine-lib-devel libxine0-devel
>>>
>>> Manfred Tremmel change to obsolete libxine0-devel
>>>
+Provides:  %{libname}-devel = %{version}-%{release}
>>>
>>> Change %{name} to %{libname} to get proper dependencies
>>>
 Requires:  %{libname} = %{version}-%{release}
 
 %description -n %{libname}-devel
@@ -160,7 +160,7 @@
 
 %build
 if [ ! -f configure ]; then
-   NO_CONFIGURE=1 ./cvscompile.sh
+   NO_CONFIGURE=1 ./autogen.sh
>>>
>>> Manfred Tremmel change to reflect new name of autogen.sh
>>>
 fi
 
 #
@@ -193,7 +193,7 @@
 %doc README TODO AUTHORS COPYING ChangeLog
 %{_bindir}/xine-config
 %{_libdir}/libxine*.so.*
-%{_libdir}/xine/plugins/%{version}/xineplug_*
+%{_libdir}/xine/plugins/1.0.0/xineplug_*
>>>
>>> Didn't investigate the correct fix here.  The build process puts
>>> the xineplug_* files into the 1.0.0 directory while the spec file
>>> is looking in the %{version} directory which is the 1_alpha0a
>>> directory.  Just hardcoded 1.0.0 here to get it to work
>>>
 %{_datadir}/xine/fonts/*
 %{_mandir}/man1/*
 %{_datadir}/locale/*
@@ -212,12 +212,16 @@
 %endif
 %ifos linux freebsd
 %ifarch i386 i486 i586 i686 k6 k7 athlon
-%{_libdir}/xine/plugins/%{version}/vidix/*_vid.*
+%{_libdir}/xine/plugins/1.0.0/vidix/*_vid.*
>>>
>>> Didn't investigate the correct fix here.  The build process puts
>>> the *_vid.* files into the 1.0.0/vidix directory while the spec
>>> file is looking in the %{version}/vidix directory which is the
>>> 1_alpha0a/vidix directory.  Just hardcoded 1.0.0/vidix here to
>>> get it to work
>>>
 %endif
 %endif
 
 
 %changelog
+* Wed Nov 06 2002 Bill Fink <bil...@mi...>
+- Some more changes for latest xine version
+* Sat Nov 04 2002 Manfred Tremmel <Man...@ii...>
+- another change to make it run with next version
>>>
>>> Changelog additions
>>>
 * Sat Nov 02 2002 Manfred Tremmel <Man...@ii...>
 - Changes for next xine version
 * Sun Oct 27 2002 Manfred Tremmel <Man...@ii...>