[bwbar] fix build failure with new libpng

Adrian Reber adrian at fedoraproject.org
Tue Dec 6 09:02:25 UTC 2011


commit bad707bdc1ac124ab0ae4eb44800f17b2b7e60b4
Author: Adrian Reber <adrian at lisas.de>
Date:   Tue Dec 6 10:02:13 2011 +0100

    fix build failure with new libpng

 bwbar.spec         |    7 ++++++-
 bwbar.zlib.h.patch |   10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/bwbar.spec b/bwbar.spec
index 24ea48f..b89b6e4 100644
--- a/bwbar.spec
+++ b/bwbar.spec
@@ -1,7 +1,7 @@
 Summary: Generate a readout of the current bandwidth use
 Name: bwbar
 Version: 1.2.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://www.kernel.org/pub/software/web/bwbar/bwbar-1.2.3.tar.bz2
@@ -10,6 +10,7 @@ Source2: bwbar.8
 Patch0: bwbar.daemon.patch
 Patch1: bwbar.debian-010_directory_option.patch
 Patch2: bwbar.debian-020_proc_net_2.6.x_fix.patch
+Patch3: bwbar.zlib.h.patch
 URL: http://www.kernel.org/pub/software/web/bwbar/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libpng-devel
@@ -25,6 +26,7 @@ of the current bandwidth use.  It is currently for Linux only.
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 %build
 %configure
@@ -69,6 +71,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Tue Dec 06 2011 Adrian Reber <adrian at lisas.de> - 1.2.3-9
+- fix build failure with new libpng
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 1.2.3-8
 - Rebuild for new libpng
 
diff --git a/bwbar.zlib.h.patch b/bwbar.zlib.h.patch
new file mode 100644
index 0000000..662e9f3
--- /dev/null
+++ b/bwbar.zlib.h.patch
@@ -0,0 +1,10 @@
+--- a/bwbar.c	2011-12-06 10:00:01.352136282 +0100
++++ b/bwbar.c	2011-12-06 09:59:56.283150202 +0100
+@@ -30,6 +30,7 @@
+ #include <alloca.h>
+ #include <getopt.h>
+ #include <png.h>
++#include <zlib.h>
+ 
+ void skipline(FILE *f)
+ {


More information about the scm-commits mailing list