SPECS (AC-branch): swfdec.spec - merged from HEAD

baggins baggins at pld-linux.org
Mon May 15 23:41:14 CEST 2006


Author: baggins                      Date: Mon May 15 21:41:14 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   swfdec.spec (1.37.2.2 -> 1.37.2.3) 

---- Diffs:

================================================================
Index: SPECS/swfdec.spec
diff -u SPECS/swfdec.spec:1.37.2.2 SPECS/swfdec.spec:1.37.2.3
--- SPECS/swfdec.spec:1.37.2.2	Fri May  5 01:32:10 2006
+++ SPECS/swfdec.spec	Mon May 15 23:41:09 2006
@@ -1,42 +1,41 @@
 # $Revision$, $Date$
+#
 # Conditional build:
 %bcond_without	gstreamer	# build without gstreamer/mozilla plugin (for bootstrap)
 %bcond_without	gimp		# don't build gimp plugin
+%bcond_with	libart		# use libarg_lgpl instead of cairo
 #
 Summary:	Flash animations redering library
 Summary(pl):	Biblioteka renderująca animacje flash
 Name:		swfdec
-Version:	0.3.5
+Version:	0.3.6
 Release:	2
 License:	GPL
 Group:		Libraries
 Source0:	http://www.schleef.org/swfdec/download/%{name}-%{version}.tar.gz
-# Source0-md5:	cc40397d7784efee549fb7853b01cac3
-Patch0:		%{name}-configure.patch
+# Source0-md5:	bcfca3a8ce1d524ebf4d11fd511dedb8
 URL:		http://www.schleef.org/swfdec/
-BuildRequires:	SDL-devel >= 1.2.5
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake >= 1.6
+%{!?with_libart:BuildRequires:	cairo-devel >= 0.4.0}
 %{?with_gimp:BuildRequires:	gimp-devel >= 1:2.0.0}
 %if %{with gstreamer}
-BuildRequires:	gstreamer-devel >= 0.8.0
-BuildRequires:	gstreamer-GConf-devel >= 0.8.0
-# gstreamer-interfaces-0.8
-BuildRequires:	gstreamer-plugins-devel >= 0.8.0
+BuildRequires:	gstreamer-devel >= 0.10.0
+BuildRequires:	gstreamer-plugins-base-devel >= 0.10.0
 %endif
 BuildRequires:	gtk+2-devel >= 1:2.1.2
-BuildRequires:	libart_lgpl-devel >= 2.0
+%{?with_libart:BuildRequires:	libart_lgpl-devel >= 2.0}
 BuildRequires:	libmad-devel >= 0.14.2b
-BuildRequires:	liboil-devel >= 0.3.0
+BuildRequires:	liboil-devel >= 0.3.1.1
 BuildRequires:	libtool
-%{?with_gstreamer:BuildRequires:	mozilla-devel >= 2:1.0}
+BuildRequires:	mozilla-devel >= 2:1.0
 BuildRequires:	pkgconfig
 BuildRequires:	zlib-devel >= 1.1.4
 Obsoletes:	libswfdec0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{with gimp}
-%define		gimpplugindir	%(gimptool --gimpplugindir)/plug-ins
+%define		gimpplugindir	%(gimptool --gimpplugindir 2>/dev/null)/plug-ins
 %endif
 %define		_plugindir	%{_libdir}/browser-plugins
 
@@ -55,10 +54,11 @@
 Summary(pl):	Pliki nagłówkowe wymagane przez programy używające swfdec
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%{!?with_libart:Requires:	cairo-devel >= 0.4.0}
 Requires:	glib2-devel >= 2.0.0
-Requires:	libart_lgpl-devel >= 2.0
+%{?with_libart:Requires:	libart_lgpl-devel >= 2.0}
 Requires:	libmad-devel >= 0.14.2b
-Requires:	liboil-devel >= 0.3.0
+Requires:	liboil-devel >= 0.3.1.1
 Obsoletes:	libswfdec0-devel
 
 %description devel
@@ -121,7 +121,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -130,8 +129,9 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	%{!?with_gstreamer:--disable-mozilla-plugin}
-	
+	%{!?with_gstreamer:--disable-mozilla-plugin} \
+	%{?with_libart:--with-backend=libart}
+
 %{__make} \
 	gimpdir=%{gimpplugindir}
 
@@ -192,8 +192,11 @@
 
 %files
 %defattr(644,root,root,755)
-%doc TODO README Change*
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS ChangeLog NEWS README TODO
+%if %{with gstreamer}
+# TODO: move to base browser plugin package
+%attr(755,root,root) %{_bindir}/swfdec-mozilla-player
+%endif
 %attr(755,root,root) %{_libdir}/libswfdec-*.so.*.*
 %attr(755,root,root) %{_libdir}/gtk-2.0/2.*/loaders/*.so
 
@@ -214,11 +217,9 @@
 %attr(755,root,root) %{gimpplugindir}/swf
 %endif
 
-%if %{with gstreamer}
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_plugindir}/libswfdecmozilla.so
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -226,11 +227,20 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.37.2.2  2006/05/04 23:32:10  glen
+Revision 1.37.2.3  2006/05/15 21:41:09  baggins
+- merged from HEAD
+
+Revision 1.41  2006/05/04 23:33:36  glen
 - use browser plugins, rel 2
 
-Revision 1.37.2.1  2006/05/04 22:19:40  glen
-- correct macro parsing
+Revision 1.40  2006/05/04 21:41:19  glen
+- 2>/dev/null macro parsing
+
+Revision 1.39  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
+Revision 1.38  2006/01/14 17:17:31  qboosh
+- updated to 0.3.6 (ready for gstreamer 0.10.x), removed obsolete configure patch
 
 Revision 1.37  2005/09/05 15:31:40  freetz
 - gimp bcond
@@ -297,7 +307,7 @@
 Revision 1.17  2003/02/22 21:56:24  grzegol
 - updated to 0.2.1
 - updated configure patch
-- updated %%files
+- updated %files
 
 Revision 1.16  2003/01/28 13:21:03  wrobell
 - fixed build requirements (sdl is required to build the player)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/swfdec.spec?r1=1.37.2.2&r2=1.37.2.3&f=u



More information about the pld-cvs-commit mailing list