Hello community,

here is the log from the commit of package libdbus-c++ for openSUSE:Factory 
checked in at 2012-03-20 12:11:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libdbus-c++ (Old)
 and      /work/SRC/openSUSE:Factory/.libdbus-c++.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libdbus-c++", Maintainer is ""

Changes:
--------
New Changes file:

--- /dev/null   2012-03-17 10:42:43.883537212 +0100
+++ /work/SRC/openSUSE:Factory/.libdbus-c++.new/libdbus-c++.changes     
2012-03-20 12:11:22.000000000 +0100
@@ -0,0 +1,18 @@
+-------------------------------------------------------------------
+Mon Mar 12 08:42:55 UTC 2012 - davejpla...@gmail.com
+
+- Added baselibs.conf for 32 bit compat libs.
+
+-------------------------------------------------------------------
+Sun Mar 11 11:53:09 UTC 2012 - davejpla...@gmail.com
+
+- Added libdbus-c++-noreturn.patch to fix rpmlint error, will be
+  reported upstream as the comment in the source file suggests that
+  the developer hasn't decided what to do about it yet.
+
+-------------------------------------------------------------------
+Sat Feb 25 08:20:55 UTC 2012 - davejpla...@gmail.com
+
+- Created package dbus-c++ for ffado svn build.
+- See bnc#747391 & bnc#736115
+

New:
----
  baselibs.conf
  libdbus-c++-0.9.0.tar.bz2
  libdbus-c++-gcc47.patch
  libdbus-c++-nodocdatetime.patch
  libdbus-c++-noreturn.patch
  libdbus-c++-pthread.patch
  libdbus-c++.changes
  libdbus-c++.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libdbus-c++.spec ++++++
#
# spec file for package libdbus-c++
#
# 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/
#


Name:           libdbus-c++
Version:        0.9.0
Release:        0
Summary:        C++ Interface for DBus
License:        LGPL-2.1+
Group:          System/Libraries
Url:            http://dbus-cplusplus.sourceforge.net/index.html
Source0:        %{name}-%{version}.tar.bz2
Source1:        baselibs.conf
# Fix no return from function
Patch0:         libdbus-c++-noreturn.patch
# Get ffado to build with libdbus-c++
Patch1:         libdbus-c++-pthread.patch
# No current date / time allowed in docs?
Patch2:         libdbus-c++-nodocdatetime.patch
# Fix gcc47 build errors
Patch3:         libdbus-c++-gcc47.patch
BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  dos2unix
BuildRequires:  doxygen
BuildRequires:  fdupes
BuildRequires:  gcc-c++
BuildRequires:  graphviz
BuildRequires:  gtkmm2-devel
BuildRequires:  libexpat-devel
BuildRequires:  libtool
BuildRequires:  pkgconfig
BuildRequires:  pkgconfig(dbus-1)
BuildRequires:  pkgconfig(dbus-glib-1)
# ecore
%if 0%{?suse_version} >= 1030
BuildRequires:  libexpat-devel
%else
BuildRequires:  expat
%endif
BuildRoot:      %{_tmppath}/%{name}-%{version}-build

%description
DBus-c++ attempts to provide a C++ API for D-BUS. The library has
a glib and an ecore mainloop integration. It also offers an
optional own main loop.

%package -n libdbus-c++-1-0
Summary:        The libdbus-c++ library
Group:          System/Libraries

%description -n libdbus-c++-1-0
DBus-c++ attempts to provide a C++ API for D-BUS. The library has
a glib and an ecore mainloop integration. It also offers an
optional own main loop. The libdbus-c++ library.

%package -n libdbus-c++-glib-1-0
Summary:        Glib for libdbus-c++
Group:          System/Libraries

%description -n libdbus-c++-glib-1-0
DBus-c++ attempts to provide a C++ API for D-BUS. The library has
a glib and an ecore mainloop integration. It also offers an
optional own main loop. The glib libdbus-c++ library.

%package devel
Summary:        Development files for libdbus-c++
Group:          Development/Libraries/C and C++
Requires:       libdbus-c++-1-0 = %{version}
Requires:       libdbus-c++-glib-1-0 = %{version}

%description devel
DBus-c++ attempts to provide a C++ API for D-BUS. The library has
a glib and an ecore mainloop integration. It also offers an
optional own main loop. Files for building against libdbus-c++

%prep

%setup -q
%patch0
%patch1
%patch2
%patch3

%build
#./autogen.sh
# FIXME: for some strange reason the 32 bit build needs -lpthread.
%ifarch x86_64
export LDFLAGS="$LDFLAGS -lexpat"
%else
export LDFLAGS="$LDFLAGS -lexpat -lpthread"
%endif

%configure --disable-ecore --enable-doxygen-docs --enable-static=no
make %{?_smp_flags}

%install
%make_install
dos2unix -k AUTHORS
rm -f %{buildroot}%{_libdir}/*.la
%fdupes -s doc/

%post -n libdbus-c++-glib-1-0 -p /sbin/ldconfig

%postun -n libdbus-c++-glib-1-0 -p /sbin/ldconfig

%post -n libdbus-c++-1-0 -p /sbin/ldconfig

%postun -n libdbus-c++-1-0 -p /sbin/ldconfig

%files -n libdbus-c++-1-0
%defattr(755,root,root)
%{_libdir}/libdbus-c++-1.so.0
%{_libdir}/libdbus-c++-1.so.0.0.0

%files -n libdbus-c++-glib-1-0
%defattr(755,root,root)
%{_libdir}/libdbus-c++-glib-1.so.0
%{_libdir}/libdbus-c++-glib-1.so.0.0.0

# TODO: Separate the two lib's devel packages. There's only one set of headers 
though.
# FIXME: Every html file contains date and time, must be fixed before docs are 
included.
# FIXME: Add this to %%doc when fixed "doc/html doc/img" maybe a separate doc 
package.

%files devel
%defattr(-,root,root)
%doc AUTHORS COPYING README TODO doc/html doc/img
%{_bindir}/dbusxx-xml2cpp
%{_bindir}/dbusxx-introspect
%{_libdir}/libdbus-c++-1.so
%{_libdir}/libdbus-c++-glib-1.so
%{_includedir}/dbus-c++-1
%{_libdir}/pkgconfig/*.pc

%changelog
++++++ baselibs.conf ++++++
libdbus-c++-1-0
libdbus-c++-glib-1-0
++++++ libdbus-c++-gcc47.patch ++++++
Index: src/eventloop-integration.cpp
===================================================================
--- src/eventloop-integration.cpp.orig  2011-11-28 17:04:18.000000000 +0200
+++ src/eventloop-integration.cpp       2012-03-19 09:22:12.179566265 +0200
@@ -38,6 +38,7 @@
 #include <cassert>
 #include <sys/poll.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 using namespace DBus;
 using namespace std;
++++++ libdbus-c++-nodocdatetime.patch ++++++
Index: doc/foot.html
===================================================================
--- doc/foot.html.orig  2011-11-30 18:57:37.000000000 +0200
+++ doc/foot.html       2012-03-13 14:44:14.494516524 +0200
@@ -10,7 +10,6 @@
     <table><tr>
       <td></td>
       <td class="copyright">Copyright &copy;$year DBus-C++ Project</td>
-      <td class="generated">Docs generated $datetime</td>
     </tr></table>
   </div>
 
++++++ libdbus-c++-noreturn.patch ++++++
Index: include/dbus-c++/util.h
===================================================================
--- include/dbus-c++/util.h.orig        2011-11-28 17:03:19.000000000 +0200
+++ include/dbus-c++/util.h     2012-03-11 13:21:18.851849466 +0200
@@ -243,6 +243,7 @@ public:
     // TODO: think about return type in this case
     // this assert should help me to find the use case where it's needed...
     //assert (false);
+      return _cb->call(param);
   }
 
   R call(P param) const
@@ -255,6 +256,8 @@ public:
     // TODO: think about return type in this case
     // this assert should help me to find the use case where it's needed...
     //assert (false);
+      return _cb->call(param);
+    
   }
 
   bool empty() const
++++++ libdbus-c++-pthread.patch ++++++
Index: dbus-c++-1.pc.in
===================================================================
--- dbus-c++-1.pc.in.orig       2011-11-28 22:52:01.000000000 +0200
+++ dbus-c++-1.pc.in    2012-03-11 15:49:36.452603560 +0200
@@ -7,5 +7,5 @@ Name: @PACKAGE@
 Description: Native C++ bindings for D-Bus
 Requires: dbus-1
 Version: @VERSION@
-Libs: -L${libdir} -ldbus-c++-1
+Libs: -L${libdir} -ldbus-c++-1 -lpthread
 Cflags: -I${includedir}/dbus-c++-1 -DDBUS_API_SUBJECT_TO_CHANGE
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to