Author: wiget Date: Sun Dec 4 01:58:48 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- systemd support
- rel. 6
---- Files affected:
packages/gdm:
gdm.spec (1.286 -> 1.287)
---- Diffs:
================================================================
Index: packages/gdm/gdm.spec
diff -u packages/gdm/gdm.spec:1.286 packages/gdm/gdm.spec:1.287
--- packages/gdm/gdm.spec:1.286 Thu Nov 17 23:52:34 2011
+++ packages/gdm/gdm.spec Sun Dec 4 02:58:43 2011
@@ -16,7 +16,7 @@
Summary(uk.UTF-8): Дисплейний менеджер GNOME
Name: gdm
Version: 3.2.1.1
-Release: 5
+Release: 6
Epoch: 2
License: GPL/LGPL
Group: X11/Applications
@@ -29,6 +29,7 @@
Source5: %{name}-custom.desktop
Source6: %{name}-default.desktop
Source7: %{name}.upstart
+Source8: %{name}.service
Patch0: %{name}-xdmcp.patch
Patch1: %{name}-polkit.patch
Patch2: %{name}-xsession.patch
@@ -63,7 +64,7 @@
BuildRequires: pkgconfig
BuildRequires: polkit-devel >= 0.93
BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.450
+BuildRequires: rpmbuild(macros) >= 1.623
BuildRequires: scrollkeeper >= 0.1.4
BuildRequires: tar >= 1:1.22
BuildRequires: upower-devel >= 0.9.0
@@ -210,6 +211,16 @@
%description upstart -l pl.UTF-8
Opis zadania Upstart dla GDM.
+%package systemd
+Summary: systemd unit for GDM
+Group: Daemons
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: systemd-units
+Requires: accountsservice-systemd
+
+%description systemd
+systemd unit for GDM
+
%prep
%setup -q
%patch0 -p1
@@ -247,7 +258,7 @@
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security,init} \
$RPM_BUILD_ROOT{/home/services/xdm,/var/log/gdm} \
- $RPM_BUILD_ROOT%{_datadir}/xsessions
+ $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{systemdunitdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
@@ -259,6 +270,7 @@
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/init/%{name}.conf
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p %{SOURCE8} $RPM_BUILD_ROOT%{systemdunitdir}/gdm.service
touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
%find_lang %{name} --with-gnome --with-omf --all-name
@@ -319,6 +331,16 @@
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
+%post systemd
+%systemd_post
+%systemd_enable gdm.service
+
+%preun systemd
+%systemd_preun gdm.service
+
+%postun systemd
+%systemd_postun gdm.service
+
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
@@ -415,12 +437,20 @@
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
+%files systemd
+%defattr(644,root,root,755)
+%{systemdunitdir}/gdm.service
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.287 2011/12/04 01:58:43 wiget
+- systemd support
+- rel. 6
+
Revision 1.286 2011/11/17 22:52:34 kiesiu
- use umask in posttrans script; rel. 5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm/gdm.spec?r1=1.286&r2=1.287&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
