rpms/emelfm2/F-11 emelfm2-0.5.1-nostrip.patch, NONE, 1.1 emelfm2-0.6.0-fix-segfault-on-upgrade.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 emelfm2.spec, 1.34, 1.35 sources, 1.19, 1.20 emelfm2-0.4-hal_flags.patch, 1.1, NONE emelfm2-0.5.1-Makefile.patch, 1.1, NONE

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/emelfm2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17510

Modified Files:
	.cvsignore emelfm2.spec sources 
Added Files:
	emelfm2-0.5.1-nostrip.patch 
	emelfm2-0.6.0-fix-segfault-on-upgrade.patch 
Removed Files:
	emelfm2-0.4-hal_flags.patch emelfm2-0.5.1-Makefile.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.5.1-nostrip.patch:

--- NEW FILE emelfm2-0.5.1-nostrip.patch ---
diff -up emelfm2-0.5.1/Makefile~ emelfm2-0.5.1/Makefile
--- emelfm2-0.5.1/Makefile~	2009-02-12 05:47:20.000000000 +0200
+++ emelfm2-0.5.1/Makefile	2009-05-08 21:23:02.000000000 +0300
@@ -315,10 +315,6 @@ clean_plugins:
 $(TARGET): $(OBJECTS)
 	@echo "linking binary '$(TARGET)'"
 	@$(CC) $(LDFLAGS) $(OBJECTS) -o $(TARGET) -Wl,--as-needed $(lLIBS)
-ifneq ($(DEBUG), 1)
-	@echo "stripping binary '$(TARGET)'"
-	@strip $(TARGET)
-endif
 
 $(OBJECTS): $(OBJECTS_DIR)/%.o: %.c
 	@echo "compiling '$*.c'"
@@ -327,37 +323,22 @@ $(OBJECTS): $(OBJECTS_DIR)/%.o: %.c
 $(LIBS_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
 	@echo "compiling '$*.c'"
 	@$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(LDFLAGS) -o $@ $*.c
-ifneq ($(DEBUG), 1)
-	@strip -g $@
-endif
 
 $(THUMBS_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
 	@echo "compiling '$*.c'"
 	@$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(THUMBS_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(THUMBS_LIBS)
-ifneq ($(DEBUG), 1)
-	@strip -g $@
-endif
 
 $(ACL_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
 	@echo "compiling '$*.c'"
 	@$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(ACL_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(ACL_LIBS)
-ifneq ($(DEBUG), 1)
-	@strip -g $@
-endif
 
 $(TRACKER_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
 	@echo "compiling '$*.c'"
 	@$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(TRACKER_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(TRACKER_LIBS)
-ifneq ($(DEBUG), 1)
-	@strip -g $@
-endif
 
 $(VFS_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
 	@echo "compiling '$*.c'"
 	@$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(VFS_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(VFS_LIBS)
-ifneq ($(DEBUG), 1)
-	@strip -g $@
-endif
 
 deps: $(DEP_FILES) #UNUSED $(LIB_DEP_FILES)
 $(DEP_FILES): $(OBJECTS_DIR)

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/F-11/.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 03:25:19 -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/F-11/emelfm2.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- emelfm2.spec	1 Mar 2009 20:20:05 -0000	1.34
+++ emelfm2.spec	9 May 2009 03:25:19 -0000	1.35
@@ -5,7 +5,7 @@
 # rpmbuild -ba emelfm2.spec --with hal
 
 Name:           emelfm2
-Version:        0.5.1
+Version:        0.6.0
 Release:        1%{?dist}
 Summary:        File manager that implements the popular two-pane design
 
@@ -13,7 +13,8 @@ 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)
 
 BuildRequires:  gtk2-devel >= 2.6.0, libacl-devel, gettext, desktop-file-utils
@@ -32,21 +33,25 @@ 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
 sed -i 's!Icon=emelfm2!Icon=%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
 
+# get more useful build logs (verify CFLAGS etc)
+sed -i 's!^\(\t\+\)@!\1!' Makefile
 
 %build
 make %{?_smp_mflags} \
-    OPTIMIZE="${RPM_OPT_FLAGS}" \
     CFLAGS="${RPM_OPT_FLAGS}" \
     PREFIX="%{_prefix}" \
-    PLUGINS_DIR="%{_libdir}/%{name}/plugins"
+    PLUGINS_DIR="%{_libdir}/%{name}/plugins" \
     DOCS_VERSION=1 \
     WITH_TRANSPARENCY=1 \
     WITH_KERNELFAM=1 \
+    WITH_TRACKER=1 \
     USE_LATEST=1 \
     NEW_COMMAND=1 \
     %if 0%{?_with_hal:1}
@@ -88,6 +93,14 @@ 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)
+
 * Wed Feb 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-1
 - Update 0.5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-11/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 03:25:19 -0000	1.20
@@ -1 +1 @@
-f97784e465b0c29685e057052ca39a18  emelfm2-0.5.1.tar.bz2
+c153749aea954f342b28a470866ac4b0  emelfm2-0.6.0.tar.bz2


--- emelfm2-0.4-hal_flags.patch DELETED ---


--- emelfm2-0.5.1-Makefile.patch DELETED ---