Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions rpm/systemd-mini.spec
Original file line number Diff line number Diff line change
Expand Up @@ -377,14 +377,6 @@ install -m 644 %{SOURCE2} %{buildroot}/opt/tests/systemd-tests
rm -rf %{buildroot}/%{_docdir}
%endif

# systemd macros
# Old rpm versions assume macros in /etc/rpm/
# New ones support /usr/lib/rpm/macros.d/
# Systemd naturually uses later one
# But we support both by adding link
mkdir -p %{buildroot}%{_sysconfdir}/rpm
ln -s %{_libdir}/rpm/macros.d/macros.systemd %{buildroot}%{_sysconfdir}/rpm/macros.systemd

# Remove unneeded files
rm %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh

Expand Down Expand Up @@ -478,7 +470,6 @@ for a in `find /etc/systemd/system -type l ! -exec test -e {} \; -print`; do sta
%ghost %{_sysconfdir}/udev/hwdb.bin
%{_rpmconfigdir}/macros.d/macros.systemd
%dir %{_sysconfdir}/xdg/systemd
%{_sysconfdir}/rpm/macros.systemd
%{_bindir}/systemctl
%{_bindir}/systemd-notify
%{_bindir}/systemd-escape
Expand Down
9 changes: 0 additions & 9 deletions rpm/systemd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -376,14 +376,6 @@ install -m 644 %{SOURCE2} %{buildroot}/opt/tests/systemd-tests
rm -rf %{buildroot}/%{_docdir}
%endif

# systemd macros
# Old rpm versions assume macros in /etc/rpm/
# New ones support /usr/lib/rpm/macros.d/
# Systemd naturually uses later one
# But we support both by adding link
mkdir -p %{buildroot}%{_sysconfdir}/rpm
ln -s %{_libdir}/rpm/macros.d/macros.systemd %{buildroot}%{_sysconfdir}/rpm/macros.systemd

# Remove unneeded files
rm %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh

Expand Down Expand Up @@ -477,7 +469,6 @@ for a in `find /etc/systemd/system -type l ! -exec test -e {} \; -print`; do sta
%ghost %{_sysconfdir}/udev/hwdb.bin
%{_rpmconfigdir}/macros.d/macros.systemd
%dir %{_sysconfdir}/xdg/systemd
%{_sysconfdir}/rpm/macros.systemd
%{_bindir}/systemctl
%{_bindir}/systemd-notify
%{_bindir}/systemd-escape
Expand Down