[entangle] Update to 0.3.0 release

[Daniel P. Berrange]

commit 4e560b981a6691d60f50bec715bdec0f4e60ecd9
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Mon Nov 28 22:49:44 2011 +0000

    Update to 0.3.0 release

 entangle-0.2.0-controls-empty.patch   |  194 ---------------------------------
 entangle-0.2.0-disconnect-crash.patch |  126 ---------------------
 entangle-0.2.0-sealed.patch           |  110 -------------------
 entangle.spec                         |   68 +++--------
 sources                               |    2 +-
 5 files changed, 20 insertions(+), 480 deletions(-)
---
diff --git a/entangle.spec b/entangle.spec
index 98d842c..464f8d1 100644
--- a/entangle.spec
+++ b/entangle.spec
@@ -1,47 +1,24 @@
 # -*- rpm-spec -*-
 
-%define with_introspection 0
-%define with_plugins 0
-
-%if 0%{?fedora} >= 14
-%define with_introspection 0
-%define with_plugins 0
-%endif
-
 Summary: Tethered shooting & control of digital cameras
 Name: entangle
-Version: 0.2.0
-Release: 6%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}%{?extra_release}
 License: GPLv3+
 Group: Applications/Multimedia
 Source: http://entangle-photo.org/download/sources/%{name}-%{version}.tar.gz
-Patch1: %{name}-%{version}-controls-empty.patch
-Patch2: %{name}-%{version}-sealed.patch
-Patch3: %{name}-%{version}-disconnect-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://entangle-photo.org/
 
-BuildRequires: glib2-devel >= 2.10.0
-BuildRequires: gtk2-devel >= 2.12.0
-BuildRequires: libgphoto2-devel >= 2.4.8
-BuildRequires: libglade2-devel >= 2.6.0
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+BuildRequires: glib2-devel >= 2.26.0
+BuildRequires: gtk3-devel >= 3.0
+BuildRequires: libgphoto2-devel >= 2.4.11
 BuildRequires: libgudev1-devel >= 145
-%else
-BuildRequires: hal-devel >= 0.5.10
-%endif
-BuildRequires: GConf2-devel >= 2.12.0
 BuildRequires: dbus-glib-devel >= 0.60
 BuildRequires: lcms-devel >= 1.18
-BuildRequires: /usr/bin/tpage
-%if %{with_introspection}
 BuildRequires: gobject-introspection-devel
-%endif
-%if %{with_plugins}
 BuildRequires: libpeas-devel >= 0.5.5
-%endif
-BuildRequires: startup-notification-devel >= 0.5
-BuildRequires: unique-devel >= 1.0.0
+BuildRequires: libgexiv2-devel >= 0.2.2
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -55,24 +32,10 @@ and 'hands off' shooting directly from the controlling computer.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 
-%if %{with_introspection}
-%define introspection_arg --enable-introspection
-%else
-%define introspection_arg --disable-introspection
-%endif
-%if %{with_plugins}
-%define plugins_arg --with-plugins
-%else
-%define plugins_arg --without-plugins
-%endif
-
-%configure %{introspection_arg} %{plugins_arg}
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -86,15 +49,22 @@ rm -fr %{buildroot}
 
 %post
 update-desktop-database %{_datadir}/applications
+glib-compile-schemas /usr/share/glib-2.0/schemas ||:
 
 %postun
 update-desktop-database %{_datadir}/applications
+glib-compile-schemas /usr/share/glib-2.0/schemas ||:
 
 %files
 %defattr(-, root, root)
 %doc README COPYING AUTHORS NEWS ChangeLog
 %{_bindir}/entangle
-%{_datadir}/%{name}/%{name}.glade
+%{_datadir}/%{name}/%{name}-camera-info.xml
+%{_datadir}/%{name}/%{name}-camera-manager.xml
+%{_datadir}/%{name}/%{name}-camera-picker.xml
+%{_datadir}/%{name}/%{name}-help-about.xml
+%{_datadir}/%{name}/%{name}-image-popup.xml
+%{_datadir}/%{name}/%{name}-preferences.xml
 %{_datadir}/%{name}/%{name}-16x16.png
 %{_datadir}/%{name}/%{name}-32x32.png
 %{_datadir}/%{name}/%{name}-48x48.png
@@ -111,17 +81,17 @@ update-desktop-database %{_datadir}/applications
 %{_datadir}/%{name}/sRGB.icc
 %{_datadir}/gtk-doc/html/Entangle
 %{_datadir}/applications/%{name}.desktop
-%if %{with_introspection}
+%{_datadir}/glib-2.0/schemas/org.entangle-photo.manager.gschema.xml
 %{_datadir}/gir-1.0/Entangle-0.1.gir
 %{_libdir}/girepository-1.0/Entangle-0.1.typelib
-%endif
-%if %{with_plugins}
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %dir %{_datadir}/%{name}/plugins
-%endif
 
 %changelog
+* Mon Nov 28 2011 Daniel P. Berrange <berrange at redhat.com> - 0.3.0-1
+- Update to 0.3.0 release
+
 * Tue Jun 28 2011 Daniel P. Berrange <berrange at redhat.com> - 0.2.0-6
 - Fix crash when disconnecting from camera
 
diff --git a/sources b/sources
index 036f13e..12d681b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17a15ce8636da72d6ab9ba46429ed8d2  entangle-0.2.0.tar.gz
+65518d89b4b71fa3088c41d834df442c  entangle-0.3.0.tar.gz