Author: freetz Date: Sun Jul 3 07:48:25 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- crash circular build dependency (gstreamer bcond for bootstrap)
---- Files affected:
SPECS:
swfdec.spec (1.35 -> 1.36)
---- Diffs:
================================================================
Index: SPECS/swfdec.spec
diff -u SPECS/swfdec.spec:1.35 SPECS/swfdec.spec:1.36
--- SPECS/swfdec.spec:1.35 Sun May 22 12:34:29 2005
+++ SPECS/swfdec.spec Sun Jul 3 09:48:20 2005
@@ -1,4 +1,8 @@
# $Revision$, $Date$
+# Conditional build:
+%bcond_without gstreamer # build without gstreamer/mozilla plugin
+# (for bootstrap)
+#
Summary: Flash animations redering library
Summary(pl): Biblioteka renderująca animacje flash
Name: swfdec
@@ -14,16 +18,18 @@
BuildRequires: autoconf >= 2.58
BuildRequires: automake >= 1.6
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
+%endif
BuildRequires: gtk+2-devel >= 1:2.1.2
BuildRequires: libart_lgpl-devel >= 2.0
BuildRequires: libmad-devel >= 0.14.2b
BuildRequires: liboil-devel >= 0.3.0
BuildRequires: libtool
-BuildRequires: mozilla-devel >= 2:1.0
+%{?with_gstreamer:BuildRequires: mozilla-devel >= 2:1.0}
BuildRequires: pkgconfig
BuildRequires: zlib-devel >= 1.1.4
Obsoletes: libswfdec0
@@ -105,7 +111,9 @@
%{__autoheader}
%{__autoconf}
%{__automake}
-%configure
+%configure \
+ %{?!with_gstreamer:--disable-mozilla-plugin}
+
%{__make} \
gimpdir=%{gimpplugindir}
@@ -148,9 +156,11 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{gimpplugindir}/swf
+%if %{with gstreamer}
%files -n mozilla-plugin-%{name}
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/mozilla/plugins/libswfdecmozilla.so
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -158,6 +168,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.36 2005/07/03 07:48:20 freetz
+- crash circular build dependency (gstreamer bcond for bootstrap)
+
Revision 1.35 2005/05/22 10:34:29 qboosh
- updated to 0.3.5 (patch release), updated configure patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/swfdec.spec?r1=1.35&r2=1.36&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
