SPECS: LiVES.spec - kill unwanted Provides using _noautoprovfiles ...

qboosh qboosh at pld-linux.org
Wed Oct 26 12:16:20 CEST 2005


Author: qboosh                       Date: Wed Oct 26 10:16:20 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kill unwanted Provides using _noautoprovfiles
- move arch-dependent files to %{_libdir} (at the cost of having some
  arch-independent files there)

---- Files affected:
SPECS:
   LiVES.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/LiVES.spec
diff -u SPECS/LiVES.spec:1.19 SPECS/LiVES.spec:1.20
--- SPECS/LiVES.spec:1.19	Wed Oct 26 00:39:22 2005
+++ SPECS/LiVES.spec	Wed Oct 26 12:16:15 2005
@@ -1,24 +1,7 @@
 # $Revision$, $Date$
 
 # TODO
-# - fix erroneous deps:
-# There are more than one package which provide "SDL":
-# a) LiVES-plugins-0.9.5-0.pre3.1
-# b) SDL-1.2.9-1
-# $ rpm -qp dists/ac/PLD/i686/PLD/RPMS/LiVES-plugins-0.9.5-0.pre3.1.i686.rpm --provides
-# SDL
-# alien_overlay
-# fg_bg_removal
-# libvis
-# mirrors
-# negate
-# noise
-# posterise
-# simple_blend
-# xeffect
-# yuv4mpeg_stream
-# LiVES-plugins = 0:0.9.5-0.pre3.1
-
+# - some platform-independent left in %{_libdir}
 
 %define		_sname		lives
 %define		_pre		pre4
@@ -46,6 +29,7 @@
 BuildRequires:	libvisual-devel
 BuildRequires:	mjpegtools-devel
 BuildRequires:	pkgconfig
+BuildRequires:	sed >= 4.0
 Requires:	%{name}-plugins = %{version}-%{release}
 Requires:	ImageMagick >= 5
 Requires:	ffmpeg
@@ -57,7 +41,11 @@
 Requires:	transcode
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# platform-dependent plugins in %{_datadir}
+%define		_datadir	%{_libdir}
 %define		_themesdir	%{_datadir}/%{_sname}/themes
+# shared objects without .so (e.g. SDL), which we don't want to provide
+%define		_noautoprovfiles	^%{_datadir}/%{_sname}/.*
 
 %description
 LiVES began as the Linux Video Editing System. Since it now runs on
@@ -100,11 +88,16 @@
 %patch0 -p1
 %patch1 -p1
 
+# wrrr
+sed -i -e 's,/share/,/%{_lib}/,' po/pxgettext po/make_rfx_builtin_list.pl
+
 %build
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
-%configure
+# hack: DATADIRNAME defined too late in configure
+%configure \
+	DATADIRNAME=share
 %{__make} \
 	CFLAGS="%{rpmcflags} -fPIC"
 
@@ -116,8 +109,10 @@
 	./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
+	DESTDIR=$RPM_BUILD_ROOT \
+	localedir=%{_prefix}/share/locale
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 mv $RPM_BUILD_ROOT%{_docdir}/%{_sname}-%{version}-%{_pre} \
@@ -157,6 +152,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2005/10/26 10:16:15  qboosh
+- kill unwanted Provides using _noautoprovfiles
+- move arch-dependent files to %{_libdir} (at the cost of having some
+  arch-independent files there)
+
 Revision 1.19  2005/10/25 22:39:22  glen
 - imho wrong deps. please remove todo if it's not
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/LiVES.spec?r1=1.19&r2=1.20&f=u




More information about the pld-cvs-commit mailing list