Author: glen Date: Sat Mar 24 02:38:18 2012 GMT Module: packages Tag: HEAD ---- Log message: - use prefdm from xinitrc-ng 1.0
---- Files affected: packages/slim: slim.spec (1.42 -> 1.43) ---- Diffs: ================================================================ Index: packages/slim/slim.spec diff -u packages/slim/slim.spec:1.42 packages/slim/slim.spec:1.43 --- packages/slim/slim.spec:1.42 Wed Feb 8 16:58:22 2012 +++ packages/slim/slim.spec Sat Mar 24 03:38:13 2012 @@ -7,14 +7,13 @@ Summary(pl.UTF-8): SLiM - niezależny od środowiska graficzny zarządca logowania Name: slim Version: 1.3.2 -Release: 9 +Release: 10 License: GPL v2 Group: X11/Applications Source0: http://download.berlios.de/slim/%{name}-%{version}.tar.gz # Source0-md5: ca1ae6120e6f4b4969f2d6cf94f47b42 Source1: %{name}.init Source2: %{name}.sysconfig -Source3: %{name}.service Patch0: %{name}-configuration.patch Patch1: %{name}-Makefile.patch Patch2: %{name}-libpng15.patch @@ -32,6 +31,7 @@ Requires: mktemp Requires: rc-scripts >= 0.4.0.10 Requires: systemd-units >= 0.38 +Requires: xinitrc-ng >= 1.0 Provides: XDM Obsoletes: slim-systemd BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -95,14 +95,17 @@ MANDIR=%{_mandir} \ DESTDIR=$RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/etc/sysconfig,security +:> $RPM_BUILD_ROOT/etc/security/blacklist.slim + +# initscript install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,security} install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name} -:> $RPM_BUILD_ROOT/etc/security/blacklist.slim # systemd -install -d $RPM_BUILD_ROOT/%{systemdunitdir} -cp -p %{SOURCE3} $RPM_BUILD_ROOT/%{systemdunitdir} +install -d $RPM_BUILD_ROOT%{systemdunitdir} +ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/slim.service %clean rm -rf $RPM_BUILD_ROOT @@ -111,27 +114,22 @@ /sbin/chkconfig --add slim # -n option not to actually restart as it will terminate all sessions opened from slim! %service -n slim restart "SLiM Display Manager" -NORESTART=1 -%systemd_post slim.service %banner -e %{name} <<EOF NOTE: You need to prepare ~/.xinitrc to make slim work. Take a look at %{_docdir}/%{name}-%{version}/xinitrc.sample* EOF +%systemd_reload %preun if [ "$1" = "0" ]; then /sbin/chkconfig --del slim %service slim stop fi -%systemd_preun slim.service %postun %systemd_reload -%triggerpostun -- %{name} < 1.3.2-5 -%systemd_trigger slim.service - %files %defattr(644,root,root,755) %doc ChangeLog README THEMES TODO xinitrc.sample @@ -151,6 +149,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.43 2012/03/24 02:38:13 glen +- use prefdm from xinitrc-ng 1.0 + Revision 1.42 2012/02/08 15:58:22 adamg - release 9; rebuild against libpng-1.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/slim/slim.spec?r1=1.42&r2=1.43 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
