rpms/dbus-qt3/devel fix_ifdef.patch,NONE,1.1 dbus-qt3.spec,1.3,1.4

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/extras/rpms/dbus-qt3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3493

Modified Files:
	dbus-qt3.spec 
Added Files:
	fix_ifdef.patch 
Log Message:
add second suse patch and really apply them


fix_ifdef.patch:

--- NEW FILE fix_ifdef.patch ---
--- dbus/qdbusobjectpath.h
+++ dbus/qdbusobjectpath.h
@@ -21,6 +21,9 @@
  *
  */
 
+#ifndef QDBUSOBJECTPATH_H
+#define QDBUSOBJECTPATH_H
+
 #include <qcstring.h>
 
 /**
@@ -111,3 +114,5 @@
      */
     static int validate(const QCString& path);
 };
+
+#endif


Index: dbus-qt3.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus-qt3/devel/dbus-qt3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dbus-qt3.spec	5 Feb 2008 18:29:28 -0000	1.3
+++ dbus-qt3.spec	5 Feb 2008 19:53:41 -0000	1.4
@@ -4,7 +4,7 @@
 Name:    dbus-qt3
 Summary: Qt3 DBus Bindings
 Version: 0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2+
 Group:   System Environment/Libraries 
@@ -12,6 +12,7 @@
 Source0: http://people.freedesktop.org/~krake/dbus-1-qt3/libdbus-1-qt3-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:  BRANCH_UPDATE.diff
+Patch1:  fix_ifdef.patch
 
 BuildRequires: dbus-devel
 BuildRequires: qt-devel
@@ -37,7 +38,8 @@
 
 %prep
 %setup -q -n libdbus-1-qt3-%{version}
-
+%patch0 -p0 -b .suse
+%patch1 -p0 -b .ifdef
 
 %build
 %configure \
@@ -86,6 +88,10 @@
 
 
 %changelog
+* Tue Feb 05 2008 Dennis Gilmore <dennis at ausil.us> 0.8-4
+- actually apply the patch
+- add second patch from suse
+
 * Tue Feb 05 2008 Dennis Gilmore <dennis at ausil.us> 0.8-3
 - apply BRANCH_UPDATE.diff pulled from suse
 - patch needed because it changes the opttions to dbusxml2qt3