diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/coverage.txt | 2 | ||||
| -rw-r--r-- | packaging/dbus.spec | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/packaging/coverage.txt b/packaging/coverage.txt index b3674cb2..438bcd73 100644 --- a/packaging/coverage.txt +++ b/packaging/coverage.txt @@ -1,5 +1,5 @@ How to analyze coverage: -1. read HACKING file. +1. read CONTRIBUTING.md file. 2. gbs build adding --define '_with_coverage 1' 3. take *.o and *.gcno files from compilation (<gbs-build-root>/home/abuild/rpmbuild/BUILD/dbus-1.10.6/dbus/.libs) into a /safe/place you may also use generated rpm package dbus-coverage-objects. diff --git a/packaging/dbus.spec b/packaging/dbus.spec index 4f97865b..a7057999 100644 --- a/packaging/dbus.spec +++ b/packaging/dbus.spec @@ -13,6 +13,7 @@ Group: Base/IPC %define with_systemd 1 +BuildRequires: autoconf-archive BuildRequires: libzio BuildRequires: libtool BuildRequires: pkg-config @@ -26,7 +27,7 @@ BuildRequires: pkgconfig(cynara-client) BuildRequires: pkgconfig(cynara-session) BuildRequires: pkgconfig(cynara-client-async) BuildRequires: pkgconfig(libdbuspolicy1) -Version: 1.10.6 +Version: 1.12.16 Release: 3 Source0: http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz Source3: dbus_at_console.ck @@ -130,7 +131,6 @@ export V=1 --with-dbus-user=dbus \ --libexecdir=%{_libdir}/%{name} \ --libdir=%{_libdir} \ - --with-init-scripts=suse \ --enable-inotify \ --disable-doxygen-docs \ --disable-xml-docs \ @@ -167,7 +167,6 @@ popd --with-dbus-user=dbus \ --libexecdir=%{_libdir}/%{name} \ --libdir=%{_libdir} \ - --with-init-scripts=suse \ --enable-inotify \ --disable-doxygen-docs \ --disable-xml-docs \ @@ -199,7 +198,6 @@ find dbus -name '*.gcno' -exec cp '{}' coverage-objects ';' --with-dbus-user=dbus \ --libexecdir=%{_libdir}/%{name} \ --libdir=%{_libdir} \ - --with-init-scripts=suse \ --enable-inotify \ --disable-doxygen-docs \ --disable-xml-docs \ @@ -232,7 +230,7 @@ mkdir -p %{buildroot}/lib/dbus-1/system-services mkdir -p %{buildroot}/%{_datadir}/dbus-1/system-services mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces # -chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO +chmod a-x AUTHORS COPYING CONTRIBUTING.md NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO # install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d @@ -333,8 +331,6 @@ popd %{_unitdir}/dbus.service %dir %{_unitdir}/sockets.target.wants %{_unitdir}/sockets.target.wants/dbus.socket -%dir %{_unitdir}/dbus.target.wants -%{_unitdir}/dbus.target.wants/dbus.socket %dir %{_unitdir_user} %{_unitdir_user}/dbus.socket %{_unitdir_user}/dbus.service @@ -348,6 +344,8 @@ popd %dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/system-services %{_sysconfdir}/profile.d/dbus.sh +%{_libdir}/sysusers.d/dbus.conf +%{_libdir}/tmpfiles.d/dbus.conf %files libs %manifest %{name}.manifest @@ -365,6 +363,10 @@ popd %{_libdir}/dbus-1.0/include %{_libdir}/pkgconfig/dbus-1.pc %dir %{_libdir}/dbus-1.0 +%{_libdir}/cmake/DBus1/DBus1Config.cmake +%{_libdir}/cmake/DBus1/DBus1ConfigVersion.cmake +%{_datadir}/xml/dbus-1/busconfig.dtd +%{_datadir}/xml/dbus-1/introspect.dtd %files tests %manifest %{name}.manifest |