pool/dbus-1
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=151

Browse Source
This commit is contained in:
Hrvoje Senjan 2014-01-10 16:58:41 +00:00 committed by Git OBS Bridge
parent 1f55fb36b2
commit bd573993e4
5 changed files with 19 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbus-1-x11.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 10 17:00:52 UTC 2014 - hrvoje.senjan@gmail.com
- Remove checks for obsolete openSUSE versions
- Make sure that dbus-1 requires libdbus-1-3 during %post (detected
when built against DBus-less systemd 209)
-------------------------------------------------------------------
Thu Jan 9 17:33:31 UTC 2014 - fridrich.strba@suse.com

32
dbus-1-x11.spec
View File

@ -21,6 +21,7 @@
Name: dbus-1-x11
%define _name dbus
%define _libname libdbus-1-3
BuildRequires: pkgconfig(x11)
Url: http://dbus.freedesktop.org/
Summary: D-Bus Message Bus System
@ -35,12 +36,8 @@ BuildRequires: xmlto
# COMMON1-BEGIN
%if ! %{with_systemd}
%if 0%{?suse_version} < 1230
%define _unitdir /lib/systemd/system
%else
%define _unitdir /usr/lib/systemd/system
%endif
%endif
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-daemon)
@ -77,9 +74,7 @@ in this separate package so server systems need not install X.
Summary: Developer documentation package for D-Bus
Group: Development/Libraries/Other
Requires: dbus-1 = %{version}
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%description -n dbus-1-devel-doc
D-Bus is a message bus system, a simple way for applications to talk to
@ -96,10 +91,8 @@ Group: System/Daemons
%ifarch ppc64
Obsoletes: dbus-1-64bit
%endif
%if 0%{?suse_version} < 1230
PreReq: /sbin/insserv /etc/init.d/boot.localfs
%endif
PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd
Requires(post): %{_libname} = %{version}
%description -n dbus-1
D-Bus is a message bus system, a simple way for applications to talk to
@ -123,11 +116,9 @@ autoreconf -fi
export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie"
export LDFLAGS="-pie"
export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
%if 0%{?suse_version} > 1000
export CFLAGS="$CFLAGS -fstack-protector"
export CXXFLAGS="$CXXFLAGS -fstack-protector"
export V=1
%endif
%configure \
--disable-static \
--with-pic \
@ -207,20 +198,7 @@ ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
%{stop_on_removal dbus}
%post -n dbus-1
if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then
cmp -s %{_localstatedir}/lib/dbus/machine-id %{_sysconfdir}/machine-id > /dev/null
if [ $? ]; then
rm -f %{_localstatedir}/lib/dbus/machine-id
fi
fi
if [ ! -e %{_localstatedir}/lib/dbus/machine-id ]; then
if [ -e %{_sysconfdir}/machine-id ]; then
mkdir -p %{_localstatedir}/lib/dbus/
ln -s %{_sysconfdir}/machine-id %{_localstatedir}/lib/dbus/machine-id
else
/bin/dbus-uuidgen --ensure
fi
fi
/bin/dbus-uuidgen --ensure
%{insserv_force_if_yast dbus}
/sbin/ldconfig
%set_permissions /lib/dbus-1/dbus-daemon-launch-helper
@ -263,13 +241,9 @@ fi
%ghost /run/dbus
%ghost %{_localstatedir}/lib/dbus/machine-id
%if ! %{with_systemd}
%if 0%{?suse_version} < 1230
%dir /lib/systemd
%else
%dir /usr/lib/systemd
%dir %{_unitdir}
%endif
%endif
%{_unitdir}/dbus.service
%{_unitdir}/dbus.socket
%dir %{_unitdir}/dbus.target.wants

11
dbus-1-x11.spec.in
View File

@ -20,6 +20,7 @@
Name: dbus-1-x11
%define _name dbus
%define _libname libdbus-1-3
BuildRequires: pkgconfig(x11)
Url: http://dbus.freedesktop.org/
License: GPL2+ or AFL 2.1
@ -41,9 +42,7 @@ in this separate package so server systems need not install X.
Summary: Developer documentation package for D-Bus
Group: Development/Libraries/Other
Requires: dbus-1 = %{version}
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%description -n dbus-1-devel-doc
D-Bus is a message bus system, a simple way for applications to talk to
@ -60,10 +59,8 @@ Group: System/Daemons
%ifarch ppc64
Obsoletes: dbus-1-64bit
%endif
%if 0%{?suse_version} < 1230
PreReq: /sbin/insserv /etc/init.d/boot.localfs
%endif
PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd
Requires(post): %{_libname} = %{version}
%description -n dbus-1
D-Bus is a message bus system, a simple way for applications to talk to
@ -167,13 +164,9 @@ ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
%ghost /run/dbus
%ghost %{_localstatedir}/lib/dbus/machine-id
%if ! %{with_systemd}
%if 0%{?suse_version} < 1230
%dir /lib/systemd
%else
%dir /usr/lib/systemd
%dir %{_unitdir}
%endif
%endif
%{_unitdir}/dbus.service
%{_unitdir}/dbus.socket
%dir %{_unitdir}/dbus.target.wants

7
dbus-1.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 10 17:00:52 UTC 2014 - hrvoje.senjan@gmail.com
- Remove checks for obsolete openSUSE versions
- Make sure that dbus-1 requires libdbus-1-3 during %post (detected
when built against DBus-less systemd 209)
-------------------------------------------------------------------
Thu Jan 9 17:33:31 UTC 2014 - fridrich.strba@suse.com

6
dbus-1.spec
View File

@ -30,12 +30,8 @@ Group: System/Daemons
# COMMON1-BEGIN
%if ! %{with_systemd}
%if 0%{?suse_version} < 1230
%define _unitdir /lib/systemd/system
%else
%define _unitdir /usr/lib/systemd/system
%endif
%endif
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-daemon)
@ -111,11 +107,9 @@ autoreconf -fi
export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie"
export LDFLAGS="-pie"
export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
%if 0%{?suse_version} > 1000
export CFLAGS="$CFLAGS -fstack-protector"
export CXXFLAGS="$CXXFLAGS -fstack-protector"
export V=1
%endif
%configure \
--disable-static \
--with-pic \