From b4d789d8cb77f8c8fe3297a833ccf1db0d070a8b75b32135120de5eda6426463 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 6 Oct 2008 15:55:37 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/libavc1394?expand=0&rev=6

---
 libavc1394.changes                       |  5 +++++
 libavc1394.raw1394_set_fcp_handler.patch | 19 +++++++++++++++++++
 libavc1394.spec                          | 23 +++++++++++++++--------
 3 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 libavc1394.raw1394_set_fcp_handler.patch

diff --git a/libavc1394.changes b/libavc1394.changes
index 2b2df5a..71c7489 100644
--- a/libavc1394.changes
+++ b/libavc1394.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct  6 09:54:28 CEST 2008 - olh@suse.de
+
+- fix ordered comparison of pointer with integer zero (bnc#431913)
+
 -------------------------------------------------------------------
 Wed May 21 19:15:15 CEST 2008 - cthiel@suse.de
 
diff --git a/libavc1394.raw1394_set_fcp_handler.patch b/libavc1394.raw1394_set_fcp_handler.patch
new file mode 100644
index 0000000..a2c866e
--- /dev/null
+++ b/libavc1394.raw1394_set_fcp_handler.patch
@@ -0,0 +1,19 @@
+Bug 431913 - libavc1394-0.5.3-104: ordered comparison of pointer with integer zero
+
+avc1394_simple.c:552: warning: ordered comparison of pointer with integer zero
+---
+ libavc1394/avc1394_simple.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/libavc1394/avc1394_simple.c
++++ b/libavc1394/avc1394_simple.c
+@@ -549,8 +549,7 @@ avc1394_init_target( raw1394handle_t han
+ 	if (cmd_handler == NULL)
+ 		return -1;
+ 	g_command_handler = cmd_handler;
+-	if (raw1394_set_fcp_handler( handle, target_fcp_handler ) < 0)
+-		return -1;
++	raw1394_set_fcp_handler( handle, target_fcp_handler );
+ 	return raw1394_start_fcp_listen( handle );
+ }
+ 
diff --git a/libavc1394.spec b/libavc1394.spec
index b56b602..7d3cb24 100644
--- a/libavc1394.spec
+++ b/libavc1394.spec
@@ -2,9 +2,16 @@
 # spec file for package libavc1394 (Version 0.5.3)
 #
 # Copyright (c) 2008 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.
 #
+# 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/
 #
 
@@ -17,12 +24,13 @@ License:        LGPL v2.1 or later
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
 Version:        0.5.3
-Release:        102
+Release:        129
 Summary:        Libavc1394--Programming Interface to the AV/C Specification
 Url:            http://sourceforge.net/projects/libavc1394/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         %{name}-%{version}.tar.bz2
 Patch:          libavc1394.no-mkrfc2734.patch
+Patch1:         libavc1394.raw1394_set_fcp_handler.patch
 
 %description
 Libavc1394 is a programming interface to the AV/C specification from
@@ -94,19 +102,16 @@ Authors:
 %prep
 %setup  -q
 %patch -p1
+%patch1 -p1
 
 %build
 %{suse_update_config}
 autoreconf -i -f
 CFLAGS=$RPM_OPT_FLAGS \
-./configure --prefix=/usr \
-            --mandir=%{_mandir} \
-	    --libdir=%{_libdir}	
+%{configure} 
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
-mkdir  %{buildroot}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -135,6 +140,8 @@ rm -rf $RPM_BUILD_ROOT
 %_libdir/pkgconfig/*.pc
 
 %changelog
+* Mon Oct 06 2008 olh@suse.de
+- fix ordered comparison of pointer with integer zero (bnc#431913)
 * Wed May 21 2008 cthiel@suse.de
 - fix baselibs.conf
 * Thu Apr 10 2008 ro@suse.de