From bbf7aba60c7596990fdf631bdeef206bcbe70e31d1e8a50e73db167fd896fa96 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 18 Jun 2012 11:21:10 +0000 Subject: [PATCH] - don't include .la files in libxine-devel to avoid bogus libtool errors OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=62 --- precheckin_cripple_tarball.sh | 13 ++++++++++--- xine-lib.changes | 10 ++++++++++ xine-lib.spec | 26 ++++++++++++++++++++++++-- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/precheckin_cripple_tarball.sh b/precheckin_cripple_tarball.sh index c88a054..c7a58aa 100644 --- a/precheckin_cripple_tarball.sh +++ b/precheckin_cripple_tarball.sh @@ -35,8 +35,11 @@ popd >/dev/null # Find source tarball + unpack -tmp="/`mktemp -d`" -trap 'rm -rf $tmp; echo 1>&2 "$0 failed"' EXIT +#tmp="/`mktemp -d`" +#trap 'rm -rf $tmp; echo 1>&2 "$0 failed"' EXIT +tmp=.dest +rm -rf $tmp +mkdir $tmp test -d "$tmp" -a -w "$tmp" || exit tarsource="`echo xine-lib-*[0-9].tar.bz2`" if [ ! -s "$tarsource" ] ; then @@ -58,12 +61,16 @@ pushd $tmp/$tarbase >/dev/null || exit 1 echo 1>&2 "Crippling..." -c_subdirs="dxr3 liba52 libdts libfaad libffmpeg libmad libmpeg2 libspucc libspudec libspudvb libw32dll input/vcd combined/ffmpeg" +contrib_subdirs="a52dec libfaad libmad gsm610 nosefart" +c_subdirs="dxr3 libdts libmpeg2 libspucc libspudec libspudvb libw32dll input/vcd combined/ffmpeg" c_demuxers="xineplug_dmx_asf.la asfheader.h asfheader.c demux_asf.c xineplug_dmx_mpeg.la demux_mpeg.c xineplug_dmx_mpeg_block.la demux_mpeg_block.c xineplug_dmx_mpeg_ts.la demux_ts.c xineplug_dmx_mpeg_elem.la demux_elem.c xineplug_dmx_mpeg_pes.la demux_mpeg_pes.c xineplug_dmx_yuv4mpeg2.la demux_yuv4mpeg2.c" c_input="xineplug_inp_mms.la input_mms.c mms.c mmsh.c ../demuxers/asfheader.c mms.h mmsh.h xineplug_inp_vcdo.la input_vcd.c vcd" c_libxineadec="xineplug_decode_gsm610.la xineplug_decode_nsf.la gsm610.c nsf.c gsm610 nosefart" c_audiodec="xineplug_decode_a52.la xineplug_decode_mad.la xine_a52_decoder.c xine_mad_decoder.c" +do_nukeentry contrib/Makefile.am "$contrib_subdirs" +do_remove contrib "$contrib_subdirs" +do_nukeentry configure.ac "$contrib_subdirs" "contrib/" "/[a-zA-Z0-9_./]*Makefile" do_nukeentry src/Makefile.am "$c_subdirs" do_nukeentry configure.ac "$c_subdirs" "src/" "/[a-zA-Z0-9_./]*Makefile" do_remove src "$c_subdirs" diff --git a/xine-lib.changes b/xine-lib.changes index bfd5419..3751dac 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jun 18 11:20:29 UTC 2012 - lnussel@suse.de + +- don't include .la files in libxine-devel to avoid bogus libtool errors + +------------------------------------------------------------------- +Thu Jun 14 20:20:01 UTC 2012 - coolo@suse.com + +- provide and obsolete xine-devel and xine-lib for backward compat + ------------------------------------------------------------------- Sun Jun 10 14:45:00 UTC 2012 - Manfred.Tremmel@iiv.de diff --git a/xine-lib.spec b/xine-lib.spec index c2e1ff8..c2729fa 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -16,6 +16,7 @@ # + Name: xine-lib # %bcond_with = default off # %bcond_without = default on @@ -144,6 +145,8 @@ Provides: libxine2-xvmc = %{version}-%{release} Obsoletes: libxine2-xvmc < %{version}-%{release} Provides: libxine2-dvb = %{version}-%{release} Obsoletes: libxine2-dvb < %{version}-%{release} +Provides: %{name} = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} Recommends: libxine2-codecs = %{version} Recommends: opensuse-codecs-installer @@ -200,6 +203,8 @@ Obsoletes: libxine2-devel < %{version}-%{release} Provides: libxine2-devel = %{version}-%{release} Obsoletes: xine-lib2-devel < %{version}-%{release} Provides: xine-lib2-devel = %{version}-%{release} +Obsoletes: xine-devel < %{version}-%{release} +Provides: xine-devel = %{version}-%{release} %description -n libxine-devel This package contains all necessary include files, libraries and @@ -249,6 +254,7 @@ Autoren: Guenter Bartsch %if %{with pulseaudio} + %package -n libxine2-pulse Summary: Pulseaudio plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain @@ -276,6 +282,7 @@ Autoren: %endif %if %{with sdl} + %package -n libxine2-sdl Summary: SDL plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain @@ -302,6 +309,7 @@ Autoren: %endif %if %{with aalib} + %package -n libxine2-aa Summary: Aalib and libcaca plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain @@ -328,6 +336,7 @@ Autoren: %endif %if %{with esd} + %package -n libxine2-esd Summary: Esd plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain @@ -354,6 +363,7 @@ Autoren: %endif %if %{with jack} + %package -n libxine2-jack Summary: Jack plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain @@ -380,6 +390,7 @@ Autoren: %endif %if %{with directfb} + %package -n libxine2-directfb Summary: Directfb plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain @@ -406,6 +417,7 @@ Autoren: %endif %if %{with gnome_vfs} + %package -n libxine2-gnome-vfs Summary: Gnome-vfs plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain @@ -420,6 +432,7 @@ Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen %endif %if !%{with distributable} + %package -n libxine2-codecs # these libs are possibly illegal and may not work without libdvdcss anyway Summary: Xine plugins for watching DVDs, DivX and more @@ -556,6 +569,8 @@ LIB="%{buildroot}%{_libdir}/xine/plugins/%{abiversion}" #install -m 0644 %{SOURCE1} COPYING AUTHORS %{buildroot}%{_defaultdocdir}/xine/ # remove usless READMEs rm %{buildroot}%{_defaultdocdir}/xine/README.{irix,solaris,WIN32} +# remove .la files, they are evil +rm %{buildroot}%{_libdir}/*.la %ifarch %{ix86} mkdir -p %{buildroot}/usr/lib/win32 %endif @@ -757,6 +772,7 @@ rm -rf %{buildroot}%{_mandir}/man5 rm -rf %{buildroot} %if !%{with onlynondistributable} + %post -n libxine2 -p /sbin/ldconfig %postun -n libxine2 -p /sbin/ldconfig @@ -787,36 +803,43 @@ rm -rf %{buildroot} %endif %if %{with pulseaudio} + %files -n libxine2-pulse -f files.pulse %defattr(-,root,root,0755) %endif %if %{with sdl} + %files -n libxine2-sdl -f files.sdl %defattr(-,root,root,0755) %endif %if %{with esd} + %files -n libxine2-esd -f files.esd %defattr(-,root,root,0755) %endif %if %{with jack} + %files -n libxine2-jack -f files.jack %defattr(-,root,root,0755) %endif %if %{with aalib} + %files -n libxine2-aa -f files.aalib %defattr(-,root,root,0755) %endif %if %{with directfb} + %files -n libxine2-directfb -f files.directfb %defattr(-,root,root,0755) %endif %if %{with gnome_vfs} + %files -n libxine2-gnome-vfs -f files.gnome-vfs %defattr(-,root,root,0755) %endif @@ -826,15 +849,14 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/xine-config.1.gz /usr/bin/xine-config %{_libdir}/pkgconfig/libxine.pc -%{_libdir}/libxine.la %{_libdir}/libxine.so -%{_libdir}/libxine-interface.la /usr/share/aclocal/xine.m4 /usr/include/xine /usr/include/xine.h %endif # onlynondistributable %if !%{with distributable} + %files -n libxine2-codecs -f files.codecs %defattr(-,root,root) %dir %{_libdir}/xine