[driftnet/f17] * Sun Jul 22 2012 Paul Wouters <pwouters at redhat.com> - 0.1.6-25.20040426cvs - Change obsoleted libpn
Paul Wouters
pwouters at fedoraproject.org
Sun Jul 22 22:15:59 UTC 2012
commit 2188c120546f804ed4be9549b2302b889c43e947
Author: Paul Wouters <paul at libreswan.org>
Date: Sun Jul 22 18:13:21 2012 -0400
* Sun Jul 22 2012 Paul Wouters <pwouters at redhat.com> - 0.1.6-25.20040426cvs
- Change obsoleted libpng png_set_gray_1_2_4_to_8() to png_set_expand_gray_1_2_4_to_8()
Conflicts:
driftnet.spec
driftnet-0.1.6-libpng.patch | 11 +++++++++++
driftnet.spec | 7 ++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/driftnet-0.1.6-libpng.patch b/driftnet-0.1.6-libpng.patch
new file mode 100644
index 0000000..1ffccd8
--- /dev/null
+++ b/driftnet-0.1.6-libpng.patch
@@ -0,0 +1,11 @@
+--- driftnet-0.1.6-20040426cvs/png.c 2003-08-25 08:23:43.000000000 -0400
++++ driftnet-0.1.6-20040426cvs-new/png.c 2012-07-22 18:04:31.645250349 -0400
+@@ -104,7 +104,7 @@
+ if (color_type == PNG_COLOR_TYPE_GRAY ||
+ color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+ if (bit_depth < 8) {
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+ png_set_gray_to_rgb(png_ptr);
+ }
diff --git a/driftnet.spec b/driftnet.spec
index 2602e5c..1fdf167 100644
--- a/driftnet.spec
+++ b/driftnet.spec
@@ -2,7 +2,7 @@ Name: driftnet
License: GPLv2+
Group: Applications/Internet
Version: 0.1.6
-Release: 23.20040426cvs%{?dist}
+Release: 24.20040426cvs%{?dist}
Summary: Network image sniffer
URL: http://www.ex-parrot.com/~chris/driftnet/
Source0: driftnet-0.1.6-20040426cvs.tar.gz
@@ -12,6 +12,7 @@ Source2: %name-%{version}-security.config
#Patch0: driftnet-gtk2-port.patch
Patch1: driftnet-dont-use-tmpnam.patch
Patch2: driftnet-0.1.6-no-makedepend.patch
+Patch3: driftnet-0.1.6-libpng.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpcap-devel gtk2-devel libungif-devel libjpeg-devel giflib-devel
Requires: %{_bindir}/consolehelper
@@ -26,6 +27,7 @@ traffic.
#%patch0 -p1 -b .gtk2
%patch1 -p1 -b .tmpnam
%patch2 -p1 -b .makedep
+%patch3 -p1 -b .libpng
sed -i 's#LDLIBS += -ljpeg -lungif -lpng `pkg-config --libs gtk+-2.0`#LDLIBS += -ljpeg -lungif -lpng -lgif `pkg-config --libs gtk+-2.0`#g' Makefile
%build
CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
@@ -56,6 +58,9 @@ install -Dpm 644 %{SOURCE2} \
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jul 22 2012 Paul Wouters <pwouters at redhat.com> - 0.1.6-24.20040426cvs
+- Change obsoleted libpng png_set_gray_1_2_4_to_8() to png_set_expand_gray_1_2_4_to_8()
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.6-23.20040426cvs
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list