From 59b3833e57ad533a0c62bae96545f739d7d6836e Mon Sep 17 00:00:00 2001
From: xulchris <xulchris@fedoraproject.org>
Date: Nov 30 2007 19:36:29 +0000
Subject: upstream sync


---

diff --git a/.cvsignore b/.cvsignore
index ebb6686..0c6df40 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-desktop-file-utils-0.13.tar.gz
+desktop-file-utils-0.14.tar.gz
diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index 5b0278f..7e87876 100644
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -1,11 +1,10 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
-Version: 0.13
-Release: 3%{?dist}
+Version: 0.14
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.gz
 # https://bugs.freedesktop.org/show_bug.cgi?id=12018
-Patch0: short-option.patch
 License: GPLv2+
 Group: Development/Tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,7 +24,6 @@ fixing it up in the process.
 
 %prep
 %setup -q
-%patch0 -p1 -b .short-option
 
 %build
 %configure
@@ -45,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/emacs/site-lisp/
 
 %changelog
+* Fri Nov 30 2007 Christopher Stone <chris.stone@gmail.com> 0.14-1
+- Upstream sync
+- Remove no longer needed short option patch
+
 * Wed Aug 15 2007 Matthias Clasen <mclasen@redhat.com> - 0.13-3
 - Make the -m option work (#232761)
 
diff --git a/short-option.patch b/short-option.patch
deleted file mode 100644
index 54a0721..0000000
--- a/short-option.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up desktop-file-utils-0.13/src/install.c.short-option desktop-file-utils-0.13/src/install.c
---- desktop-file-utils-0.13/src/install.c.short-option	2007-08-15 21:14:57.000000000 -0400
-+++ desktop-file-utils-0.13/src/install.c	2007-08-15 21:17:06.000000000 -0400
-@@ -430,7 +430,9 @@ parse_options_callback (const gchar  *op
-                         GError      **error)
- {
-   /* skip "--" */
--  option_name += 2;
-+  option_name++;
-+  if (*option_name == '-')
-+    option_name++;
- 
-   if (strcmp (OPTION_VENDOR, option_name) == 0)
-     {
-@@ -480,7 +482,8 @@ parse_options_callback (const gchar  *op
-                                               g_strdup (value));
-     }
- 
--  else if (strcmp (OPTION_MODE, option_name) == 0)
-+  else if (strcmp (OPTION_MODE, option_name) == 0 ||
-+           strcmp ("m", option_name) == 0)
-     {
-       unsigned long ul;
-       char *end;
diff --git a/sources b/sources
index c5ba7af..4a85355 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ee84d0de753d4052011714c20d6efae  desktop-file-utils-0.13.tar.gz
+e0b5057a4e3166f34635ac6f27c712c0  desktop-file-utils-0.14.tar.gz