[shared-mime-info/f20] allow (but ignore) new -n option

[Rex Dieter]

commit 70620b1a06d609b56b49e8223aecdd1e5fa8dbdf
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Jun 27 13:24:26 2014 -0500

    allow (but ignore) new -n option

 shared-mime-info-1.2-ignore_option_n.patch |   21 +++++++++++++++++++++
 shared-mime-info.spec                      |    8 +++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/shared-mime-info-1.2-ignore_option_n.patch b/shared-mime-info-1.2-ignore_option_n.patch
new file mode 100644
index 0000000..7d60ce4
--- /dev/null
+++ b/shared-mime-info-1.2-ignore_option_n.patch
@@ -0,0 +1,21 @@
+diff -up shared-mime-info-1.2/update-mime-database.c.ignore_option_n shared-mime-info-1.2/update-mime-database.c
+--- shared-mime-info-1.2/update-mime-database.c.ignore_option_n	2014-06-27 12:54:32.967129379 -0500
++++ shared-mime-info-1.2/update-mime-database.c	2014-06-27 12:54:37.223206258 -0500
+@@ -3524,7 +3524,7 @@ int main(int argc, char **argv)
+ 	/* Install the filtering log handler */
+ 	g_log_set_default_handler(g_log_handler, NULL);
+ 
+-	while ((opt = getopt(argc, argv, "hvV")) != -1)
++	while ((opt = getopt(argc, argv, "hnvV")) != -1)
+ 	{
+ 		switch (opt)
+ 		{
+@@ -3534,6 +3534,8 @@ int main(int argc, char **argv)
+ 			case 'h':
+ 				usage(argv[0]);
+ 				return EXIT_SUCCESS;
++			case 'n':
++				break;
+ 			case 'v':
+ 				g_fprintf(stderr,
+ 					  "update-mime-database (" PACKAGE ") "
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 5615f9b..aeff427 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -23,6 +23,8 @@ Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch
 # support PKGSYSTEM_ENABLE_FSYNC
 # https://bugzilla.redhat.com/show_bug.cgi?id=1052173#c14
 Patch1: shared-mime-info-1.2-PKGSYSTEM_ENABLE_FSYNC.patch
+# allow, but ignore new upstream -n option
+Patch2: shared-mime-info-1.2-ignore_option_n.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel
@@ -45,6 +47,7 @@ and looking up the correct MIME type in a database.
 %setup -q
 %patch0 -p1 -b .ooo-zip
 %patch1 -p1 -b .PKGSYSTEM_FSYNC
+%patch2 -p1 -b .ignore_option_n
 
 %build
 
@@ -86,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*
 %{_mandir}/man*/*
 
 %changelog
+* Fri Jun 27 2014 Rex Dieter <rdieter at fedoraproject.org> 1.2-6
+- allow (but ignore) new -n option
+
 * Thu Jun 26 2014 Rex Dieter <rdieter at fedoraproject.org> 1.2-5
 - adapt PKGSYSTEM_ENABLE_FSYNC patch to be closer to upstream implementation, except default off (#1052173)