rpms/emelfm2/F-11 .cvsignore, 1.20, 1.21 emelfm2.spec, 1.35, 1.36 sources, 1.20, 1.21 emelfm2-0.5.1-nostrip.patch, 1.1, NONE emelfm2-0.6.0-fix-segfault-on-upgrade.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-serv5646

Modified Files:
	.cvsignore emelfm2.spec sources 
Removed Files:
	emelfm2-0.5.1-nostrip.patch 
	emelfm2-0.6.0-fix-segfault-on-upgrade.patch 
Log Message:
* Fri Jul 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.1-2
- Build with ACL plugin again, got dropped accidentially.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	9 May 2009 03:25:19 -0000	1.20
+++ .cvsignore	17 Jul 2009 16:00:37 -0000	1.21
@@ -1 +1 @@
-emelfm2-0.6.0.tar.bz2
+emelfm2-0.6.1.tar.bz2


Index: emelfm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-11/emelfm2.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- emelfm2.spec	9 May 2009 03:25:19 -0000	1.35
+++ emelfm2.spec	17 Jul 2009 16:00:37 -0000	1.36
@@ -5,25 +5,29 @@
 # rpmbuild -ba emelfm2.spec --with hal
 
 Name:           emelfm2
-Version:        0.6.0
-Release:        1%{?dist}
+Version:        0.6.1
+Release:        2%{?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.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
-Requires:       findutils >= 4.2, file, grep, sed, bzip2
+BuildRequires:  file-devel
+Requires:       findutils >= 4.2, grep, sed, bzip2
 %if 0%{?_with_hal:1}
 BuildRequires:  hal-devel, dbus-glib-devel
 Requires:       hal
 %endif
 
+%if 0%{?fedora} > 10
+BuildRequires:  dbus-glib-devel
+Requires:       DeviceKit-disks
+%endif
+
 %description
 emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements 
 the popular two-pane design. It features a simple GTK+2 interface, a flexible 
@@ -33,9 +37,6 @@ opening an xterm.
 
 %prep
 %setup -q
-#%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
@@ -47,17 +48,21 @@ sed -i 's!^\(\t\+\)@!\1!' Makefile
 make %{?_smp_mflags} \
     CFLAGS="${RPM_OPT_FLAGS}" \
     PREFIX="%{_prefix}" \
-    PLUGINS_DIR="%{_libdir}/%{name}/plugins" \
+    LIB_DIR="%{_libdir}" \
     DOCS_VERSION=1 \
     WITH_TRANSPARENCY=1 \
     WITH_KERNELFAM=1 \
     WITH_TRACKER=1 \
     USE_LATEST=1 \
     NEW_COMMAND=1 \
+    WITH_ACL=1
+    STRIP=0 \
+    %if 0%{?fedora} > 10
+    WITH_DEVKIT=1 \
+    %endif
     %if 0%{?_with_hal:1}
       WITH_HAL=1 \
     %endif
-    WITH_ACL=1
 
 
 %install
@@ -82,8 +87,8 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc docs/ACTIONS docs/CONFIGURATION docs/CREDITS docs/HACKING 
-%doc docs/README docs/TODO docs/USAGE docs/WARNING 
-%doc docs/help.txt docs/GPL docs/LGPL
+%doc docs/NEWS docs/README docs/TODO docs/USAGE docs/WARNING 
+%doc docs/GPL docs/LGPL
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -93,6 +98,15 @@ rm -rf $RPM_BUILD_ROOT
 
 	
 %changelog
+* Fri Jul 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.1-2
+- Build with ACL plugin again, got dropped accidentially.
+
+* Fri Jul 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.1-1
+- Update 0.6.1
+- Enable auto (un)mounting using devicekit-disks
+- Use new LIB_DIR option instead of PLUGINS_DIR
+- Build with "STRIP=0" instead of using nostrip.patch
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	9 May 2009 03:25:19 -0000	1.20
+++ sources	17 Jul 2009 16:00:37 -0000	1.21
@@ -1 +1 @@
-c153749aea954f342b28a470866ac4b0  emelfm2-0.6.0.tar.bz2
+8372c29d72d4d9ad08939f980b689156  emelfm2-0.6.1.tar.bz2


--- emelfm2-0.5.1-nostrip.patch DELETED ---


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