From 0de07583bc8250e0997ec99cd383c6225a31c600 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Jun 17 2015 17:04:51 +0000 Subject: Fix build for gdk-pixbuf2 package split --- diff --git a/fbpanel-6.1-fix-includes.patch b/fbpanel-6.1-fix-includes.patch new file mode 100644 index 0000000..d31e065 --- /dev/null +++ b/fbpanel-6.1-fix-includes.patch @@ -0,0 +1,32 @@ +The gdk-pixbuf-xlib headers are not actually used + +--- a/panel/plugin.c 2010-02-09 06:05:39.000000000 -0600 ++++ b/panel/plugin.c 2015-06-17 11:31:00.595529234 -0500 +@@ -2,7 +2,6 @@ + #include "plugin.h" + + #include +-#include + #include + #include + #include +--- a/plugins/icons/icons.c 2010-04-25 02:58:35.000000000 -0500 ++++ b/plugins/icons/icons.c 2015-06-17 11:31:11.412538586 -0500 +@@ -8,7 +8,6 @@ + //#include + + #include +-#include + #include + + +--- a/plugins/taskbar/taskbar.c 2010-05-12 14:28:58.000000000 -0500 ++++ b/plugins/taskbar/taskbar.c 2015-06-17 11:31:23.504666921 -0500 +@@ -8,7 +8,6 @@ + //#include + + #include +-#include + #include + + diff --git a/fbpanel.spec b/fbpanel.spec index 027a6b1..b2409ad 100644 --- a/fbpanel.spec +++ b/fbpanel.spec @@ -1,6 +1,6 @@ Name: fbpanel Version: 6.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A lightweight X11 desktop panel Group: User Interface/Desktops @@ -13,6 +13,7 @@ Patch0: fbpanel-6.1-dsofix.patch # distro specific patches Patch10: fbpanel-6.1-default-config.patch Patch11: fbpanel-6.1-default-applications.patch +Patch12: fbpanel-6.1-fix-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel libXpm-devel libXmu-devel desktop-file-utils @@ -28,6 +29,7 @@ It features tasklist, pager, launchbar, clock, menu and systray. %patch0 -p1 -b .dsofix %patch10 -p1 -b .default-config %patch11 -p1 -b .default-applications +%patch12 -p1 -b .fix-includes # preserve timestamps during install sed -i.timstamps -e 's|install -m|install -p -m|' scripts/install.sh # honor optflags @@ -96,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Jun 17 2015 Yaakov Selkowitz - 6.1-11 +- Fix build for gdk-pixbuf2 package split + * Wed Jun 17 2015 Fedora Release Engineering - 6.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild