remove legacy spec file elements
BuildRoot tag and cleaning in %install are implicit since F10. %clean section is implicit since F13. %defattr are not needed since rpm 4.4.
This commit is contained in:
parent
5911067120
commit
f155b1163f
10
systemd.spec
10
systemd.spec
@ -1,7 +1,6 @@
|
|||||||
#% global gitcommit 3e52541
|
#% global gitcommit 3e52541
|
||||||
Name: systemd
|
Name: systemd
|
||||||
Url: http://www.freedesktop.org/wiki/Software/systemd
|
Url: http://www.freedesktop.org/wiki/Software/systemd
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
Version: 38
|
Version: 38
|
||||||
Release: 4%{?gitcommit:.git%{gitcommit}}%{?dist}
|
Release: 4%{?gitcommit:.git%{gitcommit}}%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -129,7 +128,6 @@ SysV compatibility tools for systemd
|
|||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
|
||||||
make DESTDIR=%{buildroot} install
|
make DESTDIR=%{buildroot} install
|
||||||
find %{buildroot} \( -name '*.a' -o -name '*.la' \) -exec rm {} \;
|
find %{buildroot} \( -name '*.a' -o -name '*.la' \) -exec rm {} \;
|
||||||
|
|
||||||
@ -187,9 +185,6 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/modprobe.d/
|
|||||||
mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d/
|
mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d/
|
||||||
install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rsyslog.d/
|
install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rsyslog.d/
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
|
/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
|
||||||
/bin/systemctl daemon-reexec > /dev/null 2>&1 || :
|
/bin/systemctl daemon-reexec > /dev/null 2>&1 || :
|
||||||
@ -253,7 +248,6 @@ if [ $1 -ge 1 ] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
|
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
|
||||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf
|
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf
|
||||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf
|
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf
|
||||||
@ -333,7 +327,6 @@ fi
|
|||||||
%config(noreplace) %{_sysconfdir}/modprobe.d/udlfb.conf
|
%config(noreplace) %{_sysconfdir}/modprobe.d/udlfb.conf
|
||||||
|
|
||||||
%files units
|
%files units
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%dir %{_sysconfdir}/systemd
|
%dir %{_sysconfdir}/systemd
|
||||||
%dir %{_sysconfdir}/systemd/system
|
%dir %{_sysconfdir}/systemd/system
|
||||||
%dir %{_sysconfdir}/systemd/user
|
%dir %{_sysconfdir}/systemd/user
|
||||||
@ -366,13 +359,11 @@ fi
|
|||||||
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.target
|
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.target
|
||||||
|
|
||||||
%files gtk
|
%files gtk
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_bindir}/systemadm
|
%{_bindir}/systemadm
|
||||||
%{_bindir}/systemd-gnome-ask-password-agent
|
%{_bindir}/systemd-gnome-ask-password-agent
|
||||||
%{_mandir}/man1/systemadm.*
|
%{_mandir}/man1/systemadm.*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_libdir}/libsystemd-daemon.so
|
%{_libdir}/libsystemd-daemon.so
|
||||||
%{_libdir}/libsystemd-login.so
|
%{_libdir}/libsystemd-login.so
|
||||||
%{_libdir}/libsystemd-journal.so
|
%{_libdir}/libsystemd-journal.so
|
||||||
@ -388,7 +379,6 @@ fi
|
|||||||
%{_libdir}/pkgconfig/libsystemd-id128.pc
|
%{_libdir}/pkgconfig/libsystemd-id128.pc
|
||||||
|
|
||||||
%files sysv
|
%files sysv
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_bindir}/systemd-sysv-convert
|
%{_bindir}/systemd-sysv-convert
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user