packaging: Integrate libdbus and dbus spec files

With dbus-1.10 depending on systemd code there is no benefit
in keeping separate spec files.

Change-Id: I3a9311e1730b51b3d4ff1dda513b564d19065aa9

diff --git a/packaging/dbus.spec b/packaging/dbus.spec
index a03adf1..bb657f4 100644 (file)
--- a/packaging/dbus.spec
+++ b/packaging/dbus.spec
@@ -19,6 +19,7 @@ BuildRequires:  pkg-config
 %if %{with_systemd}
 BuildRequires:  pkgconfig(libsystemd)
 %endif
+BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(cynara-client-async)
 BuildRequires:  pkgconfig(cynara-session)
 Version:        1.10.6
@@ -43,8 +44,6 @@ BuildRequires:  pkgconfig(cynara-client)
 # COMMON1-END
 Requires(pre):  /usr/sbin/groupadd /usr/sbin/useradd
 Provides:       dbus-1
-# This is an artificial requirement needed to keep proper order of building of the packages
-BuildRequires:  libdbus = %{version}
 
 %description
 D-Bus is a message bus system, a simple way for applications to talk to
@@ -53,6 +52,30 @@ 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.
+
+%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.
+.
+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.
+
 
 %prep
 # COMMON2-BEGIN
@@ -115,14 +138,7 @@ 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}/*
 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)
@@ -138,6 +154,12 @@ rm -rf %{buildroot}%{_datadir}/doc
 /usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} -g %{dbus_user_uid} \
         -s /sbin/nologin -r -d '/' dbus 2> /dev/null || :
 
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
 %files
 %manifest %{name}.manifest
 %defattr(-, root, root)
@@ -183,4 +205,19 @@ rm -rf %{buildroot}%{_datadir}/doc
 %dir %{_datadir}/dbus-1/system-services
 %{_sysconfdir}/profile.d/dbus.sh
 
+%files libs
+%manifest %{name}.manifest
+%defattr(-, root, root)
+%{_libdir}/libdbus-1.so.*
+
+%files devel
+%manifest %{name}.manifest
+%defattr(-,root,root)
+%{_includedir}/*
+%{_libdir}/libdbus-1.so
+%{_libdir}/dbus-1.0/include
+%{_libdir}/pkgconfig/dbus-1.pc
+%dir %{_libdir}/dbus-1.0
+
+
 %changelog

diff --git a/packaging/libdbus.spec b/packaging/libdbus.spec
deleted file mode 100644 (file)
index f6e0e6c..0000000
--- a/packaging/libdbus.spec
+++ /dev/null
@@ -1,144 +0,0 @@
-%bcond_with kdbus
-%bcond_with dbuspolicy
-
-%define with_systemd 1
-
-Name:           libdbus
-Url:            http://dbus.freedesktop.org/
-Summary:        Library package for D-Bus
-License:        GPL-2.0+ or AFL-2.1, LGPL-2.1+
-Group:          System/Libraries
-Version:        1.10.6
-Release:        0
-Source0:        http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
-Source1001:     libdbus.manifest
-
-BuildRequires:  expat-devel
-BuildRequires:  libtool
-BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(libsmack)
-%if %{with_systemd}
-BuildRequires:  pkgconfig(libsystemd)
-%endif
-# Enable support for libdbuspolicy (only for kdbus transport)
-%if %{with kdbus}
-%if %{with dbuspolicy}
-BuildRequires:  pkgconfig(libdbuspolicy1)
-BuildRequires:  pkgconfig(cynara-client)
-%endif
-%endif
-
-
-%package -n dbus-devel
-Summary:        Developer package for D-Bus
-Group:          Development/Libraries
-Requires:       libdbus = %{version}
-
-
-
-%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
-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).
-
-
-
-%description -n dbus-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).
-
-
-
-%prep
-# COMMON2-BEGIN
-%setup -n dbus-%{version} -q
-cp %{SOURCE1001} .
-
-
-%build
-autoreconf -fi
-# 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"
-export LDFLAGS="-pie"
-export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
-export CFLAGS="$CFLAGS -fstack-protector"
-export CXXFLAGS="$CXXFLAGS -fstack-protector"
-export V=1
-%configure \
-    --disable-static                                                   \
-    --with-pic                                                         \
-    --with-dbus-user=dbus                                              \
-    --libexecdir=%{_libdir}/%{name}                                    \
-    --libdir=%{_libdir}                                                        \
-    --with-init-scripts=suse                                           \
-    --enable-inotify                                                   \
-    --with-console-auth-dir=/var/run/dbus/at_console/                  \
-    --disable-doxygen-docs                                             \
-    --disable-xml-docs                                                 \
-%if %{with_systemd}
-    --enable-systemd                                                   \
-%endif
-    --with-systemdsystemunitdir=%{_unitdir}                            \
-%if %{with kdbus}
-    --enable-kdbus-transport                                            \
-%if %{with dbuspolicy}
-    --enable-libdbuspolicy                              \
-%endif
-%endif
-    --enable-smack
-
-make %{?_smp_mflags} -C dbus libdbus-1.la
-
-
-
-%install
-make DESTDIR=%{buildroot} -C dbus \
-     lib_LTLIBRARIES=libdbus-1.la \
-     install-libLTLIBRARIES \
-     install-dbusincludeHEADERS \
-     install-nodist_dbusarchincludeHEADERS
-
-make DESTDIR=%{buildroot} install-pkgconfigDATA
-rm %{buildroot}/%{_libdir}/libdbus-1.la
-
-
-%post -p /sbin/ldconfig
-
-
-
-%postun -p /sbin/ldconfig
-
-
-
-%files
-%manifest %{name}.manifest
-%defattr(-, root, root)
-%{_libdir}/libdbus-1.so.*
-# Own those directories in the library instead of dbus-1, since dbus users
-# often ship files there
-#%dir %{_sysconfdir}/dbus-1
-#%dir %{_sysconfdir}/dbus-1/session.d
-#%dir %{_sysconfdir}/dbus-1/system.d
-#%dir %{_datadir}/dbus-1
-#%dir %{_datadir}/dbus-1/interfaces
-#%dir %{_datadir}/dbus-1/services
-#%dir %{_datadir}/dbus-1/system-services
-
-
-
-%files -n dbus-devel
-%manifest %{name}.manifest
-%defattr(-,root,root)
-%{_includedir}/*
-%{_libdir}/libdbus-1.so
-%{_libdir}/dbus-1.0/include
-%{_libdir}/pkgconfig/dbus-1.pc
-%dir %{_libdir}/dbus-1.0