rpms/emelfm2/devel emelfm2-0.5.1-nostrip.patch, NONE, 1.1 emelfm2.spec, 1.34, 1.35

[Christoph Wickert]

Author: cwickert

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

Modified Files:
	emelfm2.spec 
Added Files:
	emelfm2-0.5.1-nostrip.patch 
Log Message:
* 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)


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)


Index: emelfm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/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 01:05:23 -0000	1.35
@@ -6,7 +6,7 @@
 
 Name:           emelfm2
 Version:        0.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File manager that implements the popular two-pane design
 
 Group:          Applications/File
@@ -14,6 +14,7 @@ License:        GPLv3+
 URL:            http://emelfm2.net/
 Source0:        http://emelfm2.net/rel/%{name}-%{version}.tar.bz2
 Patch0:         emelfm2-0.5.1-Makefile.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
@@ -33,17 +34,19 @@ opening an xterm.
 %prep
 %setup -q
 %patch0 -p0 -b .docdir
+%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 \
@@ -88,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 	
 %changelog
+* 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