[emelfm2] Update to 0.8.2

[Christoph Wickert]

commit 9d83f982ff0556924282dcf69bb0ad7a4a4ef53f
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Fri Dec 21 21:36:18 2012 +0100

    Update to 0.8.2
    
    - Drop upstreamed cursor-position.patch
    - Enable processing of escape sequences in terminal output
    - Improve build system and clean up spec file

 .gitignore                          |    1 +
 emelfm2-0.8.1-cursor-position.patch |   18 ---------
 emelfm2.spec                        |   69 +++++++++++++++++++++++------------
 sources                             |    2 +-
 4 files changed, 47 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f3042d..11ccdae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ emelfm2-0.7.3.tar.bz2
 /emelfm2-0.7.5.tar.bz2
 /emelfm2-0.8.0.tar.bz2
 /emelfm2-0.8.1.tar.bz2
+/emelfm2-0.8.2.tar.bz2
diff --git a/emelfm2.spec b/emelfm2.spec
index 79c980d..686a516 100644
--- a/emelfm2.spec
+++ b/emelfm2.spec
@@ -4,8 +4,8 @@
 %bcond_with hal
 
 Name:           emelfm2
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        File manager that implements the popular two-pane design
 
 Group:          Applications/File
@@ -14,8 +14,6 @@ URL:            http://emelfm2.net/
 Source0:        http://emelfm2.net/rel/%{name}-%{version}.tar.bz2
 #VCS svn:http://svn.emelfm2.net/trunk/
 Patch0:         emelfm2-0.7.1-dsofix.patch
-# position cursor at start of opened file, taken from SVN r2490
-Patch1:         emelfm2-0.8.1-cursor-position.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-glib-devel
@@ -36,7 +34,7 @@ BuildRequires:  gtkspell-devel >= 2.0.14
 %endif
 
 # Fedora 13 uses udisks
-%if 0%{?fedora} > 12
+%if 0%{?fedora} > 12  || 0%{?rhel} > 6
 BuildRequires:  udisks-devel
 Requires:       udisks
 %else
@@ -57,7 +55,6 @@ opening an xterm.
 %prep
 %setup -q
 %patch0 -p1 -b .dsofix
-%patch1 -p0 -b .cursor-position
 
 # fix broken icon in emelfm2.desktop
 sed -i 's!Icon=emelfm2!Icon=%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' \
@@ -68,39 +65,57 @@ sed -i 's!^\(\t\+\)@!\1!' Makefile
 
 
 %build
+# This package doesn't have a configure script. Instead, one needs to edit
+# Makefile.config or pass options to the make command. When adding a new
+# option, please use the same ordering as in Makefile.config
 make %{?_smp_mflags} \
-    CFLAGS="${RPM_OPT_FLAGS}" \
-    PREFIX="%{_prefix}" \
-    LIB_DIR="%{_libdir}" \
+    DOC_DIR=%{_docdir}/%{name} \
+    XDG_DESKTOP_DIR=%{_datadir}/applications \
+    XDG_APPLICATION_DIR=%{_datadir}/application-registry \
     DOCS_VERSION=1 \
     WITH_TRANSPARENCY=1 \
     WITH_KERNELFAM=1 \
-    WITH_TRACKER=1 \
-    USE_LATEST=1 \
-    WITH_GTK2=1 \
-    NEW_COMMAND=1 \
-    WITH_ACL=1 \
-    WITH_POLKIT=1 \
-    WITH_CUSTOMMOUSE=1 \
-    STRIP=0 \
-    %if 0%{?fedora} > 10
+    USE_INOTIFY=1 \
+    %if 0%{?fedora} > 10 || 0%{?rhel} > 6
       EDITOR_SPELLCHECK=1 \
     %endif
-    %if 0%{?fedora} > 11
-      WITH_POLKIT=1 \
+    WITH_OUTPUTSTYLES=1 \
+    WITH_CUSTOMMOUSE=1 \
+    WITH_GTK2=1 \
+    NEW_COMMAND=1 \
+    %if 0%{?fedora} > 11 || 0%{?rhel} > 6
       WITH_UDISKS=1 \
     %endif
     %if %{with hal}
       WITH_HAL=1 \
     %endif
+    WITH_TRACKER=1 \
+    WITH_ACL=1 \
+    %if 0%{?fedora} > 11 || 0%{?rhel} > 6
+      WITH_POLKIT=1 \
+    %endif
+    PREFIX=%{_prefix} \
+    BIN_DIR=%{_bindir} \
+    LIB_DIR=%{_libdir} \
+    PLUGINS_DIR=%{_libdir}/%{name}/plugins \
+    ICON_DIR=%{_datadir}/pixmaps/%{name} \
+    LOCALE_DIR=%{_datadir}/locale \
+    MAN_DIR=%{_mandir}/man1 \
+    CFLAGS="%{optflags}" \
+    STRIP=0 \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 make install install_i18n \
     DOCS_VERSION=1 \
-    PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-    PLUGINS_DIR="$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins"
+    PREFIX=%{buildroot}%{_prefix} \
+    BIN_DIR=%{buildroot}%{_bindir} \
+    LIB_DIR=%{buildroot}%{_libdir} \
+    PLUGINS_DIR=%{buildroot}%{_libdir}/%{name}/plugins \
+    ICON_DIR=%{buildroot}%{_datadir}/pixmaps/%{name} \
+    LOCALE_DIR=%{buildroot}%{_datadir}/locale \
+    MAN_DIR=%{buildroot}%{_mandir}/man1 \
 
 %find_lang %{name}
 
@@ -111,7 +126,7 @@ desktop-file-install --vendor fedora                            \
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files -f %{name}.lang
@@ -128,6 +143,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 21 2012 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.2-1
+- Update to 0.8.2
+- Drop upstreamed cursor-position.patch
+- Enable processing of escape sequences in terminal output
+- Improve build system and clean up spec file
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 3b62b81..3f64aa9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-00368bca4c88733e7d70f46cc4db890c  emelfm2-0.8.1.tar.bz2
+9219ac7c6b6167cc1cb4de917440a733  emelfm2-0.8.2.tar.bz2