[qdigidoc] Fix spec and patch right line

[mihkel]

commit ae880ffe665d88d4c3db689a501f2c91357b72af
Author: Mihkel Vain <mihkel at fedoraproject.org>
Date:   Wed Apr 30 14:45:09 2014 +0300

    Fix spec and patch right line

 0001-fix-cmake-flags.patch |    6 +++---
 qdigidoc.spec              |   25 ++++++++++---------------
 2 files changed, 13 insertions(+), 18 deletions(-)
---
diff --git a/0001-fix-cmake-flags.patch b/0001-fix-cmake-flags.patch
index 38e4684..52a0282 100644
--- a/0001-fix-cmake-flags.patch
+++ b/0001-fix-cmake-flags.patch
@@ -15,11 +15,11 @@ index 96b3475..c0016d9 100644
  		${BREAKPAD_PATH}/common/md5.cc
  	)
  	add_definitions( -D_FILE_OFFSET_BITS=64 )
--	set( COMMON_FLAGS "-fno-exceptions -Wno-unused-parameter -Wno-missing-field-initializers" )
+	set( COMMON_FLAGS "-fno-exceptions -Wno-unused-parameter -Wno-missing-field-initializers" )
+ 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}" )
+- 	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS} -fno-rtti -fno-threadsafe-statics" )
 +       # See https://code.google.com/p/google-breakpad/issues/detail?id=481#c5
 +       set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS} -fno-rtti -fno-threadsafe-statics -std=gnu++0x" )
- 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}" )
- 	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS} -fno-rtti -fno-threadsafe-statics" )
  if( APPLE )
 -- 
 1.8.4.2
diff --git a/qdigidoc.spec b/qdigidoc.spec
index ca92e40..acb3cf2 100644
--- a/qdigidoc.spec
+++ b/qdigidoc.spec
@@ -1,6 +1,6 @@
 Name:           qdigidoc
 Version:        3.8.1.1250
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Estonian digital signature application
 License:        LGPLv2+
 URL:            http://www.ria.ee
@@ -22,7 +22,8 @@ BuildRequires:  pcsc-lite-devel >= 1.7
 Requires:       hicolor-icon-theme
 # Dynamically loaded library
 Requires:       opensc%{?_isa}
-
+# Obsolete removed subpackages
+Obsoletes:      qdigidoc-nautilus
 
 %description
 QDigiDoc is an application for digitally signing and encrypting documents in
@@ -30,23 +31,14 @@ BDoc, DDoc, and CDoc container formats. These file formats are widespread in
 Estonia where they are used for storing legally binding digital signatures.
 
 
-%package        nautilus
-Summary:        Nautilus extension for %{name}
-BuildArch:      noarch
-Requires:       %{name} = %{version}-%{release}
-Requires:       nautilus-python
-
-%description   nautilus
-The %{name}-nautilus package contains the %{name} extension for the
-nautilus file manager.
-
-
 %prep
 %setup -q
 %patch0 -p3
 %patch1 -p3
 %patch2 -p3
 
+# This is here as long as upstream fixes minidump.cc permissions
+chmod -x %{_builddir}/%{name}-%{version}/breakpad/google-breakpad/src/processor/minidump.cc
 
 %build
 cmake . \
@@ -63,8 +55,6 @@ make install DESTDIR=%{buildroot}
 desktop-file-validate %{buildroot}/%{_datadir}/applications/qdigidoc-client.desktop
 desktop-file-validate %{buildroot}/%{_datadir}/applications/qdigidoc-crypto.desktop
 
-# This is here as long as upstream fixes minidump.cc permissions
-chmod -x %{_builddir}/%{name}-%{version}/breakpad/google-breakpad/src/processor/minidump.cc
 
 %post
 update-desktop-database &> /dev/null || :
@@ -95,6 +85,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Apr 30 2014 Mihkel Vain <mihkel at fedoraproject.org> - 3.8.1.1250-2
+- Obsolete qdigidoc-nautilus
+- Change minidump.cc permissions in prep
+- Patch right line with 0001-fix-cmake-flags.patch
+
 * Wed Apr 30 2014 Mihkel Vain <mihkel at fedoraproject.org> - 3.8.1.1250-1
 - First package based on new source code from RIA