edit spec file for the rpm packaging

Change-Id: I8cc27cba98316e5f97c2d379a4a129650603e3d7

diff --git a/packaging/com.samsung.dbus.spec b/packaging/com.samsung.dbus.spec
index 2c49403..eedc959 100644 (file)
--- a/packaging/com.samsung.dbus.spec
+++ b/packaging/com.samsung.dbus.spec
@@ -5,6 +5,9 @@ Release:        0
 Group:         System/Libraries
 License:       GPLv2+ or AFL
 Source0:       %{name}-%{version}.tar.gz
+Source2:       dbus-user.socket
+Source3:       dbus-user.service
+Source4:       system.conf
 BuildRequires:  which
 BuildRequires:  expat-devel
 BuildRequires:  libtool
@@ -15,12 +18,48 @@ BuildRequires:  pkgconfig(x11)
 %description
 D-Bus message bus with kdbus support
 
+%package libs
+Summary:    Libraries for accessing D-Bus
+Group:      System/Libraries
+#FIXME: This is circular dependency
+Requires:   %{name} = %{version}-%{release}
+
+%description libs
+Lowlevel libraries for accessing D-Bus.
+
+%package devel
+Summary:    Libraries and headers for D-Bus
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+Requires:   pkgconfig
+
+%description devel
+Headers and static libraries for D-Bus.
+
 %prep
 %setup -q -n %{name}-%{version}
 
 
 %build
-./autogen.sh --enable-abstract-sockets --enable-x11-autolaunch --with-x
+./autogen.sh --enable-abstract-sockets --enable-x11-autolaunch --with-x \
+    --enable-kdbus-transport \
+    --disable-static \
+    --exec-prefix=/ \
+    --bindir=%{_bindir} \
+    --libexecdir=%{_libdir}/dbus-1 \
+    --sysconfdir=%{_sysconfdir} \
+    --libdir=%{_libdir} \
+    --includedir=%{_includedir} \
+    --localstatedir=%{_localstatedir} \
+    --docdir=%{_docdir} \
+    --disable-asserts \
+    --disable-xml-docs \
+    --disable-selinux \
+    --disable-libaudit \
+    --enable-tests=no \
+    --with-system-pid-file=%{_localstatedir}/run/messagebus.pid \
+    --with-dbus-user=root \
+    --with-systemdsystemunitdir=%{_libdir}/systemd/system
 
 # When compiled using gbs with --enable-abstract-sockets param autogen.sh creates a config.h in
 # /GBS-ROOT/local/BUILD-ROOTS/scratch.armv7l.0 with # /* #undef HAVE_ABSTRACT_SOCKETS */.
@@ -32,14 +71,59 @@ else
        sed -i 's/\/\* #undef HAVE_ABSTRACT_SOCKETS \*\//#define HAVE_ABSTRACT_SOCKETS 1/' config.h
 fi
 
-#make %{?jobs:-j%jobs}
-make -j8
+make %{?jobs:-j%jobs}
 
 %install
+%make_install
+%remove_docs
+
+install -m644 %{SOURCE4} %{buildroot}/etc/dbus-1/system.conf.systemd
+install -m644 %{SOURCE4} %{buildroot}/etc/dbus-1/system.conf
+
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+# Change the arch-deps.h include directory to /usr/lib instead of /lib
+sed -e 's@-I${libdir}@-I${prefix}/%{_lib}@' %{buildroot}%{_libdir}/pkgconfig/dbus-1.pc
+
+mkdir -p %{buildroot}%{_datadir}/dbus-1/interfaces
+
+mkdir -p %{buildroot}%{_libdir}/systemd/user
+install -m0644 %{SOURCE2} %{buildroot}%{_libdir}/systemd/user/dbus.socket
+install -m0644 %{SOURCE3} %{buildroot}%{_libdir}/systemd/user/dbus.service
 
 %post
 mkdir -p /opt/var/lib/dbus
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
 
 %files
+%{_bindir}/dbus-cleanup-sockets
+%{_bindir}/dbus-daemon
+%{_bindir}/dbus-monitor
+%{_bindir}/dbus-send
+%{_bindir}/dbus-uuidgen
+%{_bindir}/dbus-launch
+%{_bindir}/dbus-run-session
+%dir %{_sysconfdir}/dbus-1
+%config(noreplace) %{_sysconfdir}/dbus-1/session.conf
+%dir %{_sysconfdir}/dbus-1/session.d
+%config(noreplace) %{_sysconfdir}/dbus-1/system.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.conf.systemd
+%dir %{_sysconfdir}/dbus-1/system.d
+%dir %{_libdir}/dbus-1
+%attr(4750,root,dbus) %{_libdir}/dbus-1/dbus-daemon-launch-helper
+%{_libdir}/systemd/system/*
+%{_libdir}/systemd/user/*
+%dir %{_datadir}/dbus-1
+%{_datadir}/dbus-1/interfaces
+
+%files libs
+%{_libdir}/libdbus-1.so.3*
 
+%files devel
+%{_libdir}/libdbus-1.so
+%{_includedir}/dbus-1.0/dbus/dbus*.h
+%dir %{_libdir}/dbus-1.0
+%{_libdir}/dbus-1.0/include/dbus/dbus-arch-deps.h
+%{_libdir}/pkgconfig/dbus-1.pc