From cb2113434d56ec2c9081d2ac9418ccb6d3273688 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Jan 15 2014 16:35:13 +0000 Subject: remove glib-2.39 fix --- diff --git a/caja.spec b/caja.spec index d25f506..e90c24b 100644 --- a/caja.spec +++ b/caja.spec @@ -37,7 +37,6 @@ Patch1: caja_allow-dropping-files-to-bookmarks.patch Patch2: caja_rearranged-caja-sidebar-to-1.4-style.patch Patch3: caja_x-caja-window-debug.patch Patch4: caja_x-caja-window-surpress.patch -Patch5: caja_build-fix-for-glib2-39.2.patch BuildRequires: mate-desktop-devel BuildRequires: libSM-devel @@ -126,7 +125,6 @@ sed -i -e 's,Exec=caja -n,Exec=/usr/bin/caja-autostart,g' data/caja.desktop.in.i %patch2 -p1 -b .1.4-style %patch3 -p1 -b .x-caja-windows %patch4 -p1 -b .surpress-x-caja-desktops -%patch5 -p1 -b .glib # needed for git snapshots #NOCONFIGURE=1 ./autogen.sh @@ -243,6 +241,7 @@ fi %changelog * Tue Jan 14 2014 Wolfgang Ulbrich - 1.7.1-1 - update to 1.7.1 +- remove glib-2.39 fix, already fixed in upstream * Tue Dec 17 2013 Wolfgang Ulbrich - 1.7.1-0.6.git20131201.0ef48fa - fix build against new glib2-39.2, 'g_memmove' is removed