From 1b2387ed9bb4dcb5cdf910154f7e6e4840c257e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Stelmach?= Date: Mon, 6 Mar 2017 14:36:27 +0100 Subject: [PATCH] spec: Enable systemd-tests package MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 7137c6fe9d362f69d14581ac1bde124b77930f67. Change-Id: I2679eb43d68d9d74075ed339c7b7f397c43bc340 Signed-off-by: Łukasz Stelmach --- packaging/systemd.spec | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) mode change 100755 => 100644 packaging/systemd.spec diff --git a/packaging/systemd.spec b/packaging/systemd.spec old mode 100755 new mode 100644 index f44fe02..bb56d1e --- a/packaging/systemd.spec +++ b/packaging/systemd.spec @@ -20,12 +20,12 @@ License: LGPL-2.1+ and MIT and GPL-2.0+ Summary: A System and Service Manager Url: http://www.freedesktop.org/wiki/Software/systemd Group: Base/Startup -Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.gz +Source0: https://github.com/systemd/systemd/archive/v%{version}.tar.gz Source1: pamconsole-tmp.conf Source2: %{name}-rpmlintrc Source1001: systemd.manifest Source3: 500.systemd_upgrade.sh -#Source4: test-runner.c +Source4: test-runner.c BuildRequires: gperf BuildRequires: intltool >= 0.40.0 BuildRequires: libacl-devel @@ -104,19 +104,19 @@ initialization at boot. 'systemd-analyze plot' renders an SVG visualizing the parallel start of units at boot. -#%package tests -#License: LGPL-2.1+ and Apache-2.0 -#Summary: Set of tests for sd-bus component -#Requires: %{name} = %{version} +%package tests +License: LGPL-2.1+ and Apache-2.0 +Summary: Set of tests for sd-bus component +Requires: %{name} = %{version} -#%description tests -#This package is part of 'dbus-integratnion-tests' framework and contains set of tests -#for sd-bus component (DBUS API C library). +%description tests +This package is part of 'dbus-integratnion-tests' framework and contains set of tests +for sd-bus component (DBUS API C library). %prep %setup -q cp %{SOURCE1001} . -#cp %{SOURCE4} . +cp %{SOURCE4} . %build %autogen @@ -164,7 +164,7 @@ make %{?_smp_mflags} \ userunitdir=%{_unitdir_user} # compile test-runner for 'dbus-integration-test' framework -#%__cc %{_builddir}/%{name}-%{version}/test-runner.c -o %{_builddir}/%{name}-%{version}/systemd-tests +%__cc %{_builddir}/%{name}-%{version}/test-runner.c -o %{_builddir}/%{name}-%{version}/systemd-tests %install %make_install @@ -268,10 +268,9 @@ rm -f %{buildroot}/%{_prefix}/lib/systemd/system-generators/systemd-gpt-auto-gen rm -f %{buildroot}/%{_prefix}/lib/systemd/system-generators/systemd-hibernate-resume-generator # Preapre tests for 'dbus-integration-test' framework -#install -D -m 755 %{_builddir}/%{name}-%{version}/systemd-tests %{buildroot}%{_prefix}/lib/dbus-tests/runner/systemd-tests -#mkdir -p %{buildroot}%{_prefix}/lib/dbus-tests/test-suites/systemd-tests/ -#mv %{_builddir}/%{name}-%{version}/test-bus-* %{buildroot}%{_prefix}/lib/dbus-tests/test-suites/systemd-tests/ -#rm %{buildroot}%{_prefix}/lib/dbus-tests/test-suites/systemd-tests/test-bus-policy +install -D -m 755 %{_builddir}/%{name}-%{version}/systemd-tests %{buildroot}%{_prefix}/lib/dbus-tests/runner/systemd-tests +mkdir -p %{buildroot}%{_prefix}/lib/dbus-tests/test-suites/systemd-tests/ +mv %{_builddir}/%{name}-%{version}/test-bus-* %{buildroot}%{_prefix}/lib/dbus-tests/test-suites/systemd-tests/ # Shell Completion %if ! %{?WITH_BASH_COMPLETION} @@ -563,9 +562,9 @@ fi %manifest %{name}.manifest %{_bindir}/systemd-analyze -#%files tests -#%manifest %{name}.manifest -#%{_prefix}/lib/dbus-tests/test-suites/systemd-tests/ -#%{_prefix}/lib/dbus-tests/runner/systemd-tests +%files tests +%manifest %{name}.manifest +%{_prefix}/lib/dbus-tests/test-suites/systemd-tests/ +%{_prefix}/lib/dbus-tests/runner/systemd-tests %docs_package -- 2.7.4