From 661cf8daffcbcb2f29e027afaf0a25b992115a8b147d06a80c77e2e88c3b11fa Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Sat, 13 Oct 2012 13:18:23 +0000
Subject: [PATCH] Accepting request 138048 from
 home:AndreasStieger:branches:network:utilities

- add bwbar-1.2.3-libpng15.patch to fix build against libpng15
- reformat spec file

OBS-URL: https://build.opensuse.org/request/show/138048
OBS-URL: https://build.opensuse.org/package/show/network:utilities/bwbar?expand=0&rev=3
---
 bwbar-1.2.3-libpng15.patch | 21 ++++++++++++++++++++
 bwbar.changes              |  6 ++++++
 bwbar.spec                 | 40 ++++++++++++++++++++++++--------------
 3 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 bwbar-1.2.3-libpng15.patch

diff --git a/bwbar-1.2.3-libpng15.patch b/bwbar-1.2.3-libpng15.patch
new file mode 100644
index 0000000..4a7c1dc
--- /dev/null
+++ b/bwbar-1.2.3-libpng15.patch
@@ -0,0 +1,21 @@
+Index: bwbar.c
+===================================================================
+--- bwbar.c.orig	2006-08-26 17:31:26.000000000 +0100
++++ bwbar.c	2012-10-13 14:01:23.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include <alloca.h>
+ #include <getopt.h>
+ #include <png.h>
++#include <zlib.h>
+ 
+ void skipline(FILE *f)
+ {
+@@ -79,7 +80,7 @@ int write_bar_graph(FILE *f, double perc
+   if ( !info_ptr )
+     goto barf;
+ 
+-  if ( setjmp(png_ptr->jmpbuf) ) {
++  if ( setjmp(png_jmpbuf(png_ptr)) ) {
+     status = 1;
+     goto barf;			/* libpng abort */
+   }
diff --git a/bwbar.changes b/bwbar.changes
index 0ab94b2..1eeb3b4 100644
--- a/bwbar.changes
+++ b/bwbar.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Oct 13 13:06:50 UTC 2012 - andreas.stieger@gmx.de
+
+- add bwbar-1.2.3-libpng15.patch to fix build against libpng15
+- reformat spec file
+
 -------------------------------------------------------------------
 Wed Jun 29 20:40:55 UTC 2011 - andreas.stieger@gmx.de
 
diff --git a/bwbar.spec b/bwbar.spec
index 4f55c68..8fc1e12 100644
--- a/bwbar.spec
+++ b/bwbar.spec
@@ -1,28 +1,37 @@
 #
-# spec file for package bwbar (Version 1.2.3)
+# spec file for package bwbar
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 Name:           bwbar
-BuildRequires:  gcc-c++ libpng-devel
+BuildRequires:  gcc-c++
+BuildRequires:  libpng-devel
 Url:            http://www.kernel.org/pub/software/web/bwbar/
-License:        GPL v2 or later
-Group:          Productivity/Networking/Other
-AutoReqProv:    on
 Summary:        Bandwidth usage bar
+License:        GPL-2.0+
+Group:          Productivity/Networking/Other
 Version:        1.2.3 
-Release:        1
+Release:        0
 Source:         %{name}-%{version}.tar.bz2
-Source1:	COPYING
-Source2: 	bwbar_config
-Source3: 	bwbar_initscript
+Source1:        COPYING
+Source2:        bwbar_config
+Source3:        bwbar_initscript
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-analyzer/bwbar/files/bwbar-1.2.3-libpng15.patch?revision=1.1&pathrev=HEAD
+# PATCH-FIX-UPSTREAM bwbar-1.2.3-libpng15.patch andreas.stieger@gmx.de -- fixes build against libpng15
+Patch0:         bwbar-1.2.3-libpng15.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -37,6 +46,7 @@ Authors:
 
 %prep
 %setup -q
+%patch0
 
 %{__cp} %{SOURCE1} .
 
@@ -45,7 +55,7 @@ CFLAGS="-Wall $RPM_OPT_FLAGS"
 %configure --prefix=%{_prefix} \
            --infodir=%{_infodir} \
            --mandir=%{_mandir} 
-make
+%__make %{?_smp_mflags}
 
 %install
 install -d $RPM_BUILD_ROOT%{_bindir} 
@@ -72,5 +82,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/*
 %config %{_sysconfdir}/%{name}
 %config %{_sysconfdir}/init.d/%{name}
-%changelog
 
+%changelog