Add patch from Matej Cepl to enable check section, modified by me

to use common configure opts.
This commit is contained in:
Colin Walters 2013-02-05 12:40:41 -05:00
parent 53f20e768c
commit f69d8e07e3

View File

@ -5,11 +5,13 @@
%define dbus_user_uid 81 %define dbus_user_uid 81
%define dbus_common_config_opts --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 --with-systemdsystemunitdir=/lib/systemd/system/ --enable-doxygen-docs --enable-xml-docs --disable-silent-rules
Summary: D-BUS message bus Summary: D-BUS message bus
Name: dbus Name: dbus
Epoch: 1 Epoch: 1
Version: 1.6.8 Version: 1.6.8
Release: 3%{?dist} Release: 4%{?dist}
URL: http://www.freedesktop.org/software/dbus/ URL: http://www.freedesktop.org/software/dbus/
#VCS: git:git://git.freedesktop.org/git/dbus/dbus #VCS: git:git://git.freedesktop.org/git/dbus/dbus
Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
@ -88,14 +90,9 @@ in this separate package so server systems need not install X.
%patch0 -p1 -b .bindir %patch0 -p1 -b .bindir
autoreconf -f -i
%build %build
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" if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf -v -f -i; fi
%configure %{dbus_common_config_opts} --disable-tests --disable-asserts
# leave verbose mode so people can debug their apps but make sure to
# turn it off on stable releases with --disable-verbose-mode
%configure $COMMON_ARGS --disable-tests --disable-asserts --enable-doxygen-docs --enable-xml-docs --with-systemdsystemunitdir=/lib/systemd/system/
make make
%install %install
@ -133,6 +130,13 @@ rm -rf %{buildroot}%{_initrddir}
mkdir -p %{buildroot}/var/lib/dbus mkdir -p %{buildroot}/var/lib/dbus
%check
if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf -v -f -i; fi
%configure %{dbus_common_config_opts} --enable-asserts --enable-verbose-mode
make clean
DBUS_TEST_SLOW=1 make check
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -219,6 +223,10 @@ fi
%{_includedir}/* %{_includedir}/*
%changelog %changelog
* Tue Feb 05 2013 Colin Walters <walters@redhat.com> - 1:1.6.8-4
- Add patch from Matej Cepl to enable check section, modified by me
to use common configure opts.
* Sun Oct 14 2012 Rex Dieter <rdieter@fedoraproject.org> - 1:1.6.8-3 * Sun Oct 14 2012 Rex Dieter <rdieter@fedoraproject.org> - 1:1.6.8-3
- minor .spec cleanups - minor .spec cleanups
- tighten lib deps via %%{?_isa} - tighten lib deps via %%{?_isa}