New upstream release
This commit is contained in:
parent
0cc7cd30ef
commit
3f1bed4cae
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,3 +5,4 @@ systemd-7.tar.bz2
|
|||||||
/systemd-8.tar.bz2
|
/systemd-8.tar.bz2
|
||||||
/systemd-9.tar.bz2
|
/systemd-9.tar.bz2
|
||||||
/systemd-10.tar.bz2
|
/systemd-10.tar.bz2
|
||||||
|
/systemd-11.tar.bz2
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
346ad2a67def5bf8750da0479505ec0e systemd-10.tar.bz2
|
aaa06c41cf98f260866a34bd91de7dff systemd-11.tar.bz2
|
||||||
|
37
systemd.spec
37
systemd.spec
@ -1,8 +1,8 @@
|
|||||||
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)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Version: 10
|
Version: 11
|
||||||
Release: 6%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Summary: A System and Session Manager
|
Summary: A System and Session Manager
|
||||||
@ -18,6 +18,7 @@ BuildRequires: dbus-glib-devel
|
|||||||
BuildRequires: vala >= 0.9
|
BuildRequires: vala >= 0.9
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: gtk2-devel
|
BuildRequires: gtk2-devel
|
||||||
|
BuildRequires: libnotify-devel
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
@ -64,6 +65,7 @@ system and session manager.
|
|||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Summary: Graphical frontend for systemd
|
Summary: Graphical frontend for systemd
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
Requires: polkit
|
||||||
|
|
||||||
%description gtk
|
%description gtk
|
||||||
Graphical front-end for systemd.
|
Graphical front-end for systemd.
|
||||||
@ -96,27 +98,24 @@ ln -s ../bin/systemctl %{buildroot}/sbin/runlevel
|
|||||||
# them.
|
# them.
|
||||||
rm -r %{buildroot}/etc/systemd/system/*.target.wants
|
rm -r %{buildroot}/etc/systemd/system/*.target.wants
|
||||||
|
|
||||||
# And the default symlink we generate automatically based on inittab
|
|
||||||
rm %{buildroot}/etc/systemd/system/default.target
|
|
||||||
|
|
||||||
# These are now in the initscripts package
|
# These are now in the initscripts package
|
||||||
rm -f %{buildroot}/lib/systemd/system/{halt,killall,poweroff,prefdm,rc-local,reboot,single,sysinit}.service
|
rm %{buildroot}/lib/systemd/system/{halt,killall,poweroff,prefdm,rc-local,reboot,single,sysinit}.service
|
||||||
rm -f %{buildroot}/%{_sysconfdir}/rc.d/init.d/reboot
|
rm %{buildroot}/%{_sysconfdir}/rc.d/init.d/reboot
|
||||||
rm -f %{buildroot}/%{_sysconfdir}/systemd/system/ctrl-alt-del.target \
|
rm %{buildroot}/%{_sysconfdir}/systemd/system/display-manager.service
|
||||||
%{buildroot}/%{_sysconfdir}/systemd/system/display-manager.service \
|
|
||||||
%{buildroot}/%{_sysconfdir}/systemd/system/kbrequest.target
|
|
||||||
|
|
||||||
sed -i -e 's/^#MountAuto=yes$/MountAuto=no/' \
|
sed -i -e 's/^#MountAuto=yes$/MountAuto=no/' \
|
||||||
-e 's/^#SwapAuto=yes$/SwapAuto=no/' %{buildroot}/etc/systemd/system.conf
|
-e 's/^#SwapAuto=yes$/SwapAuto=no/' %{buildroot}/etc/systemd/system.conf
|
||||||
|
|
||||||
|
# We haven't updated Fedora for tmpfs on /var/run and /var/lock yet
|
||||||
|
rm %{buildroot}/lib/systemd/system/local-fs.target.wants/var-run.mount
|
||||||
|
rm %{buildroot}/lib/systemd/system/local-fs.target.wants/var-lock.mount
|
||||||
|
|
||||||
# Make sure the %ghost-ing below works
|
# Make sure the %ghost-ing below works
|
||||||
touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel2.target
|
touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel2.target
|
||||||
touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel3.target
|
touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel3.target
|
||||||
touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel4.target
|
touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel4.target
|
||||||
touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel5.target
|
touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel5.target
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/run/user
|
|
||||||
|
|
||||||
# Make sure these directories are properly owned
|
# Make sure these directories are properly owned
|
||||||
mkdir -p %{buildroot}/lib/systemd/system/basic.target.wants
|
mkdir -p %{buildroot}/lib/systemd/system/basic.target.wants
|
||||||
mkdir -p %{buildroot}/lib/systemd/system/default.target.wants
|
mkdir -p %{buildroot}/lib/systemd/system/default.target.wants
|
||||||
@ -172,10 +171,14 @@ fi
|
|||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%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}/systemd/system.conf
|
||||||
%dir %{_sysconfdir}/systemd/session
|
%dir %{_sysconfdir}/systemd/session
|
||||||
%{_sysconfdir}/xdg/systemd
|
%{_sysconfdir}/xdg/systemd
|
||||||
|
%{_sysconfdir}/tmpfiles.d/systemd.conf
|
||||||
|
%{_sysconfdir}/tmpfiles.d/x11.conf
|
||||||
/bin/systemd
|
/bin/systemd
|
||||||
/bin/systemd-notify
|
/bin/systemd-notify
|
||||||
|
/bin/systemd-ask-password
|
||||||
/lib/systemd/systemd-*
|
/lib/systemd/systemd-*
|
||||||
/lib/udev/rules.d/*.rules
|
/lib/udev/rules.d/*.rules
|
||||||
/%{_lib}/security/pam_systemd.so
|
/%{_lib}/security/pam_systemd.so
|
||||||
@ -198,13 +201,12 @@ fi
|
|||||||
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
|
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
|
||||||
%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
|
%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
|
||||||
%{_docdir}/systemd
|
%{_docdir}/systemd
|
||||||
%dir %{_localstatedir}/run/user
|
|
||||||
|
|
||||||
%files units
|
%files units
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%dir %{_sysconfdir}/systemd
|
%dir %{_sysconfdir}/systemd
|
||||||
%dir %{_sysconfdir}/systemd/system
|
%dir %{_sysconfdir}/systemd/system
|
||||||
%config(noreplace) %{_sysconfdir}/systemd/system.conf
|
%dir %{_sysconfdir}/tmpfiles.d
|
||||||
%dir /lib/systemd
|
%dir /lib/systemd
|
||||||
/lib/systemd/system
|
/lib/systemd/system
|
||||||
/bin/systemctl
|
/bin/systemctl
|
||||||
@ -222,10 +224,15 @@ fi
|
|||||||
%files gtk
|
%files gtk
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_bindir}/systemadm
|
%{_bindir}/systemadm
|
||||||
|
%{_bindir}/systemd-ask-password-agent
|
||||||
|
%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
|
||||||
%{_mandir}/man1/systemadm.*
|
%{_mandir}/man1/systemadm.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Sep 29 2010 jkeating - 10-6
|
* Thu Oct 7 2010 Lennart Poettering <lpoetter@redhat.com> - 11-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Sep 29 2010 Jesse Keating <jkeating@redhat.com> - 10-6
|
||||||
- Rebuilt for gcc bug 634757
|
- Rebuilt for gcc bug 634757
|
||||||
|
|
||||||
* Thu Sep 23 2010 Bill Nottingham <notting@redhat.com> - 10-5
|
* Thu Sep 23 2010 Bill Nottingham <notting@redhat.com> - 10-5
|
||||||
|
Loading…
Reference in New Issue
Block a user