rpms/emelfm2/F-12 .cvsignore, 1.25, 1.26 emelfm2.spec, 1.46, 1.47 sources, 1.25, 1.26

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/emelfm2/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1065/F-12

Modified Files:
	.cvsignore emelfm2.spec sources 
Log Message:
* Fri Jun 18 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.3-1
- Update to 0.7.3
- Add udisks support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	21 Dec 2009 14:36:59 -0000	1.25
+++ .cvsignore	18 Jun 2010 13:38:56 -0000	1.26
@@ -1 +1 @@
-emelfm2-0.7.1.tar.bz2
+emelfm2-0.7.3.tar.bz2


Index: emelfm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/emelfm2.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- emelfm2.spec	21 Dec 2009 13:54:52 -0000	1.46
+++ emelfm2.spec	18 Jun 2010 13:38:57 -0000	1.47
@@ -4,7 +4,7 @@
 %bcond_with hal
 
 Name:           emelfm2
-Version:        0.7.1
+Version:        0.7.3
 Release:        1%{?dist}
 Summary:        File manager that implements the popular two-pane design
 
@@ -12,23 +12,37 @@ Group:          Applications/File
 License:        GPLv3+
 URL:            http://emelfm2.net/
 Source0:        http://emelfm2.net/rel/%{name}-%{version}.tar.bz2
+Patch0:         emelfm2-0.7.1-dsofix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.6.0, libacl-devel, gettext, desktop-file-utils
+BuildRequires:  dbus-glib-devel
 BuildRequires:  file-devel
+BuildRequires:  gtk2-devel >= 2.6.0
+BuildRequires:  libacl-devel
+BuildRequires:  gettext
+BuildRequires:  desktop-file-utils
 Requires:       findutils >= 4.2, grep, sed, bzip2
 %if %{with hal}
 BuildRequires:  hal-devel, dbus-glib-devel
 Requires:       hal
 %endif
 
-%if 0%{?fedora} > 10
 # only available in Fedora >= 11
+%if 0%{?fedora} > 10
 BuildRequires:  gtkspell-devel >= 2.0.14
+%endif
+
+# Fedora 13 uses udisks
+%if 0%{?fedora} > 12
+BuildRequires:  udisks-devel
+Requires:       udisks
+%else
 # Fedora 11 uses DeviceKit
-BuildRequires:  dbus-glib-devel
+%if 0%{?fedora} > 10
+BuildRequires:  DeviceKit-disks-devel
 Requires:       DeviceKit-disks
 %endif
+%endif
 
 %description
 emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements 
@@ -39,6 +53,7 @@ opening an xterm.
 
 %prep
 %setup -q
+%patch0 -p1 -b .dsofix
 
 # fix broken icon in emelfm2.desktop
 sed -i 's!Icon=emelfm2!Icon=%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
@@ -107,6 +122,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 18 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.3-1
+- Update to 0.7.3
+- Add udisks support
+
+* Thu Feb 25 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.1-2
+- Add patch to fix DSO linking (#564729)
+
 * Mon Dec 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.1-1
 - Update to 0.7.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	21 Dec 2009 14:36:59 -0000	1.25
+++ sources	18 Jun 2010 13:38:57 -0000	1.26
@@ -1 +1 @@
-33d3861e23dbce5e2a0cb0e921f9109c  emelfm2-0.7.1.tar.bz2
+57873c6bb74e25cf661bc41d629dc138  emelfm2-0.7.3.tar.bz2