- release 3

[packages/dbus.git] / dbus.spec

diff --git a/dbus.spec b/dbus.spec
index 4fad7ee469afb7ba2c78cf858022a3060cdf0ad9..74c806820d3cf041bf246b47ee5fa2145804f7d6 100644 (file)
--- a/dbus.spec
+++ b/dbus.spec
@@ -1,13 +1,17 @@
+#
+# Conditional build:
+%bcond_without selinux         # build without SELinux support
+#
 %define                expat_version   1:1.95.5
 Summary:       D-BUS message bus
 Summary(pl.UTF-8):     Magistrala przesyłania komunikatów D-BUS
 Name:          dbus
-Version:       1.2.1
+Version:       1.2.16
 Release:       3
 License:       AFL v2.1 or GPL v2
 Group:         Libraries
 Source0:       http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
-# Source0-md5: b57aa1ba0834cbbb1e7502dc2cbfacc2
+# Source0-md5: c7a47b851ebe02f6726b65b78d1b730b
 Source1:       messagebus.init
 Source2:       %{name}-daemon-1-profile.d-sh
 Source3:       %{name}-sysconfig
@@ -15,6 +19,7 @@ Source4:      %{name}-xinitrc.sh
 Patch0:                %{name}-nolibs.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-no_fatal_checks.patch
+Patch3:                %{name}-allow-introspection.patch
 URL:           http://www.freedesktop.org/Software/dbus
 BuildRequires: audit-libs-devel
 BuildRequires: autoconf >= 2.52
@@ -22,7 +27,7 @@ BuildRequires:        automake
 BuildRequires: doxygen
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: libcap-devel
-BuildRequires: libselinux-devel
+%{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.268
@@ -37,14 +42,15 @@ Requires(pre):      /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
+Requires:      %{name}-dirs = %{version}-%{release}
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      expat >= %{expat_version}
-Requires:      rc-scripts
+Requires:      rc-scripts >= 0.4.1.23
 Provides:      group(messagebus)
 Provides:      user(messagebus)
-Conflicts:     pam < 0.99.7.1
 Obsoletes:     dbus-X11
 Obsoletes:     dbus-glib-tools
+Conflicts:     pam < 0.99.7.1
 # not available for dbus 0.9x yet(?)
 #Obsoletes:    dbus-gtk dbus-gcj dbus-gcj-devel dbus-gcj-static
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -59,6 +65,17 @@ D-BUS to system przesyłania komunikatów pomiędzy aplikacjami. Jest
 używany zarówno jako ogólnosystemowa usługa magistrali komunikatów jak
 i możliwość przesyłania komunikatów w ramach jednej sesji użytkownika.
 
+%package dirs
+Summary:       D-BUS directories
+Summary(pl.UTF-8):     Katalogi D-BUS
+Group:         Libraries
+
+%description dirs
+D-BUS directories.
+
+%description dirs -l pl.UTF-8
+Katalogi D-BUS.
+
 %package libs
 Summary:       D-BUS libraries
 Summary(pl.UTF-8):     Biblioteki D-BUS
@@ -99,6 +116,7 @@ Statyczne biblioteki D-BUS.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -110,8 +128,8 @@ Statyczne biblioteki D-BUS.
        %{?debug:--enable-verbose-mode} \
        --disable-asserts \
        --disable-tests \
-       --enable-abstract-sockets \
-       --enable-selinux \
+       --enable-abstract-sockets=auto \
+       %{?with_selinux:--enable-selinux} \
        --with-console-auth-dir=%{_localstatedir}/run/console/ \
        --with-session-socket-dir=/tmp \
        --with-system-pid-file=%{_localstatedir}/run/dbus.pid \
@@ -120,12 +138,10 @@ Statyczne biblioteki D-BUS.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/profile.d
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -d $RPM_BUILD_ROOT/etc/sysconfig
-install -d $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
-install -d $RPM_BUILD_ROOT%{_datadir}/dbus-1/{services,interfaces}
-install -d $RPM_BUILD_ROOT%{_localstatedir}/run/dbus
+install -d $RPM_BUILD_ROOT/etc/{profile.d,rc.d/init.d,sysconfig,X11/xinit/xinitrc.d} \
+       $RPM_BUILD_ROOT%{_datadir}/dbus-1/{services,interfaces} \
+       $RPM_BUILD_ROOT%{_localstatedir}/run/dbus \
+       $RPM_BUILD_ROOT/%{_lib}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -135,6 +151,11 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/dbus-daemon-1.sh
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/messagebus
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
 
+# upstart (/sbin/init) requires libdbus so it must be in /lib(64)
+mv -f $RPM_BUILD_ROOT%{_libdir}/libdbus-1.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libdbus-1.so.*.*.*) \
+       $RPM_BUILD_ROOT%{_libdir}/libdbus-1.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -190,10 +211,7 @@ fi
 %dir %{_datadir}/dbus-1/interfaces
 %dir %{_datadir}/dbus-1/services
 %dir %{_datadir}/dbus-1/system-services
-%dir %{_sysconfdir}/dbus-1
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/*.conf
-%dir %{_sysconfdir}/dbus-1/system.d
-%dir %{_sysconfdir}/dbus-1/session.d
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/messagebus
 %attr(754,root,root) /etc/rc.d/init.d/*
 %attr(755,root,root) /etc/profile.d/dbus-daemon-1.sh
@@ -207,11 +225,17 @@ fi
 %{_mandir}/man1/dbus-monitor.1*
 %{_mandir}/man1/dbus-send.1*
 
+%files dirs
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/dbus-1
+%dir %{_sysconfdir}/dbus-1/system.d
+%dir %{_sysconfdir}/dbus-1/session.d
+
 %files libs
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README doc/TODO
-%attr(755,root,root) %{_libdir}/libdbus-1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdbus-1.so.3
+%attr(755,root,root) /%{_lib}/libdbus-1.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libdbus-1.so.3
 
 %files devel
 %defattr(644,root,root,755)