rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 179571 from home:-miska-:branches:Base:System

Browse Source 
Reduce build time dependencies

OBS-URL: https://build.opensuse.org/request/show/179571
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=398
This commit is contained in:
Dr. Werner Fink 2013-06-19 07:04:23 +00:00 committed by Git OBS Bridge
parent 4574d97ac0
commit 0597613eb9
6 changed files with 91 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
systemd-mini.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jun 18 12:13:25 UTC 2013 - mhrusecky@suse.com
- Split out RPM macros into separate package to simplify dependencies
-------------------------------------------------------------------
Tue Jun 18 00:33:10 UTC 2013 - crrodriguez@opensuse.org

9
systemd-mini.spec
View File

@ -215,6 +215,9 @@ Summary: Development headers for systemd
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
%if 0%{suse_version} > 1230
Requires: systemd-rpm-macros
%endif
%if 0%{?bootstrap}
Conflicts: systemd-devel
%endif
@ -491,8 +494,12 @@ install -m644 -D %{S:1062} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/systemd
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants
ln -sf ../systemd-udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants
%if 0%{suse_version} < 1310
mkdir -p %{buildroot}%{_sysconfdir}/rpm
install -m644 %{S:4} %{buildroot}%{_sysconfdir}/rpm
%else
rm -rf %{buildroot}%{_sysconfdir}/rpm
%endif
find %{buildroot} -type f -name '*.la' -delete
mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated} %{buildroot}/usr/lib/systemd/{system-generators,user-generators,system-preset,user-preset,system/halt.target.wants,system/kexec.target.wants,system/poweroff.target.wants,system/reboot.target.wants}
@ -922,7 +929,9 @@ fi
%dir %{_datadir}/bash-completion/completions
%ghost /var/lib/systemd/catalog/database
%{_datadir}/bash-completion/completions/*
%if 0%{suse_version} < 1310
%{_sysconfdir}/rpm/macros.systemd
%endif
%dir /var/lib/systemd
%dir /var/lib/systemd/sysv-convert
%dir /var/lib/systemd/migrated

6
systemd-rpm-macros.changes Normal file
View File

@ -0,0 +1,6 @@
-------------------------------------------------------------------
Mon Jun 17 10:49:50 UTC 2013 - mhrusecky@suse.com
- New package with systemd rpm macros to avoid unnecessary build time
dependencies

57
systemd-rpm-macros.spec Normal file
View File

@ -0,0 +1,57 @@
#
# spec file for package systemd-rpm-macros
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
#!BuildIgnore: util-linux
Name: systemd-rpm-macros
Version: 1
Release: 0
Summary: RPM macros for systemd
License: LGPL-2.1+
Group: System/Base
Url: http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines
Source0: macros.systemd
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
Starting with openSUSE 12.1, several RPM macros must be used to package systemd
services files. This package provides these macros.
%prep
%build
%install
mkdir -p %{buildroot}%{_sysconfdir}/rpm
install -m644 %{S:0} %{buildroot}%{_sysconfdir}/rpm
UNITDIR="`cat %{S:0} | sed -n 's|.*_unitdir[[:blank:]]*||p'`"
for i in $UNITDIR `dirname $UNITDIR`; do
mkdir -p %{buildroot}$i
echo $i >> unitdir
done
%post
%postun
%files -f unitdir
%defattr(-,root,root)
%{_sysconfdir}/rpm/macros.systemd
%changelog

5
systemd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jun 18 12:13:25 UTC 2013 - mhrusecky@suse.com
- Split out RPM macros into separate package to simplify dependencies
-------------------------------------------------------------------
Tue Jun 18 00:33:10 UTC 2013 - crrodriguez@opensuse.org

9
systemd.spec
View File

@ -210,6 +210,9 @@ Summary: Development headers for systemd
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
%if 0%{suse_version} > 1230
Requires: systemd-rpm-macros
%endif
%if 0%{?bootstrap}
Conflicts: systemd-devel
%endif
@ -486,8 +489,12 @@ install -m644 -D %{S:1062} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/systemd
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants
ln -sf ../systemd-udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants
%if 0%{suse_version} < 1310
mkdir -p %{buildroot}%{_sysconfdir}/rpm
install -m644 %{S:4} %{buildroot}%{_sysconfdir}/rpm
%else
rm -rf %{buildroot}%{_sysconfdir}/rpm
%endif
find %{buildroot} -type f -name '*.la' -delete
mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated} %{buildroot}/usr/lib/systemd/{system-generators,user-generators,system-preset,user-preset,system/halt.target.wants,system/kexec.target.wants,system/poweroff.target.wants,system/reboot.target.wants}
@ -917,7 +924,9 @@ fi
%dir %{_datadir}/bash-completion/completions
%ghost /var/lib/systemd/catalog/database
%{_datadir}/bash-completion/completions/*
%if 0%{suse_version} < 1310
%{_sysconfdir}/rpm/macros.systemd
%endif
%dir /var/lib/systemd
%dir /var/lib/systemd/sysv-convert
%dir /var/lib/systemd/migrated