rpms/emelfm2/devel emelfm2-0.6.0-fix-segfault-on-upgrade.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 emelfm2.spec, 1.35, 1.36 sources, 1.19, 1.20

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/emelfm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14093

Modified Files:
	.cvsignore emelfm2.spec sources 
Added Files:
	emelfm2-0.6.0-fix-segfault-on-upgrade.patch 
Log Message:
* Sat May 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.0-1
- Update 0.6.0
- Patch to fix segfault in e2_upgrade.so
- Enable the tracker plugin


emelfm2-0.6.0-fix-segfault-on-upgrade.patch:

--- NEW FILE emelfm2-0.6.0-fix-segfault-on-upgrade.patch ---
--- emelfm2-0.6.0.orig/plugins/e2p_upgrade.c	2009-05-05 18:01:17.000000000 +0200
+++ emelfm2-0.6.0/plugins/e2p_upgrade.c	2009-05-09 04:43:56.000000000 +0200
@@ -132,8 +132,8 @@
 		msg, _("update information"), DEFAULT_RESPONSE_CB, NULL);
 	e2_dialog_show (dialog, NULL, 0,
 		&yes_btn, &no_btn, NULL);
-//	gint choice = gtk_dialog_run (GTK_DIALOG (dialog));	//not a local loop as options not yet available
-	gint choice = e2_dialog_run_simple (dialog, NULL);
+	gint choice = gtk_dialog_run (GTK_DIALOG (dialog));	//not a local loop as options not yet available
+//	gint choice = e2_dialog_run_simple (dialog, NULL);
 	gtk_widget_destroy (dialog);
 	cancelled = (choice != GTK_RESPONSE_YES);
 	return choice;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	1 Mar 2009 17:53:53 -0000	1.19
+++ .cvsignore	9 May 2009 02:58:41 -0000	1.20
@@ -1 +1 @@
-emelfm2-0.5.1.tar.bz2
+emelfm2-0.6.0.tar.bz2


Index: emelfm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/emelfm2.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- emelfm2.spec	9 May 2009 01:05:23 -0000	1.35
+++ emelfm2.spec	9 May 2009 02:58:41 -0000	1.36
@@ -5,15 +5,15 @@
 # rpmbuild -ba emelfm2.spec --with hal
 
 Name:           emelfm2
-Version:        0.5.1
-Release:        2%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 Summary:        File manager that implements the popular two-pane design
 
 Group:          Applications/File
 License:        GPLv3+
 URL:            http://emelfm2.net/
 Source0:        http://emelfm2.net/rel/%{name}-%{version}.tar.bz2
-Patch0:         emelfm2-0.5.1-Makefile.patch
+Patch0:         emelfm2-0.6.0-fix-segfault-on-upgrade.patch
 Patch1:         emelfm2-0.5.1-nostrip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,7 +33,8 @@ opening an xterm.
 
 %prep
 %setup -q
-%patch0 -p0 -b .docdir
+#%patch0 -p0 -b .docdir
+%patch0 -p1 -b .segfault
 %patch1 -p1 -b .nostrip
 
 # fix broken icon in emelfm2.desktop
@@ -50,6 +51,7 @@ make %{?_smp_mflags} \
     DOCS_VERSION=1 \
     WITH_TRANSPARENCY=1 \
     WITH_KERNELFAM=1 \
+    WITH_TRACKER=1 \
     USE_LATEST=1 \
     NEW_COMMAND=1 \
     %if 0%{?_with_hal:1}
@@ -91,6 +93,11 @@ rm -rf $RPM_BUILD_ROOT
 
 	
 %changelog
+* Sat May 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.0-1
+- Update 0.6.0
+- Patch to fix segfault in e2_upgrade.so
+- Enable the tracker plugin
+
 * Fri May  8 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.5.1-2
 - Patch to not strip binaries before rpmbuild creates the -debuginfo subpackage (#499885)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	1 Mar 2009 17:53:53 -0000	1.19
+++ sources	9 May 2009 02:58:41 -0000	1.20
@@ -1 +1 @@
-f97784e465b0c29685e057052ca39a18  emelfm2-0.5.1.tar.bz2
+c153749aea954f342b28a470866ac4b0  emelfm2-0.6.0.tar.bz2