Author: baggins Date: Sun Mar 18 12:48:54 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 2 - mask systemd kdm service and require xinitrc-ng >= 1.0 to start kdm via prefdm - xinitrc-ng as such should be in R long ago
---- Files affected: packages/kde4-kdebase-workspace: kde4-kdebase-workspace.spec (1.301 -> 1.302) ---- Diffs: ================================================================ Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.301 packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.302 --- packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.301 Thu Mar 8 22:29:09 2012 +++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec Sun Mar 18 13:48:49 2012 @@ -9,7 +9,7 @@ Summary(pl.UTF-8): Podstawowe komponenty środowiska KDE 4 Name: kde4-kdebase-workspace Version: 4.8.1 -Release: 1 +Release: 2 License: GPL v2+ Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz @@ -27,7 +27,6 @@ Source11: kdebase-kdm.Xsession Source15: %{name}.desktop Source16: %{name}-session -Source17: kdm.service Patch100: %{name}-branch.diff Patch0: %{name}-rootprivs.patch Patch1: %{name}-kdmconfig.patch @@ -288,7 +287,6 @@ Summary(pl.UTF-8): Zarządca ekranów KDE Group: X11/Applications Requires: /usr/bin/X -# xorg-app-xinit-xinitrc-1.0.8-1 doesn't provide it. this should pull xinitrc-ng in Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id @@ -299,6 +297,7 @@ Requires: pam >= 0.99.7.1 Requires: rc-scripts Requires: systemd-units >= 0.38 +Requires: xinitrc-ng >= 1.0 Provides: XDM Provides: user(kdm) Obsoletes: kde4-kdm-systemd @@ -573,11 +572,11 @@ %py_comp $RPM_BUILD_ROOT%{py_sitedir} %py_ocomp $RPM_BUILD_ROOT%{py_sitedir} - # don't clean .py files! +# don't clean .py files! # systemd install -d $RPM_BUILD_ROOT/%{systemdunitdir} -cp -p %{SOURCE17} $RPM_BUILD_ROOT/%{systemdunitdir} +ln -s /dev/null $RPM_BUILD_ROOT/%{systemdunitdir}/kdm.service %clean rm -rf $RPM_BUILD_ROOT @@ -629,17 +628,12 @@ EOF fi -NORESTART=1 -%systemd_post kdm.service +%systemd_reload %preun -n kde4-kdm if [ "$1" = "0" ]; then /sbin/chkconfig --del kdm fi -%systemd_preun kdm.service - -%triggerpostun -n kde4-kdm -- kde4-kdm < 4.8.0-5 -%systemd_trigger kdm.service %files %defattr(644,root,root,755) @@ -1910,6 +1904,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.302 2012/03/18 12:48:49 baggins +- rel 2 +- mask systemd kdm service and require xinitrc-ng >= 1.0 to start kdm via prefdm +- xinitrc-ng as such should be in R long ago + Revision 1.301 2012/03/08 21:29:09 arekm - flat xz layout was used in final version ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.301&r2=1.302&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
