Author: qboosh Date: Sat May 31 13:23:05 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.2.2 - updated patches
---- Files affected: SPECS: vlock.spec (1.46 -> 1.47) ---- Diffs: ================================================================ Index: SPECS/vlock.spec diff -u SPECS/vlock.spec:1.46 SPECS/vlock.spec:1.47 --- SPECS/vlock.spec:1.46 Mon Sep 10 20:15:30 2007 +++ SPECS/vlock.spec Sat May 31 15:23:00 2008 @@ -1,4 +1,8 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without caca # don't build libcaca-based screensaver module +# Summary: Locks one or more virtual consoles Summary(de.UTF-8): Sperrt eine oder mehrere virtuelle Konsolen Summary(es.UTF-8): Bloquea una o más consolas virtuales @@ -10,17 +14,21 @@ Summary(uk.UTF-8): Закриває одну чи більше консолей від несанкціонованого доступу Summary(zh_CN.UTF-8): 一个能够锁定一个或多个虚拟终端的程序 Name: vlock -Version: 2.1 +Version: 2.2.2 Release: 1 License: GPL v2 Group: Applications/Console Source0: http://cthulhu.c3d2.de/~toidinamai/vlock/archive/%{name}-%{version}.tar.bz2 -# Source0-md5: 4dffc0e73c3b4f8b16271c5600a3206f +# Source0-md5: 0b26703c0aa3a9ae67bb90b9373a3b88 Source1: %{name}.pamd Patch0: %{name}-rootpw.patch Patch1: %{name}-linking.patch URL: http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html BuildRequires: pam-devel >= 0.77.3 +%if %{with caca} +BuildRequires: libcaca-devel >= 0.99 +BuildRequires: ncurses-devel +%endif Requires: pam >= 0.77.3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -90,26 +98,50 @@ Розблокування відбувається шляхом вводу пароля користувача, що запустив vlock, чи пароля root. +%package caca +Summary: libcaca-based screensaver module for vlock +Summary(pl.UTF-8): Moduł wygaszacza ekranu opartego na libcaca dla vlocka +Group: Applications/Console +Requires: %{name} = %{version}-%{release} + +%description caca +libcaca-based screensaver module for vlock. + +%description caca -l pl.UTF-8 +Moduł wygaszacza ekranu opartego na libcaca dla vlocka. + %prep %setup -q %patch0 -p1 %patch1 -p1 %build -%{__make} \ +# not autoconf-generated +./configure \ CC="%{__cc}" \ + CFLAGS="%{rpmcflags} -Wall -W -pedantic -std=gnu99%{?with_caca: -I/usr/include/ncurses}" \ LDFLAGS="%{rpmldflags}" \ - CFLAGS="%{rpmcflags}" \ - AUTH_METHOD=pam \ - PREFIX=/usr + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --mandir=%{_mandir} \ + --with-modules="all.so new.so nosysrq.so ttyblank.so vesablank.so%{?with_caca: caca.so}" \ + --with-scripts="alsa_mute.sh amarok.sh hibernate.sh mplayer.sh \ +%ifarch %{ix86} %{x8664} + thinkpad_light.sh \ +%endif +%ifarch ppc + powerbook_backlight.sh \ +%endif + " + +%{__make} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/pam.d %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - PREFIX=/usr + DESTDIR=$RPM_BUILD_ROOT install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/%{name} @@ -118,17 +150,30 @@ %files %defattr(644,root,root,755) -%doc ChangeLog README SECURITY +%doc ChangeLog PLUGINS README README.X11 SECURITY TODO %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/%{name} %attr(755,root,root) %{_bindir}/vlock -%attr(755,root,root) %{_sbindir}/vlock-all -# needs suid root to support unlock by root password -%attr(755,root,root) %verify(not mode) %{_sbindir}/vlock-current -# two following need suid root to function, but should be limited to trusted users -%attr(755,root,root) %verify(not mode) %{_sbindir}/vlock-new -%attr(755,root,root) %verify(not mode) %{_sbindir}/vlock-nosysrq +# should have suid root for some functions (unlocking by root password, new or nosysrq modules) +# but should be limited to trusted users +%attr(755,root,root) %verify(not mode) %{_sbindir}/vlock-main +%dir %{_libdir}/vlock +%dir %{_libdir}/vlock/modules +%attr(755,root,root) %{_libdir}/vlock/modules/all.so +%attr(755,root,root) %{_libdir}/vlock/modules/new.so +%attr(755,root,root) %{_libdir}/vlock/modules/nosysrq.so +%attr(755,root,root) %{_libdir}/vlock/modules/ttyblank.so +%attr(755,root,root) %{_libdir}/vlock/modules/vesablank.so +%dir %{_libdir}/vlock/scripts +%attr(755,root,root) %{_libdir}/vlock/scripts/* %{_mandir}/man1/vlock.1* -%{_mandir}/man8/vlock-*.8* +%{_mandir}/man5/vlock-plugins.5* +%{_mandir}/man8/vlock-main.8* + +%if %{with caca} +%files caca +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/vlock/modules/caca.so +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -136,6 +181,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.47 2008-05-31 13:23:00 qboosh +- updated to 2.2.2 +- updated patches + Revision 1.46 2007-09-10 18:15:30 qboosh - updated to 2.1 - updated patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vlock.spec?r1=1.46&r2=1.47&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
