X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dbus.spec;h=b10dfa23541d64ba916f443ece36d82c185715cb;hb=d7975de73ed7ba78f64e4802c242f91e9e5f4d8c;hp=77516e6deefba0120ffc88a727fbbaeb19c6d0a5;hpb=81ba8db6ea6bfc93bd2ece5dbc4d1118e8c6f8a1;p=packages%2Fdbus.git

diff --git a/dbus.spec b/dbus.spec
index 77516e6..b10dfa2 100644
--- 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.1.4
-Release:	2
+Version:	1.2.22
+Release:	1
 License:	AFL v2.1 or GPL v2
 Group:		Libraries
 Source0:	http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
-# Source0-md5:	e08fdf702cae648acd9780eca0ce4df6
+# Source0-md5:	54c5f3c79a1f852d2256aca07163813c
 Source1:	messagebus.init
 Source2:	%{name}-daemon-1-profile.d-sh
 Source3:	%{name}-sysconfig
@@ -15,14 +19,15 @@ 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
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	doxygen
 BuildRequires:	expat-devel >= %{expat_version}
-BuildRequires:	libcap-devel
-BuildRequires:	libselinux-devel
+BuildRequires:	libcap-ng-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,46 +65,58 @@ 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
+Summary:	D-BUS library
+Summary(pl.UTF-8):	Biblioteka D-BUS
 Group:		Libraries
 
 %description libs
-D-BUS libraries.
+D-BUS library.
 
 %description libs -l pl.UTF-8
-Biblioteki D-BUS.
+Biblioteka D-BUS.
 
 %package devel
-Summary:	Header files for D-BUS
-Summary(pl.UTF-8):	Pliki nagłówkowe D-BUS
+Summary:	Header files for D-BUS library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki D-BUS
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
-Header files for D-BUS.
+Header files for D-BUS library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe D-BUS.
+Pliki nagłówkowe biblioteki D-BUS.
 
 %package static
-Summary:	Static D-BUS libraries
-Summary(pl.UTF-8):	Statyczne biblioteki D-BUS
+Summary:	Static D-BUS library
+Summary(pl.UTF-8):	Statyczna biblioteka D-BUS
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
-Static D-BUS libraries.
+Static D-BUS library.
 
 %description static -l pl.UTF-8
-Statyczne biblioteki D-BUS.
+Statyczna biblioteka D-BUS.
 
 %prep
 %setup -q
 %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)