rpms/emelfm2/F-12 emelfm2-0.7.0-e2p_upgrade-fix.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 emelfm2.spec, 1.43, 1.44 sources, 1.22, 1.23

Christoph Wickert cwickert at fedoraproject.org
Sun Nov 22 17:46:09 UTC 2009


Author: cwickert

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

Modified Files:
	.cvsignore emelfm2.spec sources 
Added Files:
	emelfm2-0.7.0-e2p_upgrade-fix.patch 
Log Message:
* Sun Nov 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.0-1
- Update to 0.7.0


emelfm2-0.7.0-e2p_upgrade-fix.patch:
 e2p_upgrade.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE emelfm2-0.7.0-e2p_upgrade-fix.patch ---
--- emelfm2-0.7.0/plugins/e2p_upgrade.c.orig	2009-11-20 00:17:09.000000000 +0100
+++ emelfm2-0.7.0/plugins/e2p_upgrade.c	2009-11-20 00:17:46.000000000 +0100
@@ -190,7 +190,7 @@
 		g_free (command);
 	}
 	else
-		cancelled = TRUE
+		cancelled = TRUE;
 }
 #endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	20 Jul 2009 01:07:58 -0000	1.22
+++ .cvsignore	22 Nov 2009 17:46:08 -0000	1.23
@@ -1 +1 @@
-emelfm2-0.6.2.tar.bz2
+emelfm2-0.7.0.tar.bz2


Index: emelfm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/emelfm2.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- emelfm2.spec	24 Jul 2009 22:07:33 -0000	1.43
+++ emelfm2.spec	22 Nov 2009 17:46:09 -0000	1.44
@@ -5,14 +5,15 @@
 # rpmbuild -ba emelfm2.spec --with hal
 
 Name:           emelfm2
-Version:        0.6.2
-Release:        3%{?dist}
+Version:        0.7.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.7.0-e2p_upgrade-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0, libacl-devel, gettext, desktop-file-utils
@@ -24,6 +25,9 @@ Requires:       hal
 %endif
 
 %if 0%{?fedora} > 10
+# only available in Fedora >= 11
+BuildRequires:  gtkspell-devel >= 2.0.14
+# Fedora 11 uses DeviceKit
 BuildRequires:  dbus-glib-devel
 Requires:       DeviceKit-disks
 %endif
@@ -37,6 +41,7 @@ opening an xterm.
 
 %prep
 %setup -q
+%patch0 -p1 -b .orig
 
 # fix broken icon in emelfm2.desktop
 sed -i 's!Icon=emelfm2!Icon=%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
@@ -56,9 +61,15 @@ make %{?_smp_mflags} \
     USE_LATEST=1 \
     NEW_COMMAND=1 \
     WITH_ACL=1 \
+    WITH_POLKIT=1 \
+    WITH_CUSTOMMOUSE=1 \
     STRIP=0 \
     %if 0%{?fedora} > 10
     WITH_DEVKIT=1 \
+    EDITOR_SPELLCHECK=1 \
+    %endif
+    %if 0%{?fedora} > 11
+    WITH_POLKIT=1 \
     %endif
     %if 0%{?_with_hal:1}
       WITH_HAL=1 \
@@ -96,8 +107,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}
 %{_mandir}/man1/emelfm2.1.gz
 
-	
+
 %changelog
+* Sun Nov 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.0-1
+- Update to 0.7.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	20 Jul 2009 01:07:58 -0000	1.22
+++ sources	22 Nov 2009 17:46:09 -0000	1.23
@@ -1 +1 @@
-fb07ef7abcf53854972b10d53bc31126  emelfm2-0.6.2.tar.bz2
+77899d801915da87c5be40763d345bc6  emelfm2-0.7.0.tar.bz2




More information about the fedora-extras-commits mailing list