From 3ad4ed3014e7e7249520e86cc7e497abcdc5fd79 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Tue, 19 Aug 2014 22:24:25 +0200
Subject: [PATCH] Drop the logos removal patch

Logos are now gone from the upstream tarball.
---
 gnome-devel-docs-3.7.90-logos-removal.patch | 26 ---------------------
 gnome-devel-docs.spec                       | 15 +-----------
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 gnome-devel-docs-3.7.90-logos-removal.patch

diff --git a/gnome-devel-docs-3.7.90-logos-removal.patch b/gnome-devel-docs-3.7.90-logos-removal.patch
deleted file mode 100644
index 2a2f868..0000000
--- a/gnome-devel-docs-3.7.90-logos-removal.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- gnome-devel-docs-3.7.90/platform-demos/Makefile.am.logos-removal	2013-02-04 20:52:08.000000000 +0100
-+++ gnome-devel-docs-3.7.90/platform-demos/Makefile.am	2013-02-21 02:01:30.864169035 +0100
-@@ -192,7 +192,6 @@
- 	media/combobox_multicolumn.png		\
- 	media/dialog.png			\
- 	media/entry.png				\
--	media/fedora.png			\
- 	media/filechooserdialog_menu.png	\
- 	media/filechooserdialog_save.png	\
- 	media/fontchooserwidget.png		\
-@@ -225,7 +224,6 @@
- 	media/menubar_choices.png		\
- 	media/message-board.ogv			\
- 	media/messagedialog.png			\
--	media/opensuse.png			\
- 	media/paned.png				\
- 	media/photo-wall.png			\
- 	media/photo-wall-focused.png		\
-@@ -258,7 +256,6 @@
- 	media/treeview_simple_liststore.png	\
- 	media/treeview_simple_liststore_penguins.png	\
- 	media/treeview_treestore.png		\
--	media/ubuntu.png			\
- 	media/weatherAppJs.png			\
- 	media/window.png			\
- 	$(demo_sources)
diff --git a/gnome-devel-docs.spec b/gnome-devel-docs.spec
index 700543f..42047ed 100644
--- a/gnome-devel-docs.spec
+++ b/gnome-devel-docs.spec
@@ -11,11 +11,6 @@ BuildArch: noarch
 BuildRequires: docbook-utils
 BuildRequires: gettext
 BuildRequires: itstool
-
-# Logomarks should be removed and replaced with text
-# https://bugzilla.redhat.com/show_bug.cgi?id=814220
-Patch0: gnome-devel-docs-3.7.90-logos-removal.patch
-BuildRequires: automake autoconf
 BuildRequires: yelp-tools
 
 %description
@@ -25,17 +20,8 @@ and the Platform Overview.
 
 %prep
 %setup -q
-%patch0 -p1 -b .logos-removal
-rm -f platform-demos/media/fedora.png
-rm -f platform-demos/media/opensuse.png
-rm -f platform-demos/media/ubuntu.png
 
 %build
-aclocal  || :
-autoheader  || :
-automake  || :
-autoconf  || :
-
 %configure
 make %{?_smp_mflags}
 
@@ -51,6 +37,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %changelog
 * Wed Aug 20 2014 Kalev Lember <kalevlember@gmail.com> - 3.12.3-1
 - Update to 3.12.3
+- Drop the logos removal patch: logos are now gone from upstream tarball
 
 * Tue Jun 10 2014 Richard Hughes <rhughes@redhat.com> - 3.12.2-1
 - Update to 3.12.2