Accepting request 99221 from home:pgajdos:libpng15

- build also with libpng15
  * libpng15.patch

OBS-URL: https://build.opensuse.org/request/show/99221
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/alevt?expand=0&rev=11

alevt-libpng15.patch

@@ -0,0 +1,13 @@
+Index: alevt-1.6.2/exp-gfx.c
+===================================================================
+--- alevt-1.6.2.orig/exp-gfx.c
++++ alevt-1.6.2/exp-gfx.c
+@@ -3,6 +3,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++/* libpng15's png.h doesn't include zlib.h */
++#include <zlib.h>
+ 
+ #include "lang.h"
+ #include "export.h"

alevt.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan  6 10:56:13 UTC 2012 - pgajdos@suse.com
+
+- build also with libpng15
+  * libpng15.patch
+
 -------------------------------------------------------------------
 Sat Sep 17 10:54:11 UTC 2011 - jengelh@medozas.de
 

alevt.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package alevt
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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
@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           alevt
 %{expand:%%global _prefix %(pkg-config --variable prefix x11 || echo /usr/X11R6)}
 %if "%_prefix" == "/usr/X11R6"
@@ -24,19 +23,25 @@ Name:           alevt
 %else
 %define _man_dir share/man
 %endif
-BuildRequires:  libpng-devel pkgconfig update-desktop-files xorg-x11-devel
+BuildRequires:  libpng-devel
+BuildRequires:  pkgconfig
+BuildRequires:  update-desktop-files
+BuildRequires:  xorg-x11-devel
 Url:            http://www.goron.de/~froese/
+Summary:        Teletext and Videotext Decoder for the BTTV Driver
 License:        GPL-2.0+
 Group:          Hardware/TV
-Summary:        Teletext and Videotext Decoder for the BTTV Driver
 Version:        1.6.2
-Release:        71
+Release:        0
 Source0:        alevt-%version.tar.bz2
 Source1:        alevt.desktop
 Source2:        alevt.png
 Patch2:         alevt-1.6.0-dvb-demux.patch
 Patch4:         alevt-overflow2.diff
 Patch5:         alevt-happy-abuild.diff
+# PATCH-FIX-UPSTREAM pngtoico-libpng15.patch -- pgajdos@suse.com; build with libpng15; sent today to froese@gmx.de
+# build against libpng14 should not be affected, otherwise please let me know
+Patch6:         alevt-libpng15.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -50,6 +55,7 @@ There is also a program to get the time from teletext.
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 make OPT="$RPM_OPT_FLAGS" %{?_smp_mflags}