Author: sls Date: Wed Nov 28 06:20:13 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fixing FHS issues in another way
- splitted package -plugins-encoders into -plugins-encders-{perl,python}
- added defined_python_plugins_dir.patch
- more TODO
---- Files affected:
SPECS:
LiVES.spec (1.45 -> 1.46)
---- Diffs:
================================================================
Index: SPECS/LiVES.spec
diff -u SPECS/LiVES.spec:1.45 SPECS/LiVES.spec:1.46
--- SPECS/LiVES.spec:1.45 Mon Nov 26 18:19:15 2007
+++ SPECS/LiVES.spec Wed Nov 28 07:20:08 2007
@@ -7,6 +7,8 @@
# - check -plugins-* descriptions
# - build with OSC support
(http://www.cnmat.berkeley.edu/OpenSoundControl/index.html)
# - build with frei0r support (www.piksel.org/frei0r)
+# - create spec for http://www.flyn.org/projects/qtutils/index.html and
package qtutils_encoder
+# - create spec for http://sswf.sourceforge.net and package sswf_encoder
# Conditional build:
%bcond_without sdl # build without SDL plugin
@@ -21,7 +23,7 @@
Summary(pl.UTF-8): LiVES - Linuksowy System Edycji Video
Name: LiVES
Version: 0.9.8.6
-Release: 0.3
+Release: 0.4
License: GPL v3
Group: X11/Applications/Multimedia
Source0:
http://www.xs4all.nl/%7Esalsaman/lives/current/%{name}-%{version}.tar.bz2
@@ -30,6 +32,7 @@
Patch0: %{name}-FHS.patch
Patch1: %{name}-automake.patch
Patch2: %{name}-without_sdl.patch
+Patch3: %{name}-defined_python_plugins_dir.patch
URL: http://www.xs4all.nl/~salsaman/lives/
%{?with_sdl:BuildRequires: SDL-devel}
BuildRequires: autoconf >= 2.57
@@ -47,13 +50,10 @@
BuildRequires: pkgconfig
BuildRequires: sed >= 4.0
BuildRequires: xorg-util-imake
-Requires: ffmpeg
Requires: ogmtools
-Requires: perl-base
Requires: python >= 1:2.3
# required either mplayer or sox
Requires: sox
-Requires: transcode
Suggests: ImageMagick >= 5
Suggests: cdda2wav
Suggests: dbgrab
@@ -64,10 +64,7 @@
Suggests: %{name}-plugins-rendered = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# workaround for the next change
-%define _localedir %{_usr}/share/locale
-# platform-dependent plugins in %{_datadir}
-%define _datadir %{_libdir}
+%define python_plugins_dir %{_datadir}/%{_sname}/plugins/python/
%define _themesdir %{_datadir}/%{_sname}/themes
# shared objects without .so (e.g. SDL), which we don't want to provide
%define _noautoprovfiles ^%{_datadir}/%{_sname}/.*
@@ -89,7 +86,8 @@
Summary(pl.UTF-8): Wtyczki dla LiVES (metapakiet)
Group: X11/Applications/Multimedia
Requires: %{name} = %{version}-%{release}
-Requires: %{name}-plugins-encoders = %{version}-%{release}
+Requires: %{name}-plugins-encoders-perl = %{version}-%{release}
+Requires: %{name}-plugins-encoders-python = %{version}-%{release}
Requires: %{name}-plugins-playback = %{version}-%{release}
Requires: %{name}-plugins-rendered = %{version}-%{release}
Requires: %{name}-plugins-RFXscripts = %{version}-%{release}
@@ -101,17 +99,38 @@
%description plugins -l pl.UTF-8
Wtyczki (plugins) dla LiVES (metapakiet).
-%package plugins-encoders
-Summary: Encoders plugins for LiVES
-Summary(pl.UTF-8): Wtyczki kodujące dla LiVES
+%package plugins-encoders-perl
+Summary: Perl encoders plugins for LiVES
+Summary(pl.UTF-8): Perlowe wtyczki kodujące dla LiVES
Group: X11/Applications/Multimedia
Requires: %{name} = %{version}-%{release}
+Requires: ImageMagick > 5
+Requires: dv
+Requires: ffmpeg
+Requires: ghostscript
+Requires: mjpegtools
+Requires: perl-base
+Requires: transcode
+Requires: vorbis-tools
+
+%description plugins-encoders-perl
+Perl encoders plugins for LiVES.
-%description plugins-encoders
-Encoders plugins for LiVES.
+%description plugins-encoders-perl -l pl.UTF-8
+Perlowe wtyczki (plugins) kodujące dla LiVES.
-%description plugins-encoders -l pl.UTF-8
-Wtyczki (plugins) kodujące dla LiVES.
+%package plugins-encoders-python
+Summary: Pythonowe encoders plugins for LiVES
+Summary(pl.UTF-8): Pythonowe wtyczki kodujące dla LiVES
+Group: X11/Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: python
+
+%description plugins-encoders-python
+Python encoders plugins for LiVES.
+
+%description plugins-encoders-python -l pl.UTF-8
+Pythonowe wtyczki (plugins) kodujące dla LiVES.
%package plugins-playback
Summary: Playback plugins for LiVES
@@ -130,6 +149,7 @@
Summary(pl.UTF-8): Wtyczki rendered dla LiVES
Group: X11/Applications/Multimedia
Requires: %{name} = %{version}-%{release}
+Requires: ImageMagick >= 5
%description plugins-rendered
Rendered plugins for LiVES.
@@ -178,19 +198,18 @@
%patch0 -p1
%patch1 -p1
%{!?with_sdl:%patch2 -p1}
+%patch3 -p1
-# wrrr
-sed -i -e 's,/share/,/%{_lib}/,' po/pxgettext po/make_rfx_builtin_list.pl
+sed -i -e "#^PYTHON_PLUGINS_DIR#s#^.*#PYTHON_PLUGINS_DIR =
%{python_plugins_dir}/#" \
+ lives-plugins/plugins/encoders/multi_encoder
%build
%{__aclocal} -I m4
%{__autoconf}
%{__automake}
-# hack: DATADIRNAME defined too late in configure
%configure \
%{!?with_dvgrab:--disable-dvgrab} \
- %{!?with_sdl:--disable-sdl} \
- DATADIRNAME=share
+ %{!?with_sdl:--disable-sdl}
%{__make} \
CFLAGS="%{rpmcflags} -fPIC"
@@ -203,10 +222,9 @@
./build-lives-rfx-plugin $i
$RPM_BUILD_ROOT%{_datadir}/lives/plugins/effects/rendered
done
-# hack: override localedir because of redefined datadir
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- localedir=%{_localedir}
+ marcosencodersdir=%{python_plugins_dir} \
+ DESTDIR=$RPM_BUILD_ROOT
install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
mv $RPM_BUILD_ROOT%{_docdir}/%{_sname}-%{version} \
@@ -224,25 +242,21 @@
%defattr(644,root,root,755)
%doc AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED NEWS RFX OMC
%attr(755,root,root) %{_bindir}/autolives.pl
-%attr(755,root,root) %{_bindir}/avi_encoder.py
%attr(755,root,root) %{_bindir}/build-lives-rfx-plugin
%attr(755,root,root) %{_bindir}/build-lives-rfx-plugin-multi
-%attr(755,root,root) %{_bindir}/dirac_encoder.py
-%attr(755,root,root) %{_bindir}/gif_encoder.py
%attr(755,root,root) %{_bindir}/lives
%attr(755,root,root) %{_bindir}/lives-exe
%attr(755,root,root) %{_bindir}/midistart
%attr(755,root,root) %{_bindir}/midistop
-%attr(755,root,root) %{_bindir}/mkv_encoder.py
-%attr(755,root,root) %{_bindir}/mng_encoder.py
-%attr(755,root,root) %{_bindir}/mpeg_encoder.py
-%attr(755,root,root) %{_bindir}/ogm_encoder.py
%attr(755,root,root) %{_bindir}/sendOSC
%attr(755,root,root) %{_bindir}/smogrify
-%attr(755,root,root) %{_bindir}/theora_encoder.py
%dir %{_datadir}/%{_sname}
%dir %{_datadir}/%{_sname}/plugins
%dir %{_datadir}/%{_sname}/plugins/effects
+%dir %{_datadir}/%{_sname}/plugins/encoders
+%dir %{_libdir}/%{_sname}
+%dir %{_libdir}/%{_sname}/plugins
+%dir %{_libdir}/%{_sname}/plugins/effects
%{_datadir}/%{_sname}/icons
%{_datadir}/%{_sname}/default.keymap
%{_desktopdir}/%{name}.desktop
@@ -262,17 +276,29 @@
%files plugins
%defattr(644,root,root,755)
-%files plugins-encoders
+%files plugins-encoders-perl
%defattr(644,root,root,755)
-%dir %{_datadir}/%{_sname}/plugins/encoders
-%attr(755,root,root) %{_datadir}/%{_sname}/plugins/encoders/*
+%attr(755,root,root) %{_datadir}/%{_sname}/plugins/encoders/encodedv_encoder
+%attr(755,root,root) %{_datadir}/%{_sname}/plugins/encoders/ffmpeg_encoder
+%attr(755,root,root) %{_datadir}/%{_sname}/plugins/encoders/mencoder_encoder
+%attr(755,root,root) %{_datadir}/%{_sname}/plugins/encoders/mjpegtools_encoder
+%attr(755,root,root) %{_datadir}/%{_sname}/plugins/encoders/pdf_encoder
+#%attr(755,root,root) %{_datadir}/%{_sname}/plugins/encoders/qtutils_encoder
+#%attr(755,root,root) %{_datadir}/%{_sname}/plugins/encoders/sswf_encoder
+%attr(755,root,root) %{_datadir}/%{_sname}/plugins/encoders/transcode_encoder
+
+
+%files plugins-encoders-python
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_datadir}/%{_sname}/plugins/encoders/multi_encoder
+%attr(755,root,root) %{python_plugins_dir}
%files plugins-playback
%defattr(644,root,root,755)
-%dir %{_datadir}/%{_sname}/plugins/playback
-%dir %{_datadir}/%{_sname}/plugins/playback/video
-%{?with_sdl:%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/playback/video/SDLp}
-%{?with_mjpeg:%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/playback/video/yuv4mpeg_stream}
+%dir %{_libdir}/%{_sname}/plugins/playback
+%dir %{_libdir}/%{_sname}/plugins/playback/video
+%{?with_sdl:%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/playback/video/SDLp}
+%{?with_mjpeg:%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/playback/video/yuv4mpeg_stream}
%files plugins-rendered
%defattr(644,root,root,755)
@@ -285,41 +311,41 @@
%attr(755,root,root) %{_datadir}/%{_sname}/plugins/effects/RFXscripts/*.script
%files plugins-weed
-%dir %{_datadir}/%{_sname}/plugins/effects/realtime
-%dir %{_datadir}/%{_sname}/plugins/effects/realtime/weed
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/alien_overlay.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/audio_volume.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/blurzoom.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/bump2d.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/ccorrect.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/colorkey.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/compositor.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/deinterlace.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/edge.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/fg_bg_removal.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/fireTV.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/gdk_fast_resize.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/haip.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/layout_blends.wo
-%{?with_libvisual:%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/libvis.wo}
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/lifeTV.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/mirrors.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/multi_blends.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/negate.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/noise.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/onedTV.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/plasma.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/posterise.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/rippleTV.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/rotozoom.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/simple_blend.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/slide_over.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/targeted_zoom.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/textfun.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/vertigo.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/videowall.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/warpTV.wo
-%attr(755,root,root)
%{_datadir}/%{_sname}/plugins/effects/realtime/weed/xeffect.wo
+%dir %{_libdir}/%{_sname}/plugins/effects/realtime
+%dir %{_libdir}/%{_sname}/plugins/effects/realtime/weed
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/alien_overlay.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/audio_volume.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/blurzoom.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/bump2d.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/ccorrect.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/colorkey.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/compositor.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/deinterlace.wo
+%attr(755,root,root) %{_libdir}/%{_sname}/plugins/effects/realtime/weed/edge.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/fg_bg_removal.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/fireTV.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/gdk_fast_resize.wo
+%attr(755,root,root) %{_libdir}/%{_sname}/plugins/effects/realtime/weed/haip.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/layout_blends.wo
+%{?with_libvisual:%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/libvis.wo}
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/lifeTV.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/mirrors.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/multi_blends.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/negate.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/noise.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/onedTV.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/plasma.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/posterise.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/rippleTV.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/rotozoom.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/simple_blend.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/slide_over.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/targeted_zoom.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/textfun.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/vertigo.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/videowall.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/warpTV.wo
+%attr(755,root,root)
%{_libdir}/%{_sname}/plugins/effects/realtime/weed/xeffect.wo
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -327,6 +353,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.46 2007-11-28 06:20:08 sls
+- fixing FHS issues in another way
+- splitted package -plugins-encoders into -plugins-encders-{perl,python}
+- added defined_python_plugins_dir.patch
+- more TODO
+
Revision 1.45 2007-11-26 17:19:15 sls
- Suggests: xorg-app-xset
- sorted Suggests
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/LiVES.spec?r1=1.45&r2=1.46&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
