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

Accepting request 172848 from home:fcrozat:branches:Base:System

Browse Source 
- Do not provide %{release} for systemd-analyze
- Add more conflicts to -mini packages
- Disable Predictable Network interface names until it has been
  reviewed by network team, with /usr/lib/tmpfiles.d/network.conf.
- Don't package /usr/lib/firmware/update (not used)

OBS-URL: https://build.opensuse.org/request/show/172848
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=367
This commit is contained in:
Marcus Meissner 2013-04-22 14:35:32 +00:00 committed by Git OBS Bridge
parent 7834b1c691
commit 4a46ed333b
4 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
systemd-mini.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Apr 22 09:48:22 UTC 2013 - fcrozat@suse.com
- Do not provide %{release} for systemd-analyze
- Add more conflicts to -mini packages
- Disable Predictable Network interface names until it has been
reviewed by network team, with /usr/lib/tmpfiles.d/network.conf.
- Don't package /usr/lib/firmware/update (not used)
-------------------------------------------------------------------
Sun Apr 21 22:24:15 UTC 2013 - crrodriguez@opensuse.org

11
systemd-mini.spec
View File

@ -80,6 +80,7 @@ BuildRequires: pkgconfig(libsepol)
BuildRequires: pkgconfig(usbutils) >= 0.82
%if 0%{?bootstrap}
Requires: this-is-only-for-build-envs
Conflicts: systemd
%else
# the buildignore is important for bootstrapping
#!BuildIgnore: udev
@ -96,7 +97,7 @@ Requires(post): findutils
Conflicts: filesystem < 11.5
Conflicts: mkinitrd < 2.7.0
Obsoletes: systemd-analyze < 201
Provides: systemd-analyze = %{version}-%{release}
Provides: systemd-analyze = %{version}
Source0: http://www.freedesktop.org/software/systemd/systemd-%{version}.tar.xz
Source1: systemd-rpmlintrc
Source2: localfs.service
@ -237,6 +238,7 @@ Requires: filesystem
%if 0%{?bootstrap}
Provides: udev = %{version}
Conflicts: libudev%{udev_major} = %{version}
Conflicts: udev
%endif
%description -n %{udevpkgname}
@ -269,6 +271,7 @@ Requires: lib%{udevpkgname}%{udev_major} = %{version}-%{release}
%if 0%{?bootstrap}
Provides: libudev-devel = %{version}
Conflicts: libudev%{udev_major} = %{version}
Conflicts: libudev-devel
%endif
%description -n lib%{udevpkgname}-devel
@ -443,7 +446,6 @@ ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd
%if ! 0%{?bootstrap}
ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8
%endif
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates
ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware
%if ! 0%{?bootstrap}
install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald
@ -554,6 +556,11 @@ perl -i -pe 's{^# the VT is cleared.*}{}i;s{(^TTYVTDisallocate=.*)}{}' "$dst"
%fdupes -s %{buildroot}%{_mandir}
# disable predictable network interface naming until it has been reviewed by network team
cat << EOF > %{buildroot}%{_prefix}/lib/tmpfiles.d/network.conf
F /run/udev/rules.d/80-net-name-slot.rules 0644 - - - "#disable predictable network interface naming for now"
EOF
%pre
getent group systemd-journal >/dev/null || groupadd -r systemd-journal || :
getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d /var/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || :

9
systemd.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Apr 22 09:48:22 UTC 2013 - fcrozat@suse.com
- Do not provide %{release} for systemd-analyze
- Add more conflicts to -mini packages
- Disable Predictable Network interface names until it has been
reviewed by network team, with /usr/lib/tmpfiles.d/network.conf.
- Don't package /usr/lib/firmware/update (not used)
-------------------------------------------------------------------
Sun Apr 21 22:24:15 UTC 2013 - crrodriguez@opensuse.org

11
systemd.spec
View File

@ -75,6 +75,7 @@ BuildRequires: pkgconfig(libsepol)
BuildRequires: pkgconfig(usbutils) >= 0.82
%if 0%{?bootstrap}
Requires: this-is-only-for-build-envs
Conflicts: systemd
%else
# the buildignore is important for bootstrapping
#!BuildIgnore: udev
@ -91,7 +92,7 @@ Requires(post): findutils
Conflicts: filesystem < 11.5
Conflicts: mkinitrd < 2.7.0
Obsoletes: systemd-analyze < 201
Provides: systemd-analyze = %{version}-%{release}
Provides: systemd-analyze = %{version}
Source0: http://www.freedesktop.org/software/systemd/systemd-%{version}.tar.xz
Source1: systemd-rpmlintrc
Source2: localfs.service
@ -232,6 +233,7 @@ Requires: filesystem
%if 0%{?bootstrap}
Provides: udev = %{version}
Conflicts: libudev%{udev_major} = %{version}
Conflicts: udev
%endif
%description -n %{udevpkgname}
@ -264,6 +266,7 @@ Requires: lib%{udevpkgname}%{udev_major} = %{version}-%{release}
%if 0%{?bootstrap}
Provides: libudev-devel = %{version}
Conflicts: libudev%{udev_major} = %{version}
Conflicts: libudev-devel
%endif
%description -n lib%{udevpkgname}-devel
@ -438,7 +441,6 @@ ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd
%if ! 0%{?bootstrap}
ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8
%endif
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates
ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware
%if ! 0%{?bootstrap}
install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald
@ -549,6 +551,11 @@ perl -i -pe 's{^# the VT is cleared.*}{}i;s{(^TTYVTDisallocate=.*)}{}' "$dst"
%fdupes -s %{buildroot}%{_mandir}
# disable predictable network interface naming until it has been reviewed by network team
cat << EOF > %{buildroot}%{_prefix}/lib/tmpfiles.d/network.conf
F /run/udev/rules.d/80-net-name-slot.rules 0644 - - - "#disable predictable network interface naming for now"
EOF
%pre
getent group systemd-journal >/dev/null || groupadd -r systemd-journal || :
getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d /var/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || :