[entangle] Update to 0.2.0 release

[Daniel P. Berrange]

commit 1378617b75cb65c32716b1fd56a98258c16fd108
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Fri Sep 17 19:47:02 2010 +0100

    Update to 0.2.0 release

 .gitignore    |    1 +
 entangle.spec |   47 ++++++++++++++++++++---------------------------
 sources       |    2 +-
 3 files changed, 22 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f31f47e..e999053 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 x86_64
 entangle-?.?.?
 *.src.rpm
+
diff --git a/entangle.spec b/entangle.spec
index b654ed0..303b6ea 100644
--- a/entangle.spec
+++ b/entangle.spec
@@ -1,24 +1,20 @@
 # -*- rpm-spec -*-
 
 %define with_introspection 0
+%define with_plugins 0
 
-%if 0%{?fedora} >= 12
-%define with_introspection 1
-%endif
-%if 0%{?rhel} >= 6
+%if 0%{?fedora} >= 14
 %define with_introspection 1
+%define with_plugins 1
 %endif
 
 Summary: Tethered shooting & control of digital cameras
 Name: entangle
-Version: 0.1.0
-Release: 7%{?dist}
+Version: 0.2.0
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Multimedia
 Source: http://entangle-photo.org/download/sources/%{name}-%{version}.tar.gz
-Patch1: %{name}-%{version}-udev-crash.patch
-Patch2: %{name}-%{version}-gir-repo-version.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://entangle-photo.org/
 
@@ -37,7 +33,9 @@ BuildRequires: lcms-devel >= 1.18
 BuildRequires: /usr/bin/tpage
 %if %{with_introspection}
 BuildRequires: gobject-introspection-devel
-BuildRequires: gjs-devel
+%endif
+%if %{with_plugins}
+BuildRequires: libpeas-devel >= 0.5.5
 %endif
 BuildRequires: startup-notification-devel >= 0.5
 BuildRequires: unique-devel >= 1.0.0
@@ -54,29 +52,27 @@ and 'hands off' shooting directly from the controlling computer.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
 
 %if %{with_introspection}
-%define introspection_arg --enable-introspection --with-javascript
+%define introspection_arg --enable-introspection
 %else
-%define introspection_arg --disable-introspection --without-javascript
+%define introspection_arg --disable-introspection
+%endif
+%if %{with_plugins}
+%define plugins_arg --with-plugins
+%else
+%define plugins_arg --without-plugins
 %endif
 
-%configure %{introspection_arg}
+%configure %{introspection_arg} %{plugins_arg}
 make %{?_smp_mflags}
 
 %install
 rm -fr %{buildroot}
 
 %makeinstall
-chmod -x %{buildroot}%{_datadir}/entangle/plugins/*/*.cfg
-
-rm -f %{buildroot}%{_libdir}/entangle/plugins/*.a
-rm -f %{buildroot}%{_libdir}/entangle/plugins/*.la
-
 rm -rf %{buildroot}%{_datadir}/%{name}/website
 
 %clean
@@ -111,15 +107,12 @@ update-desktop-database %{_datadir}/applications
 %{_datadir}/applications/%{name}.desktop
 %if %{with_introspection}
 %{_datadir}/gir-1.0/Entangle-0.1.gir
-%{_datadir}/gir-1.0/GPhoto-2.0.gir
 %{_libdir}/girepository-1.0/Entangle-0.1.typelib
-%{_libdir}/girepository-1.0/GPhoto-2.0.typelib
-%dir %{_libdir}/entangle
-%dir %{_libdir}/entangle/plugins
-%{_libdir}/entangle/plugins/javascript.so
+%endif
+%if %{with_plugins}
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/plugins
 %dir %{_datadir}/%{name}/plugins
-%dir %{_datadir}/%{name}/plugins/javascript
-%{_datadir}/%{name}/plugins/javascript/plugin.cfg
 %endif
 
 %changelog
diff --git a/sources b/sources
index 101a2fd..036f13e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc8c42d8c20a7f99ee7f02a2df31106d  entangle-0.1.0.tar.gz
+17a15ce8636da72d6ab9ba46429ed8d2  entangle-0.2.0.tar.gz