rpms/systemd/devel systemd.spec,1.2,1.3
Lennart Poettering
lennart at fedoraproject.org
Tue Jun 22 04:16:32 UTC 2010
- Previous message: rpms/usb_modeswitch/F-13 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 usb_modeswitch.spec, 1.9, 1.10
- Next message: rpms/couchdb/F-13 couchdb-0008-Remove-bundled-ibrowse-library.patch, NONE, 1.1 couchdb-0009-Workaround-for-system-wide-ibrowse.patch, NONE, 1.1 couchdb-0001-Force-init-script-installation.patch, 1.2, 1.3 couchdb-0002-Install-into-erllibdir-by-default.patch, 1.2, 1.3 couchdb-0003-Remove-bundled-erlang-oauth-library.patch, 1.2, 1.3 couchdb-0004-Remove-bundled-erlang-etap-library.patch, 1.2, 1.3 couchdb-0005-Remove-bundled-mochiweb-library.patch, 1.1, 1.2 couchdb-0006-Remove-pid-file-after-stop.patch, 1.1, 1.2 couchdb-0007-Fix-for-system-wide-mochiweb.patch, 1.1, 1.2 couchdb.spec, 1.13, 1.14 import.log, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lennart
Update of /cvs/pkgs/rpms/systemd/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27103
Modified Files:
systemd.spec
Log Message:
update systemd from git
Index: systemd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemd/devel/systemd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- systemd.spec 14 Jun 2010 10:24:20 -0000 1.2
+++ systemd.spec 22 Jun 2010 04:16:32 -0000 1.3
@@ -1,77 +1,140 @@
-%global git_date 20100614
-%global git_version 393034
-%global _bindir /bin
-%global _libdir /lib
-
-Name: systemd
-Url: http://www.freedesktop.org/wiki/Software/systemd
-Version: 0
-Release: 0.4.%{git_date}git%{git_version}%{?dist}
-License: GPLv2+
-Group: System Environment/Base
-Summary: A System and Session Manager
-BuildRequires: libudev-devel
-BuildRequires: libcap-devel
-BuildRequires: libcgroup-devel libcgroup libxslt docbook-style-xsl
-BuildRequires: dbus-glib-devel vala pkgconfig gtk2-devel
-BuildRequires: automake autoconf
+%global git_date 20100622
+%global git_version a3723b
-# git clone git://anongit.freedesktop.org/systemd
-# cd systemd;
-# git-archive --format=tar --prefix={name}/ {git_version} | xz > systemd-{version}.{git_date}git{git_version}.tar.xz
+Name: systemd
+Url: http://www.freedesktop.org/wiki/Software/systemd
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Version: 0
+Release: 0.5.%{git_date}git%{git_version}%{?dist}
+License: GPLv2+
+Group: System Environment/Base
+Summary: A System and Session Manager
+BuildRequires: libudev-devel
+BuildRequires: libcap-devel
+BuildRequires: libcgroup-devel
+BuildRequires: tcp_wrappers-devel
+BuildRequires: pam-devel
+BuildRequires: libxslt
+BuildRequires: docbook-style-xsl
+BuildRequires: dbus-glib-devel
+BuildRequires: vala
+BuildRequires: pkgconfig
+BuildRequires: gtk2-devel
+BuildRequires: automake
+BuildRequires: autoconf
+Requires: dbus
+Requires: udev
+Requires: pkgconfig
+Requires: initscripts
-Source0: %{name}-%{version}.%{git_date}git%{git_version}.tar.xz
-#Source0: http://www.freedesktop.org/FIXME/%{name}-%{version}.tar.bz2
+# git clone git://anongit.freedesktop.org/systemd
+# cd systemd;
+# git archive --format=tar --prefix=systemd/ {git_version} | xz > systemd-{version}.{git_date}git{git_version}.tar.xz
-
-%description
-systemd is a system and session manager for Linux, compatible with SysV and
-LSB init scripts. systemd provides aggressive parallelization capabilities,
-uses socket and D-Bus activation for starting services, offers on-demand
-starting of daemons, keeps track of processes using Linux cgroups, supports
-snapshotting and restoring of the system state, maintains mount and automount
-points and implements an elaborate transactional dependency-based service
-control logic. It can work as a drop-in replacement for sysvinit.
+Source0: %{name}-%{version}.%{git_date}git%{git_version}.tar.xz
+#Source0: http://www.freedesktop.org/FIXME/%{name}-%{version}.tar.bz2
+%description
+systemd is a system and session manager for Linux, compatible with
+SysV and LSB init scripts. systemd provides aggressive parallelization
+capabilities, uses socket and D-Bus activation for starting services,
+offers on-demand starting of daemons, keeps track of processes using
+Linux cgroups, supports snapshotting and restoring of the system
+state, maintains mount and automount points and implements an
+elaborate transactional dependency-based service control logic. It can
+work as a drop-in replacement for sysvinit.
+
+%package gtk
+Group: System Environment/Base
+Summary: Graphical frontend for systemd
+Requires: %{name} = %{version}-%{release}
+
+%description gtk
+Graphical front-end for systemd.
+
+%package sysvinit
+Group: System Environment/Base
+Summary: systemd System V init tools
+Requires: %{name} = %{version}-%{release}
+Conflicts: sysvinit
+Conflicts: upstart
+
+%description sysvinit
+Drop-in replacement for the System V init tools of systemd.
+
+%package pam
+Group: System Environment/Base
+Summary: systemd PAM module
+Conflicts: %{name} < %{version}-%{release}
+Conflicts: %{name} > %{version}-%{release}
+
+%description pam
+PAM module for creating per-user and per-session control groups in the
+systemd control group hierarchy.
-%prep
+%prep
%setup -q -n %{name}
-./bootstrap.sh
-
-%build
-
-export V=1
-%configure --sbindir=/sbin --with-rootdir= --with-distro=fedora
+./bootstrap.sh ac
+%build
+%configure --with-rootdir= --with-distro=fedora
make %{?_smp_mflags}
-
-%install
-
-# workaround for lack of init.d directory
-mkdir -p %{buildroot}/%{_sysconfdir}/init.d
-make DESTDIR=%{buildroot} install
-
-
-%files
-%defattr(-,root,root,-)
-%dir %{_sysconfdir}/systemd
-%{_sysconfdir}/systemd/*
-%{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
-%{_sysconfdir}/xdg/systemd/session
-%{_sysconfdir}/init.d/reboot
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
-/lib/udev/rules.d/*.rules
-%{_bindir}/systemd
-%{_bindir}/systemctl
-%{_bindir}/systemadm
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+find %{buildroot} \( -name '*.a' -o -name '*.la' \) -exec rm {} \;
+mkdir -p %{buildroot}/sbin
+ln -s /bin/systemd %{buildroot}/sbin/init
+ln -s /bin/systemctl %{buildroot}/sbin/reboot
+ln -s /bin/systemctl %{buildroot}/sbin/halt
+ln -s /bin/systemctl %{buildroot}/sbin/poweroff
+ln -s /bin/systemctl %{buildroot}/sbin/shutdown
+ln -s /bin/systemctl %{buildroot}/sbin/telinit
+ln -s /bin/systemctl %{buildroot}/sbin/runlevel
+rmdir %{buildroot}/cgroup
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%{_sysconfdir}/systemd
+%{_sysconfdir}/xdg/systemd
+%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
+%{_sysconfdir}/rc.d/init.d/reboot
+/bin/systemd
+/bin/systemctl
+/bin/systemd-notify
+%{_bindir}/systemd-install
+/lib/systemd
+/lib/udev/rules.d/*.rules
%{_mandir}/man?/*.*
-%{_libdir}/systemd
-%{_datadir}/systemd/
+%{_datadir}/systemd
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
+%{_datadir}/pkgconfig/systemd.pc
+%{_docdir}/systemd
+
+%files gtk
+%defattr(-,root,root,-)
+%{_bindir}/systemadm
+
+%files sysvinit
+%defattr(-,root,root,-)
+/sbin/init
+/sbin/reboot
+/sbin/halt
+/sbin/poweroff
+/sbin/shutdown
+/sbin/telinit
+/sbin/runlevel
+
+%files pam
+%defattr(-,root,root,-)
+/%{_lib}/security/pam_systemd.so
-
%changelog
* Mon Jun 14 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0-0.4.20100614.git393024
- Pull the latest snapshot that fixes a segfault. Resolves rhbz#603231
@@ -87,4 +150,3 @@ make DESTDIR=%{buildroot} install
* Tue Jun 01 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0-0.0.git2010-06-02
- Initial spec (adopted from Kay Sievers)
-
- Previous message: rpms/usb_modeswitch/F-13 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 usb_modeswitch.spec, 1.9, 1.10
- Next message: rpms/couchdb/F-13 couchdb-0008-Remove-bundled-ibrowse-library.patch, NONE, 1.1 couchdb-0009-Workaround-for-system-wide-ibrowse.patch, NONE, 1.1 couchdb-0001-Force-init-script-installation.patch, 1.2, 1.3 couchdb-0002-Install-into-erllibdir-by-default.patch, 1.2, 1.3 couchdb-0003-Remove-bundled-erlang-oauth-library.patch, 1.2, 1.3 couchdb-0004-Remove-bundled-erlang-etap-library.patch, 1.2, 1.3 couchdb-0005-Remove-bundled-mochiweb-library.patch, 1.1, 1.2 couchdb-0006-Remove-pid-file-after-stop.patch, 1.1, 1.2 couchdb-0007-Fix-for-system-wide-mochiweb.patch, 1.1, 1.2 couchdb.spec, 1.13, 1.14 import.log, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list