X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dbus.spec;h=8332cc58d7ece0b9d1a70ecd7096d50d565e9669;hb=9c516d5d8b3854dcf12944aa4321627221a7b739;hp=d25276b140d205aa7cdc35aacf7e7d56e1790663;hpb=93c19477e0c1d5c2a7c98579bafffe96445f4e06;p=packages%2Fdbus.git diff --git a/dbus.spec b/dbus.spec index d25276b..8332cc5 100644 --- a/dbus.spec +++ b/dbus.spec @@ -1,27 +1,33 @@ # +# Conditional build: +%bcond_without selinux # build without SELinux support + %define expat_version 1:1.95.5 -# Summary: D-BUS message bus -Summary(pl): Magistrala przesy³ania komunikatów D-BUS +Summary(pl.UTF-8): Magistrala przesyłania komunikatów D-BUS Name: dbus -Version: 0.91 -Release: 1 +Version: 1.2.24 +Release: 2 License: AFL v2.1 or GPL v2 Group: Libraries -Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz -# Source0-md5: 3f641bf73bcc538d3871622799ce2cd0 +Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz +# Source0-md5: 565346cecd9cfecf1463540c6086cc2c Source1: messagebus.init Source2: %{name}-daemon-1-profile.d-sh Source3: %{name}-sysconfig 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: libselinux-devel +BuildRequires: libcap-ng-devel +%{?with_selinux:BuildRequires: libselinux-devel} BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.268 @@ -36,12 +42,17 @@ 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: rc-scripts +Requires: expat >= %{expat_version} +Requires: rc-scripts >= 0.4.1.26 Provides: group(messagebus) Provides: user(messagebus) 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) %description @@ -49,50 +60,63 @@ D-BUS is a system for sending messages between applications. It is used both for the systemwide message bus service, and as a per-user-login-session messaging facility. -%description -l pl -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. +%description -l pl.UTF-8 +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): 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 -Biblioteki D-BUS. +%description libs -l pl.UTF-8 +Biblioteka D-BUS. %package devel -Summary: Header files for D-BUS -Summary(pl): 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 -Pliki nag³ówkowe D-BUS. +%description devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki D-BUS. %package static -Summary: Static D-BUS libraries -Summary(pl): 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 -Statyczne biblioteki D-BUS. +%description static -l pl.UTF-8 +Statyczna biblioteka D-BUS. %prep %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %{__libtoolize} @@ -102,11 +126,12 @@ Statyczne biblioteki D-BUS. %{__automake} %configure \ %{?debug:--enable-verbose-mode} \ + --disable-silent-rules \ --disable-asserts \ --disable-tests \ - --enable-abstract-sockets \ - --enable-selinux \ - --with-console-auth-dir=%{_localstatedir}/lock/console/ \ + --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 \ --with-xml=expat @@ -114,27 +139,30 @@ 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 -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 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/messagebus install %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/dbus-daemon-1.sh -install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/dbus +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 %pre %groupadd -g 122 messagebus -%useradd -u 122 -d /usr/share/empty -s /bin/false -c "System message bus" -g messagebus messagebus +%useradd -u 122 -d /usr/share/empty -s /bin/false -c "System message bus" -g 122 messagebus %post /sbin/chkconfig --add messagebus @@ -155,45 +183,70 @@ fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig +%triggerpostun -- %{name} < 0.92 +%banner %{name} << EOF +WARNING!!! +configuration file /etc/sysconfig/dbus has been moved to /etc/sysconfig/messagebus! +EOF + +if [ -f /etc/sysconfig/dbus ]; then + mv -f /etc/sysconfig/messagebus{,.rpmnew} + mv -f /etc/sysconfig/{dbus,messagebus} +elif [ -f /etc/sysconfig/dbus.rpmsave ]; then + mv -f /etc/sysconfig/messagebus{,.rpmnew} + mv -f /etc/sysconfig/{dbus.rpmsave,messagebus} +fi + %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/dbus-cleanup-sockets %attr(755,root,root) %{_bindir}/dbus-daemon +%attr(755,root,root) %{_bindir}/dbus-uuidgen # R: libX11 %attr(755,root,root) %{_bindir}/dbus-launch %attr(755,root,root) %{_bindir}/dbus-monitor %attr(755,root,root) %{_bindir}/dbus-send -%dir %{_sysconfdir}/dbus-1 +%attr(4754,root,messagebus) %{_libdir}/dbus-daemon-launch-helper +%dir %{_libdir}/dbus-1 +%dir %{_datadir}/dbus-1 +%dir %{_datadir}/dbus-1/interfaces +%dir %{_datadir}/dbus-1/services +%dir %{_datadir}/dbus-1/system-services %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/*.conf -%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dbus +%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 %attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh - -%dir %{_sysconfdir}/dbus-1/system.d -%dir %{_datadir}/dbus-1 -%dir %{_datadir}/dbus-1/services %dir %{_localstatedir}/run/dbus +%dir /var/lib/dbus %{_mandir}/man1/dbus-cleanup-sockets.1* %{_mandir}/man1/dbus-daemon.1* +%{_mandir}/man1/dbus-uuidgen.1* %{_mandir}/man1/dbus-launch.1* %{_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.*.*.* -%dir %{_libdir}/dbus-* +%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) %doc doc/*.{html,txt} %attr(755,root,root) %{_libdir}/libdbus-1.so %{_libdir}/libdbus-1.la -%{_libdir}/dbus-*/include +%dir %{_libdir}/dbus-1.0 +%{_libdir}/dbus-1.0/include %{_pkgconfigdir}/dbus-1.pc -%{_includedir}/dbus* +%{_includedir}/dbus-1.0 %files static %defattr(644,root,root,755)