diff --git a/entangle-0.5.3-raw-thumbnail-leak.patch b/entangle-0.5.3-raw-thumbnail-leak.patch deleted file mode 100644 index c43b692..0000000 --- a/entangle-0.5.3-raw-thumbnail-leak.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 26408199a928270524e96d0c46bfa93d33306b02 Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Fri, 30 Aug 2013 19:51:21 +0100 -Subject: [PATCH] Fix memory leak in generating image thumbnals - -Fix code for generating thumbnails from raw files to not leak -reference count on pixbuf. - -Signed-off-by: Daniel P. Berrange ---- - src/backend/entangle-pixbuf.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/backend/entangle-pixbuf.c b/src/backend/entangle-pixbuf.c -index 1489269..d62b6dc 100644 ---- a/src/backend/entangle-pixbuf.c -+++ b/src/backend/entangle-pixbuf.c -@@ -337,7 +337,6 @@ static GdkPixbuf *entangle_pixbuf_open_image_preview_raw(EntangleImage *image, - result = gdk_pixbuf_loader_get_pixbuf(loader); - - if (result) { -- g_object_ref(result); - if (applyOrientation) { - GdkPixbuf *tmp = entangle_pixbuf_auto_rotate(result, metadata); - g_object_unref(result); --- -1.8.3.1 - diff --git a/entangle.spec b/entangle.spec index c4acf46..cf30220 100644 --- a/entangle.spec +++ b/entangle.spec @@ -7,12 +7,11 @@ Summary: Tethered shooting & control of digital cameras Name: entangle -Version: 0.5.3 -Release: 2%{?dist}%{?extra_release} +Version: 0.5.4 +Release: 1%{?dist}%{?extra_release} License: GPLv3+ Group: Applications/Multimedia Source: http://entangle-photo.org/download/sources/%{name}-%{version}.tar.gz -Patch1: %{name}-%{version}-raw-thumbnail-leak.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://entangle-photo.org/ @@ -48,21 +47,19 @@ and 'hands off' shooting directly from the controlling computer. %prep %setup -q -%patch1 -p1 %build %if 0%{?enable_autotools} autoreconf -if %endif -%configure +%configure --disable-schemas-compile make %{?_smp_mflags} V=1 %install rm -fr %{buildroot} make install DESTDIR=$RPM_BUILD_ROOT -rm -rf %{buildroot}%{_datadir}/%{name}/website %find_lang %{name} %clean @@ -81,13 +78,13 @@ glib-compile-schemas /usr/share/glib-2.0/schemas ||: %doc README COPYING AUTHORS NEWS ChangeLog %{_bindir}/entangle %{_mandir}/man1/entangle.1* -%{_datadir}/%{name}/%{name}-camera-info.xml -%{_datadir}/%{name}/%{name}-camera-manager.xml -%{_datadir}/%{name}/%{name}-camera-picker.xml -%{_datadir}/%{name}/%{name}-camera-support.xml -%{_datadir}/%{name}/%{name}-help-about.xml -%{_datadir}/%{name}/%{name}-image-popup.xml -%{_datadir}/%{name}/%{name}-preferences.xml +%{_datadir}/%{name}/%{name}-camera-info.ui +%{_datadir}/%{name}/%{name}-camera-manager.ui +%{_datadir}/%{name}/%{name}-camera-picker.ui +%{_datadir}/%{name}/%{name}-camera-support.ui +%{_datadir}/%{name}/%{name}-help-about.ui +%{_datadir}/%{name}/%{name}-image-popup.ui +%{_datadir}/%{name}/%{name}-preferences-display.ui %{_datadir}/%{name}/%{name}-16x16.png %{_datadir}/%{name}/%{name}-32x32.png %{_datadir}/%{name}/%{name}-48x48.png @@ -109,6 +106,7 @@ glib-compile-schemas /usr/share/glib-2.0/schemas ||: %{_datadir}/%{name}/sRGB.icc %{_datadir}/gtk-doc/html/Entangle %{_datadir}/applications/%{name}.desktop +%{_datadir}/appdata/%{name}.appdata.xml %{_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 @@ -117,6 +115,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas ||: %dir %{_datadir}/%{name}/plugins %changelog +* Sun Dec 15 2013 Daniel P. Berrange - 0.5.4-1 +- Update to 0.5.4 release + * Fri Aug 30 2013 Daniel P. Berrange - 0.5.3-2 - Fix leak loading thumbnails from raw files diff --git a/sources b/sources index 2ca6073..fdac031 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -761c6bae31cb9d87ac3250675d663aae entangle-0.5.3.tar.gz +b0e2feacc82c305ef2d2f8b1a8db485d entangle-0.5.4.tar.gz