Hello community,
here is the log from the commit of package libdbus-c++ for openSUSE:Factory
checked in at 2019-12-02 11:29:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libdbus-c++ (Old)
and /work/SRC/openSUSE:Factory/.libdbus-c++.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdbus-c++"
Mon Dec 2 11:29:02 2019 rev:14 rq:750676 version:0.9.1+git20170322
Changes:
--------
New Changes file:
--- /dev/null 2019-11-14 08:11:24.559789422 +0100
+++
/work/SRC/openSUSE:Factory/.libdbus-c++.new.4691/libdbus-c++-api-docs.changes
2019-12-02 11:31:02.454568465 +0100
@@ -0,0 +1,104 @@
+-------------------------------------------------------------------
+Mon Nov 25 07:34:29 UTC 2019 - Dave Plater <[email protected]>
+
+- Remove conflict between current libdbus-c++-devel and
+ libdbus-c++-glib-devel.
+
+-------------------------------------------------------------------
+Fri Nov 22 00:37:29 UTC 2019 - Stefan Brüns <[email protected]>
+
+- Drop -Werror=date-time, it is not supported by older GCCs, and
+ newer ones support SOURCE_DATE_EPOCH
+- Conflict older devel packages, to avoid file conflicts.
+
+-------------------------------------------------------------------
+Thu Nov 21 00:54:46 UTC 2019 - Stefan Brüns <[email protected]>
+
+- Split package into base, glib and docs package using _multibuild.
+ The glib flavor depends on gtkmm, but the base package is
+ sufficient for building most of the distribution, most notably
+ ffado/jack and its dependees.
+- Drop libdbus-c++-nodocdatetime.patch, doxygen honors SOURCE_DATE_EPOCH
+
+-------------------------------------------------------------------
+Mon Apr 10 14:00:47 UTC 2017 - [email protected]
+
+- Update libdbus-c++-nodocdatetime.patch
+
+-------------------------------------------------------------------
+Mon Mar 27 15:23:02 UTC 2017 - [email protected]
+
+- Update to git snapshot 0.9.1+git20170322 to fix ffado gcc7 build.
+- Added libdbus-c++-gcc7.patch.
+- Added libdbus-c++-sover.patch.
+- Removed patch libdbus-c++-gcc47.patch.
+- Upstream changes:
+ Fixed undefined ssize_t for clang-3.8.0 on FreeBSD
+ Fix copying containers
+ link to expat on linux
+ configure.ac: declare this version 0.9.1pw
+
+-------------------------------------------------------------------
+Sun Oct 16 18:04:30 UTC 2016 - [email protected]
+
+- Update groups, summaries, descriptions
+
+-------------------------------------------------------------------
+Wed Oct 12 18:52:44 UTC 2016 - [email protected]
+
+- Use the standardized patch tag line as described at
+ https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines.
+
+-------------------------------------------------------------------
+Tue Apr 19 13:12:38 UTC 2016 - [email protected]
+
+- Stop exporting CFLAGS and CXXFLAGS, no longer needed due to
+ changes in libsigc++.
+
+-------------------------------------------------------------------
+Wed Feb 3 19:52:06 UTC 2016 - [email protected]
+
+- Use url for source
+- Remove conditions for unsupported releases
+
+-------------------------------------------------------------------
+Thu Aug 20 21:00:19 UTC 2015 - [email protected]
+
+- Export CFLAGS="%{optflags} -std=gnu++11" and
+ CXXFLAGS="%{optflags} -std=gnu++11". Fix build with updated MM
+ stack.
+
+-------------------------------------------------------------------
+Mon Mar 23 10:03:24 UTC 2015 - [email protected]
+
+- Add libdbus-c++-glibmm-2.43.patch: Fix build with glibmm 2.4,
+ which has the bind_property macro defined already.
+
+-------------------------------------------------------------------
+Mon Dec 23 14:03:27 UTC 2013 - [email protected]
+
+- pthread is needed for the test app - not just on i586
+
+-------------------------------------------------------------------
+Tue Mar 20 07:33:35 UTC 2012 - [email protected]
+
+- Created libdbus-c++-gcc47.patch to fix a gcc 47 build error
+
+-------------------------------------------------------------------
+Mon Mar 12 08:42:55 UTC 2012 - [email protected]
+
+- Added baselibs.conf for 32 bit compat libs.
+
+-------------------------------------------------------------------
+Sun Mar 11 11:53:09 UTC 2012 - [email protected]
+
+- 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 - [email protected]
+
+- Created package dbus-c++ for ffado svn build.
+- See bnc#747391 & bnc#736115
+
New Changes file:
libdbus-c++-glib.changes: same change
--- /work/SRC/openSUSE:Factory/libdbus-c++/libdbus-c++.changes 2017-05-27
13:05:58.296636984 +0200
+++ /work/SRC/openSUSE:Factory/.libdbus-c++.new.4691/libdbus-c++.changes
2019-12-02 11:31:03.350568049 +0100
@@ -1,0 +2,22 @@
+Mon Nov 25 07:34:29 UTC 2019 - Dave Plater <[email protected]>
+
+- Remove conflict between current libdbus-c++-devel and
+ libdbus-c++-glib-devel.
+
+-------------------------------------------------------------------
+Fri Nov 22 00:37:29 UTC 2019 - Stefan Brüns <[email protected]>
+
+- Drop -Werror=date-time, it is not supported by older GCCs, and
+ newer ones support SOURCE_DATE_EPOCH
+- Conflict older devel packages, to avoid file conflicts.
+
+-------------------------------------------------------------------
+Thu Nov 21 00:54:46 UTC 2019 - Stefan Brüns <[email protected]>
+
+- Split package into base, glib and docs package using _multibuild.
+ The glib flavor depends on gtkmm, but the base package is
+ sufficient for building most of the distribution, most notably
+ ffado/jack and its dependees.
+- Drop libdbus-c++-nodocdatetime.patch, doxygen honors SOURCE_DATE_EPOCH
+
+-------------------------------------------------------------------
Old:
----
libdbus-c++-nodocdatetime.patch
New:
----
_multibuild
libdbus-c++-api-docs.changes
libdbus-c++-glib.changes
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libdbus-c++.spec ++++++
--- /var/tmp/diff_new_pack.Fl3uuK/_old 2019-12-02 11:31:03.954567770 +0100
+++ /var/tmp/diff_new_pack.Fl3uuK/_new 2019-12-02 11:31:03.958567768 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package libdbus-c++
+# spec file for package libdbus
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,31 +12,48 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+%global flavor @BUILD_FLAVOR@%{nil}
+
+%if "%{flavor}" == "glib"
+%bcond_with docs
+%bcond_without glib
+%global psuffix -glib
+%endif
+
+%if "%{flavor}" == "docs"
+%bcond_without docs
+%bcond_with glib
+%global psuffix -api-docs
+%endif
+
+%if "%{flavor}" == ""
+%bcond_with docs
+%bcond_with glib
+%endif
+
+%define sname libdbus-c++
+
%define _rev e3455d20fc0b6e00bce7668fbd9b165fdc8a7040
%define sover 1
-# Html documentation build causes cycles
-%define buildoc 0
-Name: libdbus-c++
+Name: libdbus-c++%{?psuffix}
Version: 0.9.1+git20170322
Release: 0
Summary: C++ Interface for DBus
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++
-Url: http://dbus-cplusplus.sourceforge.net/index.html
+URL: http://dbus-cplusplus.sourceforge.net/index.html
#Source0:
http://sourceforge.net/projects/dbus-cplusplus/files/dbus-c%%2B%%2B/%%{version}/%%{name}-%%{version}.tar.gz
-Source0:
https://github.com/andreas-volz/dbus-cplusplus/archive/%{_rev}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:
https://github.com/andreas-volz/dbus-cplusplus/archive/%{_rev}.tar.gz#/%{sname}-%{version}.tar.gz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM libdbus-c++-noreturn.patch [email protected] -- Fix
no return from function
Patch0: libdbus-c++-noreturn.patch
# PATCH-FIX-UPSTREAM libdbus-c++-pthread.patch [email protected] -- Get
ffado to build with libdbus-c++
Patch1: libdbus-c++-pthread.patch
-# PATCH-FIX-OPENSUSE libdbus-c++-nodocdatetime.patch [email protected] --
No current date / time allowed in docs?
-Patch2: libdbus-c++-nodocdatetime.patch
# PATCH-FIX-UPSTREAM libdbus-c++-glibmm-2.43.patch [email protected] -- Fix
build with glibmm2 2.43.x+
Patch4: libdbus-c++-glibmm-2.43.patch
# PATCH-FIX-UPSTREAM libdbus-c++-gcc7.patch [email protected] -- Fix gcc7
build errors
@@ -46,50 +63,50 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: dos2unix
-BuildRequires: fdupes
BuildRequires: gcc-c++
-%if %{buildoc} == 1
+%if %{with docs}
BuildRequires: doxygen
+BuildRequires: fdupes
BuildRequires: graphviz-gnome
%endif
+%if %{with glib}
BuildRequires: gtkmm2-devel
-BuildRequires: libexpat-devel
+BuildRequires: pkgconfig(dbus-glib-1)
+%endif
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(dbus-1)
-BuildRequires: pkgconfig(dbus-glib-1)
# ecore
BuildRequires: libexpat-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if "%{flavor}" == "docs"
+BuildArch: noarch
+%endif
%description
DBus-c++ provides 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-%{sover}
+%package -n libdbus-c++%{?psuffix}-1-%{sover}
Summary: C++ Interface for D-Bus
Group: System/Libraries
-%description -n libdbus-c++-1-%{sover}
-DBus-c++ provides 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-%{sover}
-Summary: Glib integration for libdbus-c++
-Group: System/Libraries
-
-%description -n libdbus-c++-glib-1-%{sover}
+%description -n libdbus-c++%{?psuffix}-1-%{sover}
DBus-c++ provides 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.
+optional own main loop.
%package devel
Summary: Development files for libdbus-c++
Group: Development/Libraries/C and C++
-Requires: libdbus-c++-1-%{sover} = %{version}
-Requires: libdbus-c++-glib-1-%{sover} = %{version}
+Requires: libdbus-c++%{?psuffix}-1-%{sover} = %{version}
+Recommends: libdbus-c++-api-docs
+Conflicts: libdbus-c++-devel < %{version}-%{release}
+%if 0%{?suse_version} <= 1500
+%if %{with glib}
+Requires: libdbus-c++-devel = %{version}-%{release}
+%endif
+%endif
%description devel
DBus-c++ provides a C++ API for D-BUS. The library has
@@ -100,86 +117,78 @@
%prep
%setup -q -n dbus-cplusplus-%{_rev}
-#-n dbus-cplusplus-%%{_rev}
%patch0
%patch1
-%patch2
%patch4 -p1
%patch5
%patch6
%build
export SOVER="%{sover}:0:0"
-#%%{sover}
-# --enable-doxygen-docs -fpermissive
-./bootstrap
-#./autogen.sh
-%if 1 == 0
-%define gcc_version 7
-export CC=gcc-7
-export CPP=cpp-7
-export CXX=g++-7
-%endif
-export LDFLAGS="$LDFLAGS -lexpat -lpthread"
-%if 0%{?gcc_version} > 5
-export CXXFLAGS="%{optflags} --std=c++11 -fPIC -Werror=date-time"
-%else
+export LDFLAGS="$LDFLAGS -lexpat -lpthread -pie"
+export CFLAGS="%{optflags} -fPIC"
export CXXFLAGS="%{optflags} --std=c++11 -fPIC"
+./bootstrap
+%configure \
+ --disable-ecore \
+ --enable-static=no \
+%if %{without glib}
+ --disable-glib \
%endif
-%configure --disable-ecore --enable-static=no \
-%if %{buildoc} == 1
+%if %{with docs}
--enable-doxygen-docs \
%else
--disable-doxygen-docs \
-%endif
--enable-tests \
--enable-examples
+%endif
+
+%if "%{flavor}" == "docs"
+make %{?_smp_mflags} -C doc
+%else
make %{?_smp_mflags}
+%endif
%install
+%if "%{flavor}" == "docs"
+%fdupes -s doc/
+
+%else
%make_install
dos2unix -k AUTHORS
rm -f %{buildroot}%{_libdir}/*.la
-%if %{buildoc} == 1
-%fdupes -s doc/
-%endif
-%post -n libdbus-c++-glib-1-%{sover} -p /sbin/ldconfig
-
-%postun -n libdbus-c++-glib-1-%{sover} -p /sbin/ldconfig
-
-%post -n libdbus-c++-1-%{sover} -p /sbin/ldconfig
-
-%postun -n libdbus-c++-1-%{sover} -p /sbin/ldconfig
+# Remove files packaged in the base flavor
+%if "%{flavor}" == "glib"
+rm %{buildroot}%{_bindir}/*
+rm -Rf %{buildroot}%{_includedir}
+rm -Rf %{buildroot}%{_libdir}/libdbus-c++-1.so*
+rm -Rf %{buildroot}%{_libdir}/pkgconfig/dbus-c++-1.pc
+%endif
+%endif
-%files -n libdbus-c++-1-%{sover}
-%defattr(755,root,root)
-%{_libdir}/libdbus-c++-1.so.%{sover}
-%{_libdir}/libdbus-c++-1.so.%{sover}.0.0
+%post -n libdbus-c++%{?psuffix}-1-%{sover} -p /sbin/ldconfig
+%postun -n libdbus-c++%{?psuffix}-1-%{sover} -p /sbin/ldconfig
-%files -n libdbus-c++-glib-1-%{sover}
-%defattr(755,root,root)
-%{_libdir}/libdbus-c++-glib-1.so.%{sover}
-%{_libdir}/libdbus-c++-glib-1.so.%{sover}.0.0
+%if "%{flavor}" == "docs"
+%files
+%doc doc/html doc/img
+%else
-# 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 -n libdbus-c++%{?psuffix}-1-%{sover}
+%{_libdir}/libdbus-c++%{?psuffix}-1.so.%{sover}*
%files devel
-%defattr(-,root,root)
-%if %{buildoc} == 1
-%doc AUTHORS COPYING README TODO doc/html doc/img
-%else
-%doc AUTHORS COPYING README TODO
-%endif
-
+%if "%{flavor}" == ""
+%license COPYING
+%doc AUTHORS README TODO
%{_bindir}/dbusxx-xml2cpp
%{_bindir}/dbusxx-introspect
-%{_libdir}/libdbus-c++-1.so
-%{_libdir}/libdbus-c++-glib-1.so
%{_includedir}/dbus-c++-1
-%{_libdir}/pkgconfig/*.pc
-# doc/html doc/img
+%endif
+
+%{_libdir}/libdbus-c++%{?psuffix}-1.so
+%{_libdir}/pkgconfig/*%{?psuffix}*.pc
+%endif
%changelog
++++++ _multibuild ++++++
<multibuild>
<package>glib</package>
<package>docs</package>
</multibuild>
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.Fl3uuK/_old 2019-12-02 11:31:04.002567748 +0100
+++ /var/tmp/diff_new_pack.Fl3uuK/_new 2019-12-02 11:31:04.002567748 +0100
@@ -1,2 +1 @@
libdbus-c++-1-1
-libdbus-c++-glib-1-1
