update to a current git snapshot

This commit is contained in:
Michal Schmidt 2012-01-22 20:46:56 +01:00
parent cff4d671c8
commit 8b9f614000
3 changed files with 18 additions and 8 deletions

1
.gitignore vendored
View File

@ -35,3 +35,4 @@ systemd-*src.rpm
/systemd-36.tar.bz2
/systemd-37.tar.bz2
/systemd-38.tar.xz
/systemd-git9fa2f41.tar.xz

View File

@ -1 +1 @@
68c66dce5a28c0efd7c210af5d11efed systemd-38.tar.xz
77e5b3fd302384e1c031a546d01ff850 systemd-git9fa2f41.tar.xz

View File

@ -1,8 +1,8 @@
#% global gitcommit 3e52541
%global gitcommit 9fa2f41
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 38
Release: 5%{?gitcommit:.git%{gitcommit}}%{?dist}
Release: 6%{?gitcommit:.git%{gitcommit}}%{?dist}
License: GPLv2+
Group: System Environment/Base
Summary: A System and Service Manager
@ -54,8 +54,6 @@ Source2: systemd-sysv-convert
Source3: udlfb.conf
# Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away
Source4: listen.conf
# fix build on big-endians (commit ce3fd7e7)
Patch0: %{name}-38-big-endian.patch
# For sysvinit tools
Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
@ -125,7 +123,6 @@ at boot.
%prep
%setup -q %{?gitcommit:-n %{name}-git%{gitcommit}}
%patch0 -p1 -b .big-endian
%build
%{?gitcommit: ./autogen.sh }
@ -190,6 +187,12 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/modprobe.d/
mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d/
install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rsyslog.d/
# To avoid making life hard for Rawhide-using developers, don't package the
# kernel.core_pattern setting until systemd-coredump is a part of an actual
# systemd release and it's made clear how to get the core dumps out of the
# journal.
rm -f %{buildroot}%{_libdir}/../lib/sysctl.d/coredump.conf
%post
/sbin/ldconfig
/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
@ -300,8 +303,6 @@ fi
/bin/systemd-journalctl
/bin/systemd-tmpfiles
/bin/systemctl
%{_bindir}/systemd-nspawn
%{_bindir}/systemd-stdio-bridge
/lib/systemd/system
/lib/systemd/systemd-*
/lib/udev/rules.d/*.rules
@ -320,7 +321,11 @@ fi
/sbin/shutdown
/sbin/telinit
/sbin/runlevel
%{_bindir}/systemd-nspawn
%{_bindir}/systemd-stdio-bridge
%{_bindir}/systemd-cat
%{_bindir}/systemd-cgls
%{_bindir}/systemd-cgtop
%{_mandir}/man1/*
%exclude %{_mandir}/man1/systemadm.*
%{_mandir}/man5/*
@ -381,6 +386,10 @@ fi
%{_bindir}/systemd-analyze
%changelog
* Sun Jan 22 2012 Michal Schmidt <mschmidt@redhat.com> - 38-6.git9fa2f41
- Update to a current git snapshot.
- Resolves: #781657
* Sun Jan 22 2012 Michal Schmidt <mschmidt@redhat.com> - 38-5
- Build against libgee06. Reenable gtk tools.
- Delete unused patches.