From 75923947860f3ae2d8ea9e2ad02d61f8a54bb02c Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 13 Feb 2013 15:26:49 +0100 Subject: [PATCH] Remove upstreamed patch --- 0001-Add-mime-type-for-source-RPMs.patch | 30 ------------------------ shared-mime-info.spec | 3 --- 2 files changed, 33 deletions(-) delete mode 100644 0001-Add-mime-type-for-source-RPMs.patch diff --git a/0001-Add-mime-type-for-source-RPMs.patch b/0001-Add-mime-type-for-source-RPMs.patch deleted file mode 100644 index 94167ec..0000000 --- a/0001-Add-mime-type-for-source-RPMs.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4462b30c5b9592f134ce7d4fb7b7139f58c92a78 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 30 Nov 2012 15:50:49 +0100 -Subject: [PATCH] Add mime-type for source RPMs - ---- - freedesktop.org.xml.in | 7 +++++++ - tests/foo-0.1-1.fc18.src.rpm | Bin 0 -> 2393 bytes - tests/list | 2 ++ - 3 files changed, 9 insertions(+) - create mode 100644 tests/foo-0.1-1.fc18.src.rpm - -diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in -index e67e2c7..8f1e5ba 100644 ---- a/freedesktop.org.xml.in -+++ b/freedesktop.org.xml.in -@@ -2936,6 +2936,13 @@ command to generate the output files. - - - -+ -+ <_comment>Source RPM package -+ -+ -+ -+ -+ - - <_comment>Ruby script - diff --git a/shared-mime-info.spec b/shared-mime-info.spec index b891d7c..31b1de0 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -20,8 +20,6 @@ Source4: shotwell-viewer-defaults.list # Work-around for https://bugs.freedesktop.org/show_bug.cgi?id=40354 Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch -Patch1: 0001-Add-mime-type-for-source-RPMs.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel BuildRequires: glib2-devel @@ -43,7 +41,6 @@ and looking up the correct MIME type in a database. %prep %setup -q %patch0 -p1 -b .ooo-zip -%patch1 -p1 %build