X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fdbus.spec;h=d6bf044cf4cef244b41390ac537ca2c38854ae0b;hb=2f70cc6fa74c81ebdaf69c5d3930d6265f652ab1;hp=e0ee7b99b9d5bb94391651b6452e8ae2b8d2a1ad;hpb=f0350549cefec1ac1efefeece88820deb70f28fe;p=platform%2Fupstream%2Fdbus.git

diff --git a/packaging/dbus.spec b/packaging/dbus.spec
index e0ee7b9..d6bf044 100644
--- a/packaging/dbus.spec
+++ b/packaging/dbus.spec
@@ -1,26 +1,31 @@
 %define dbus_user_uid           81
 
+%bcond_with coverage
+
+# Do not create provides from extension .so files because the main package
+# should anchor any reverse-dependencies
+%global __provides_exclude_from ^(.*\\.extension-kdbus)$
+
 Name:           dbus
 Url:            http://dbus.freedesktop.org/
 Summary:        D-Bus Message Bus System
-License:        GPL-2.0+ or AFL-2.1
+License:        GPL-2.0+ or AFL-2.1, BSD-2.0, LGPL-2.1+, MIT, Apache-2.0
 Group:          Base/IPC
 # COMMON1-BEGIN
 
 %define with_systemd 1
 
-BuildRequires:  doxygen
 BuildRequires:  expat-devel
 BuildRequires:  libtool
-BuildRequires:  libxslt-tools
 BuildRequires:  libzio
 BuildRequires:  pkg-config
-BuildRequires:  xmlto
 %if %{with_systemd}
-BuildRequires:  pkgconfig(libsystemd-daemon)
-BuildRequires:  pkgconfig(libsystemd-login)
+BuildRequires:  pkgconfig(libsystemd)
 %endif
-Version:        1.8.2
+BuildRequires:  pkgconfig(libsmack)
+BuildRequires:  pkgconfig(cynara-client-async)
+BuildRequires:  pkgconfig(cynara-session)
+Version:        1.10.6
 Release:        0
 Source0:        http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
 Source1:        rc.boot.dbus
@@ -29,21 +34,15 @@ Source4:        baselibs.conf
 Source5:        dbus-user.service
 Source6:        dbus-user.socket
 Source7:        dbus.sh
+Source1001:     dbus.manifest
 BuildRequires:  libcap-ng-devel
-BuildRequires:  pkgconfig(libsmack)
+BuildRequires:  pkgconfig(libdbuspolicy1)
+BuildRequires:  pkgconfig(cynara-client)
+BuildRequires:	pkgconfig(glib-2.0)
 # COMMON1-END
 Requires(pre):  /usr/sbin/groupadd /usr/sbin/useradd
 Provides:       dbus-1
 
-
-
-%package devel-doc
-
-Summary:        Developer documentation package for D-Bus
-Group:          Documentation
-Requires:       %{name} = %{version}
-BuildArch:      noarch
-
 %description
 D-Bus is a message bus system, a simple way for applications to talk to
 one another. D-Bus supplies both a system daemon and a
@@ -51,21 +50,67 @@ per-user-login-session daemon. Also, the message bus is built on top of
 a general one-to-one message passing framework, which can be used by
 any two apps to communicate directly (without going through the message
 bus daemon).
+.
+This package provides dbus-daemon.
 
-%description devel-doc
+%package devel
+Summary:        Developer package for D-Bus
+Group:          Development/Libraries
+Requires:       dbus-libs = %{version}
+
+%description devel
 D-Bus is a message bus system, a simple way for applications to talk to
-one another. D-BUS supplies both a system daemon and a
-per-user-login-session daemon. Also, the message bus is built on top of
-a general one-to-one message passing framework, which can be used by
-any two apps to communicate directly (without going through the message
-bus daemon).
+one another.
+.
+This package provides development libraries.
+
+%package libs
+Summary:         Library package for D-Bus
+Group:           System/Libraries
+
+%description libs
+D-Bus is a message bus system, a simple way for applications to talk to
+one another.
+.
+This package provides shared libraries.
+
+%package tests
+Summary:	Package with binaries and data for dbus tests
+
+%description tests
+This package contains installable tests. Tests are compatible with 'dbus-integration-tests' framework.
+
+%if %{with coverage}
+%package coverage
+Summary:    Special version of dbus library for getting coverage analysis
+
+%description coverage
+Special version of dbus library for getting coverage analysis. *.gcda coverage files
+are generated on each use of library in directory set by GCOV_PREFIX and GCOV_PREFIX_STRIP.
+Use the library by modifying LD_LIBRARY_PATH.
+This package is intended for debug/test use only.
+
+%package coverage-objects
+Summary:    Generated object files and gcov notes for coverage analysis
+
+%description coverage-objects
+We need to keep objects and gcno files to analyze coverage.
+This package is intended for debug/test use only.
+%endif
+
+%package -n dbus-libs-extension-kdbus
+Summary:	Extension for dbus to support KDBUS in Tizen
+Requires:	dbus = %{version}-%{release}
+
+%description -n dbus-libs-extension-kdbus
+This modifies dbus to support KDBUS in Tizen.
 
 %prep
 # COMMON2-BEGIN
 %setup -n dbus-%{version} -q
 
 %build
-autoreconf -fi
+cp %{SOURCE1001} .
 # We use -fpie/-pie for the whole build; this is the recommended way to harden
 # the build upstream, see discussion in fdo#46570
 export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie"
@@ -74,7 +119,9 @@ export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
 export CFLAGS="$CFLAGS -fstack-protector"
 export CXXFLAGS="$CXXFLAGS -fstack-protector"
 export V=1
-%configure \
+
+# Create kdbus extension first (dbus)
+%reconfigure \
     --disable-static 							\
     --with-pic 								\
     --with-dbus-user=dbus 						\
@@ -82,19 +129,97 @@ export V=1
     --libdir=%{_libdir}							\
     --with-init-scripts=suse						\
     --enable-inotify							\
-    --enable-doxygen-docs						\
+    --disable-doxygen-docs						\
+    --disable-xml-docs							\
 %if %{with_systemd}
     --enable-systemd							\
 %endif
+    --enable-kdbus-transport                                            \
+    --enable-libdbuspolicy                      			\
+    --with-system-pid-file=/tmp/dbus_launch				\
     --with-console-auth-dir=/var/run/dbus/at_console/			\
     --with-systemdsystemunitdir=%{_unitdir}				\
-    --enable-smack
+    --enable-smack \
+    --enable-cynara \
+    --enable-modular-tests \
+    --enable-installed-tests
+
+make %{?_smp_mflags}
+
+mkdir -p extension-kdbus
+pushd dbus/.libs/
+# rm if symlink. mv if regular file.
+for FILE in libdbus-*.so*; do test -h "$FILE" && rm "$FILE" || mv "$FILE" ../../extension-kdbus/ ; done
+popd
+
+%{__make} clean
+
+# Support for generating separate packages with libraries generating coverage files
+# WARNING: if coverage build is enabled, incremental builds will not work correctly.
+#          Use the option only to generate dbus-coverage packages.
+%if %{with coverage}
+%reconfigure \
+    --disable-static 							\
+    --with-pic 								\
+    --with-dbus-user=dbus 						\
+    --libexecdir=%{_libdir}/%{name}					\
+    --libdir=%{_libdir}							\
+    --with-init-scripts=suse						\
+    --enable-inotify							\
+    --disable-doxygen-docs						\
+    --disable-xml-docs							\
+%if %{with_systemd}
+    --enable-systemd							\
+%endif
+    --with-system-pid-file=/tmp/dbus_launch				\
+    --with-console-auth-dir=/var/run/dbus/at_console/			\
+    --with-systemdsystemunitdir=%{_unitdir}				\
+    --enable-smack \
+    --enable-cynara \
+    --enable-modular-tests \
+    --enable-installed-tests \
+	--enable-compiler-coverage
+make %{?_smp_mflags}
+mkdir coverage
+cp dbus/.libs/libdbus-1.so.3 coverage
+mkdir coverage-objects
+find dbus -name '*.o' -exec cp '{}' coverage-objects ';'
+find dbus -name '*.gcno' -exec cp '{}' coverage-objects ';'
+
+%endif
+
+%reconfigure \
+    --disable-static 							\
+    --with-pic 								\
+    --with-dbus-user=dbus 						\
+    --libexecdir=%{_libdir}/%{name}					\
+    --libdir=%{_libdir}							\
+    --with-init-scripts=suse						\
+    --enable-inotify							\
+    --disable-doxygen-docs						\
+    --disable-xml-docs							\
+%if %{with_systemd}
+    --enable-systemd							\
+%endif
+    --with-system-pid-file=/tmp/dbus_launch				\
+    --with-console-auth-dir=/var/run/dbus/at_console/			\
+    --with-systemdsystemunitdir=%{_unitdir}				\
+    --enable-smack \
+    --enable-cynara \
+    --enable-modular-tests \
+    --enable-installed-tests
 
 make %{?_smp_mflags}
 
 %install
 # COMMON2-END
 make DESTDIR=%{buildroot} install
+
+# kdbus extension
+pushd extension-kdbus
+for FILE in *; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE.extension-kdbus"; done
+popd
+
 mkdir -p %{buildroot}/usr/sbin
 install -d %{buildroot}/%{_localstatedir}/run/dbus
 mkdir -p %{buildroot}/%{_libdir}/pkgconfig
@@ -110,21 +235,51 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
 touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
 
 mkdir -p %{buildroot}%{_unitdir_user}
-install -m0644 %{SOURCE5} %{buildroot}%{_unitdir_user}/dbus.service
-install -m0644 %{SOURCE6} %{buildroot}%{_unitdir_user}/dbus.socket
-# File packaged by libdbus and dbus-devel
-rm -rf %{buildroot}/%{_includedir}/*
+install -m 0644 %{SOURCE5} %{buildroot}%{_unitdir_user}/dbus.service
+install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir_user}/dbus.socket
+
+mkdir -p %{buildroot}%{_unitdir_user}/basic.target.wants
+ln -sf ../dbus.service %{buildroot}%{_unitdir_user}/basic.target.wants/dbus.service
+
+mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
+ln -sf ../dbus.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/dbus.socket
+
 rm -rf %{buildroot}/%{_libdir}/*.la
-rm -rf %{buildroot}/%{_libdir}/libdbus-1.so
-rm -rf %{buildroot}/%{_libdir}/libdbus-1.so.*
-rm -rf %{buildroot}/%{_libdir}/dbus-1.0/include
-rm -rf %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc
-rm -rf %{buildroot}/%{_mandir}/man1/dbus-launch.1*
 rm -rf %{buildroot}/%{_bindir}/dbus-launch
 
 # install script for login shells (/etc/profile.d)
 install -d %{buildroot}%{_sysconfdir}/profile.d
-install -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/dbus.sh
+install -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/dbus.sh
+
+# docs
+rm -rf %{buildroot}%{_datadir}/doc
+
+# build test binaries and copy test data
+%define relative_dbus_tests_base_dir %{_libdir}/dbus-tests
+%define dbus_tests_base_dir %{buildroot}%{relative_dbus_tests_base_dir}
+%define dbus_installed_tests_dir %{_libdir}/dbus/installed-tests/dbus
+mkdir -p %{dbus_tests_base_dir}/test-suites/dbus-tests/
+
+mkdir -p %{dbus_tests_base_dir}/runner/
+%__cc %{_builddir}/%{name}-%{version}/test-runner.c -g -o %{dbus_tests_base_dir}/runner/dbus-tests
+rm -fr %{buildroot}/usr/share/installed-tests/dbus
+# The tests are installed in standard directory for dbus tests.
+# However, we need to have the tests also available for dbus-integration-tests package.
+# Thus, we link selected tests to our dbus-integration-tests directory
+for f in manual-dir-iter manual-tcp test-corrupt test-dbus-daemon \
+		 test-dbus-daemon-eavesdrop test-fdpass test-loopback test-marshal \
+		 test-monitor test-printf test-refs test-relay test-sd-activation \
+		 test-shell test-syntax test-syslog test-uid-permissions
+do ln -s %{dbus_installed_tests_dir}/$f %{dbus_tests_base_dir}/test-suites/dbus-tests/$f; done
+
+%if %{with coverage}
+%define relative_cov_lib_dir %{relative_dbus_tests_base_dir}/coverage-libs
+%define cov_lib_dir %{buildroot}%{relative_cov_lib_dir}
+mkdir -p %{cov_lib_dir}
+mkdir -p %{cov_lib_dir}/objects
+install -m 0755 coverage/* %{cov_lib_dir}
+install -m 0644 coverage-objects/* %{cov_lib_dir}/objects
+%endif
 
 %pre
 # Add the "dbus" user and group
@@ -132,16 +287,32 @@ install -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/dbus.sh
 /usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} -g %{dbus_user_uid} \
         -s /sbin/nologin -r -d '/' dbus 2> /dev/null || :
 
-%docs_package
+%post -n dbus-libs-extension-kdbus
+pushd %{_libdir}
+for FILE in libdbus*.so.*.extension-kdbus; do mv "$FILE" "${FILE%.extension-kdbus}"; done
+popd
+
+%files -n dbus-libs-extension-kdbus
+%manifest %{name}.manifest
+%license LICENSE.AFL2.1  LICENSE.BSD2.0  LICENSE.LGPL2.1  LICENSE.MIT  LICENSE.APACHE2.0
+%{_libdir}/libdbus*.so.*.extension-kdbus
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files
+%manifest %{name}.manifest
+%license LICENSE.AFL2.1  LICENSE.BSD2.0  LICENSE.LGPL2.1  LICENSE.MIT  LICENSE.APACHE2.0
 %defattr(-, root, root)
 %dir %{_localstatedir}/lib/dbus
 %dir /lib/dbus-1
 %dir /lib/dbus-1/system-services
-%license  COPYING
 %config(noreplace) %{_sysconfdir}/dbus-1/session.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.conf
+%config(noreplace) %{_datadir}/dbus-1/session.conf
+%config(noreplace) %{_datadir}/dbus-1/system.conf
 %{_sysconfdir}/ConsoleKit
 %{_bindir}/dbus-cleanup-sockets
 %{_bindir}/dbus-daemon
@@ -149,6 +320,8 @@ install -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/dbus.sh
 %{_bindir}/dbus-run-session
 %{_bindir}/dbus-send
 %{_bindir}/dbus-uuidgen
+%{_bindir}/dbus-test-tool
+%{_bindir}/dbus-update-activation-environment
 # See doc/system-activation.txt in source tarball for the rationale
 # behind these permissions
 %attr(4750,root,dbus) %verify(not mode) %{_libdir}/dbus/dbus-daemon-launch-helper
@@ -159,6 +332,10 @@ install -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/dbus.sh
 %{_unitdir}/dbus.socket
 %{_unitdir_user}/dbus.service
 %{_unitdir_user}/dbus.socket
+%dir %{_unitdir_user}/basic.target.wants
+%{_unitdir_user}/basic.target.wants/dbus.service
+%dir %{_unitdir_user}/sockets.target.wants
+%{_unitdir_user}/sockets.target.wants/dbus.socket
 %dir %{_unitdir}/dbus.target.wants
 %{_unitdir}/dbus.target.wants/dbus.socket
 %dir %{_unitdir}/multi-user.target.wants
@@ -166,32 +343,42 @@ install -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/dbus.sh
 %dir %{_unitdir}/sockets.target.wants
 %{_unitdir}/sockets.target.wants/dbus.socket
 %dir %{_sysconfdir}/dbus-1
-%dir %{_sysconfdir}/dbus-1/session.d
-%dir %{_sysconfdir}/dbus-1/system.d
+%dir %{_datadir}/dbus-1/session.d
+%dir %{_datadir}/dbus-1/system.d
 %dir %{_datadir}/dbus-1
 %dir %{_datadir}/dbus-1/interfaces
 %dir %{_datadir}/dbus-1/services
 %dir %{_datadir}/dbus-1/system-services
 %{_sysconfdir}/profile.d/dbus.sh
 
-%files devel-doc
+%files libs
+%manifest %{name}.manifest
+%license LICENSE.AFL2.1  LICENSE.BSD2.0  LICENSE.LGPL2.1  LICENSE.MIT  LICENSE.APACHE2.0
+%exclude %{_libdir}/libdbus*.so.*.extension-kdbus
+%defattr(-, root, root)
+%{_libdir}/libdbus-1.so.*
+
+%files devel
+%manifest %{name}.manifest
 %defattr(-,root,root)
-%dir %{_datadir}/doc/dbus
-%{_datadir}/doc/dbus/api/
-%doc %{_datadir}/doc/dbus/dbus-cleanup-sockets.1.html
-%doc %{_datadir}/doc/dbus/dbus-daemon.1.html
-%doc %{_datadir}/doc/dbus/dbus-faq.html
-%doc %{_datadir}/doc/dbus/dbus-launch.1.html
-%doc %{_datadir}/doc/dbus/dbus-monitor.1.html
-%doc %{_datadir}/doc/dbus/dbus-run-session.1.html
-%doc %{_datadir}/doc/dbus/dbus-send.1.html
-%doc %{_datadir}/doc/dbus/dbus-specification.html
-%doc %{_datadir}/doc/dbus/dbus-test-plan.html
-%doc %{_datadir}/doc/dbus/dbus-tutorial.html
-%doc %{_datadir}/doc/dbus/dbus-uuidgen.1.html
-%doc %{_datadir}/doc/dbus/dbus.devhelp
-%doc %{_datadir}/doc/dbus/diagram.*
-%doc %{_datadir}/doc/dbus/system-activation.txt
-%doc doc/*.txt doc/file-boilerplate.c doc/TODO
+%{_includedir}/*
+%{_libdir}/libdbus-1.so
+%{_libdir}/dbus-1.0/include
+%{_libdir}/pkgconfig/dbus-1.pc
+%dir %{_libdir}/dbus-1.0
+
+%files tests
+%manifest %{name}.manifest
+%defattr(-,root,root)
+%{_libdir}/dbus-tests/test-suites/dbus-tests
+%{_libdir}/dbus-tests/runner/dbus-tests
+%{_libdir}/dbus/installed-tests
+
+%if %{with coverage}
+%files coverage
+%{relative_cov_lib_dir}/*
+%files coverage-objects
+%{relative_cov_lib_dir}/objects/*
+%endif
 
 %changelog