rpms/dbus/devel dbus.spec,1.124,1.125
David Zeuthen (davidz)
fedora-extras-commits at redhat.com
Thu Aug 2 05:07:27 UTC 2007
- Previous message (by thread): rpms/twinkle/F-7 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 twinkle.spec, 1.5, 1.6
- Next message (by thread): rpms/gnome-applets/devel copy.xsl, NONE, 1.1 gnome-applets.spec, 1.232, 1.233
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: davidz
Update of /cvs/pkgs/rpms/dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22196
Modified Files:
dbus.spec
Log Message:
* Wed Aug 01 2007 David Zeuthen <davidz at redhat.com> - 1.1.2-2%{?dist}
- Move system bus activation helper to /{lib,lib64}/dbus-1. Also set
the correct mode and permissions.
- Own the directory /usr/share/dbus-1/system-services
- Delete the diretory /{lib,lib64}/dbus-1.0 as it's not used
- Pass 'dbus' instead of 81 as --with-dbus-user; otherwise the setuid
system bus activation helper fails
Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- dbus.spec 28 Jul 2007 14:32:51 -0000 1.124
+++ dbus.spec 2 Aug 2007 05:06:53 -0000 1.125
@@ -8,7 +8,7 @@
Summary: D-BUS message bus
Name: dbus
Version: 1.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.freedesktop.org/software/dbus/
Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
Source1: doxygen_to_devhelp.xsl
@@ -74,7 +74,7 @@
autoreconf -f -i
%build
-COMMON_ARGS="--enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid} --libdir=/%{_lib} --bindir=/bin --sysconfdir=/etc --exec-prefix=/"
+COMMON_ARGS="--enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=dbus --libdir=/%{_lib} --bindir=/bin --sysconfdir=/etc --exec-prefix=/ --libexecdir=/%{_lib}/dbus-1"
# leave verbose mode so people can debug their apps but make sure to
# turn it off on stable releases with --disable-verbose-mode
@@ -100,6 +100,7 @@
mv -f $RPM_BUILD_ROOT/bin/dbus-launch $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/dbus-1.0/include/
mv -f $RPM_BUILD_ROOT/%{_lib}/dbus-1.0/include/* $RPM_BUILD_ROOT/%{_libdir}/dbus-1.0/include/
+rm -rf $RPM_BUILD_ROOT/%{_lib}/dbus-1.0
rm -f $RPM_BUILD_ROOT/%{_lib}/*.a
rm -f $RPM_BUILD_ROOT/%{_lib}/*.la
@@ -148,7 +149,6 @@
%dir %{_sysconfdir}/dbus-1/session.d
%dir %{_localstatedir}/run/dbus
%dir %{_localstatedir}/lib/dbus/
-%dir /%{_lib}/dbus-1.0
/bin/dbus-daemon
/bin/dbus-send
/bin/dbus-cleanup-sockets
@@ -162,8 +162,11 @@
%{_datadir}/man/man*/dbus-uuidgen.1.gz
%dir %{_datadir}/dbus-1
%{_datadir}/dbus-1/services
-# FIXME should this live in /usr ?
-%{_libexecdir}/dbus-daemon-launch-helper
+%{_datadir}/dbus-1/system-services
+%dir /%{_lib}/dbus-1
+# See doc/system-activation.txt in source tarball for the rationale
+# behind these permissions
+%attr(4750,root,dbus) /%{_lib}/dbus-1/dbus-daemon-launch-helper
%files x11
%defattr(-,root,root)
@@ -182,6 +185,14 @@
%{_datadir}/devhelp/books/dbus
%changelog
+* Wed Aug 01 2007 David Zeuthen <davidz at redhat.com> - 1.1.2-2%{?dist}
+- Move system bus activation helper to /{lib,lib64}/dbus-1. Also set
+ the correct mode and permissions.
+- Own the directory /usr/share/dbus-1/system-services
+- Delete the diretory /{lib,lib64}/dbus-1.0 as it's not used
+- Pass 'dbus' instead of 81 as --with-dbus-user; otherwise the setuid
+ system bus activation helper fails
+
* Sat Jul 28 2007 Matthias Clasen <mclasen at redhat.com> - 1.1.2-1
- Update to 1.1.2
- Previous message (by thread): rpms/twinkle/F-7 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 twinkle.spec, 1.5, 1.6
- Next message (by thread): rpms/gnome-applets/devel copy.xsl, NONE, 1.1 gnome-applets.spec, 1.232, 1.233
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list