ALT Linux Team development discussions
 help / color / mirror / Atom feed
* [devel] request: kbd-related changes in Sisyphus
@ 2005-04-08 16:15 Ivan Zakharyaschev
  2005-04-10 20:41 ` Dmitry V. Levin
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Ivan Zakharyaschev @ 2005-04-08 16:15 UTC (permalink / raw)
  To: devel

[-- Attachment #1: Type: TEXT/PLAIN, Size: 3043 bytes --]

Hello!

Это письмо-предложение-просьба обращено ответственным за
следующие пакеты:

группа 1:

basesystem (interactivesystem)
startup
util-linux (kbdrate)

(в скобках -- затрагиваемые подпакеты)

и группа 2:

bootsplash
numlock
startup

К появлению kbd (заменитель console-tools) в Sisyphus я предлагаю
вот что:

Между пакетами группы 1 и "группы 0" (kbd, console-tools и новый
console-common-scripts) происходят перераспредления файлов,
подпакетов, зависимостей. Переход к новому состоится, когда все
они изменённые попадут в Sisyphus.

В группе 2 никаких существенных изменений не предлагается, просто
их надо будет пересобрать *после* перехода на новые пакеты группы
0 и 1 -- для того, чтобы в них были правильные зависимости.

В этом письме -- предлагаемые изменения в виде патчей (чтобы
легко познакомиться), а все готовые .src.rpm лежат в
cvs.altlinux.ru:/incoming/Sisyphus/ (но у меня не должно быть
права их все положить в Sisyphus); так что я прошу ответственных
за эти пакеты или за Sisyphus учесть эти изменения. Если пакет
Вас уcтраивает, можно, наверное, попросить принять его в
Sisyphus.

Файлы (я брал следующие по порядку номера версий):

basesystem-sisyphus-alt12.src.rpm
startup-0.9.7-alt1.src.rpm
util-linux-2.12p-alt3.src.rpm

bootsplash-3.2-alt5.1.src.rpm
numlock-2.0-ipl10mdk.src.rpm
suspend-0.18-alt2.src.rpm

там же и новые:

console-common-scripts-0.2.2-alt1.src.rpm
console-tools-0.2.3-ipl30mdk.src.rpm
kbd-1.12-alt1.src.rpm


Комментарии:

группа 1:

startup, interactivesystem:

Вообще, теперь так: kbd и console-tools могут друг на друга
меняться. Над ними -- console-common-scripts, в нём должно быть
собрано всё, что отвечает за действия по конфигурации консоли и
"активации" заданной конфигурации. В частности, из startup в него
переезжает /sbin/setsysfont. (Теперь подобные скрипты не
разбросаны по разным пакетам; принципиальных отличий в работе
нового от старого пока нет.) interactivesystem просто отражает
новую структуру.

Переезд конфигурационных файлов обрабатывается в post-скриптах и
триггерах из console-common-scripts, ну и все
зависимости/конфликты расставлены.


kbdrate: собирается из kbd, а не из util-linux (переехал в
upstream).


(Обновления на новые пакеты проходили гладко, когда я их
тетсировал.)

группа 2:

В этих трёх пакетах сложные программы из kbd / console-tools
напрямую не используются. А используются либо "высокоуровневые"
команды из нового console-common-scripts, либо простые программы,
так называемые vt-tools (chvt, fgconsole) -- они теперь для
удобства в отдельном маленьком пакете console-vt-tools. Например,
после пересборки bootsplash он будет зависеть не от
console-tools, а от только от console-vt-tools (и будет независим
от выбора kbd / console-tools).

Но их, как я уже говорил, хорошо бы пересобрать после того, как в
сборочной среде будут новые пакеты групп 0 и 1.


Надеюсь, это не создаст беспорядка. Если непонятно написал, буду
отвечать на вопросы и предложения. Спасибо.

-- 
С наилучшими пожеланиями,
Иван Захарьящев, Москва
::
JabberID: imz at altlinux.org

[-- Attachment #2: basesystem --]
[-- Type: TEXT/PLAIN, Size: 1241 bytes --]

diff -duNr --exclude='.emacs*' basesystem.orig/SPEC/basesystem.spec basesystem/SPEC/basesystem.spec
--- basesystem.orig/SPEC/basesystem.spec	2004-11-18 01:22:44 +0600
+++ basesystem/SPEC/basesystem.spec	2005-04-04 12:20:00 +0700
@@ -1,6 +1,6 @@
 Name: basesystem
 Version: sisyphus
-Release: alt11
+Release: alt12
 Serial: 1
 
 Summary: The skeleton package which defines a basic %distribution system
@@ -18,7 +18,7 @@
 Summary: The skeleton package which defines an interactive %distribution system
 Group: System/Base
 PreReq: %name = %version-%release
-PreReq: bdflush console-tools_or_kbd console-data crontabs info less man mingetty mkbootdisk
+PreReq: bdflush console-common-scripts crontabs info less man mingetty mkbootdisk
 PreReq: network-config-subsystem termutils passwd sash sound-scripts stat time tmpwatch
 #PreReq: bootloader
 
@@ -38,6 +38,10 @@
 %files -n interactivesystem
 
 %changelog
+* Mon Apr  4 2005 Ivan Zakharyaschev <imz@altlinux.ru> 1:sisyphus-alt12
+- interactivesystem: substituted "console-common-scripts" for 
+  "console-tools_or_kbd console-data".
+
 * Wed Nov 17 2004 Dmitry V. Levin <ldv@altlinux.org> 1:sisyphus-alt11
 - s/net-scripts/network-config-subsystem/ (#5490).
 

[-- Attachment #3: startup --]
[-- Type: TEXT/PLAIN, Size: 4805 bytes --]

diff -dur --exclude='.emacs*' --exclude=RCS startup-0.9.6.1/rc.d/init.d/fbsetfont startup-0.9.7/rc.d/init.d/fbsetfont
--- startup-0.9.6.1/rc.d/init.d/fbsetfont	2004-05-26 18:22:42 +0700
+++ startup-0.9.7/rc.d/init.d/fbsetfont	2005-04-08 16:11:48 +0700
@@ -48,12 +48,12 @@
 		sed -ne 's,^\([0-9]\+\):[0-9]\+:respawn:/sbin/mingetty.*,/dev/tty\1,pg' </etc/inittab |
 			while read t; do
 				[ ! -c "$t" ] ||
-					/sbin/setsysfont <"$t" >>"$t" 2>&1
+					ExecIfExecutable /sbin/setsysfont <"$t" >>"$t" 2>&1
 			done
 		for i in $TTYS; do
 			t="/dev/tty$i"
 			[ ! -c "$t" ] ||
-				/sbin/setsysfont <"$t" >>"$t" 2>&1
+				ExecIfExecutable /sbin/setsysfont <"$t" >>"$t" 2>&1
 		done
 	fi
 	touch "$LOCKFILE"
diff -dur --exclude='.emacs*' --exclude=RCS startup-0.9.6.1/rc.d/rc.sysinit startup-0.9.7/rc.d/rc.sysinit
--- startup-0.9.6.1/rc.d/rc.sysinit	2005-04-03 06:20:25 +0700
+++ startup-0.9.7/rc.d/rc.sysinit	2005-04-08 16:11:48 +0700
@@ -39,7 +39,7 @@
 fi
 
 # Set system font
-setsysfont >/dev/null 2>&1 && SETSYSFONT_DONE=1 || SETSYSFONT_DONE=
+ExecIfExecutable /sbin/setsysfont >/dev/null 2>&1 && SETSYSFONT_DONE=1 || SETSYSFONT_DONE=
 
 PrintMargin()
 {
@@ -259,7 +259,7 @@
 
 # Set system font again, if required
 if [ "$OLD_COLUMNS" != "$COLUMNS" ]; then
-	setsysfont >/dev/null 2>&1 && SETSYSFONT_DONE=1 || SETSYSFONT_DONE=
+	ExecIfExecutable /sbin/setsysfont >/dev/null 2>&1 && SETSYSFONT_DONE=1 || SETSYSFONT_DONE=
 fi
 
 # Load device-mapper, create its device file
@@ -447,7 +447,7 @@
 # At this point everything should be mounted
 
 # Set system font again, if required
-[ -n "$SETSYSFONT_DONE" ] || setsysfont >/dev/null 2>&1
+[ -n "$SETSYSFONT_DONE" ] || ExecIfExecutable /sbin/setsysfont >/dev/null 2>&1
 
 if [ "$_RUN_QUOTACHECK" = 1 -a -x "$QUOTACHECK" ]; then
 	action "Checking filesystem quotas:" "$QUOTACHECK" -v -R -a
Only in startup-0.9.6.1: setsysfont
diff -dur --exclude='.emacs*' --exclude=RCS startup-0.9.6.1/startup.spec startup-0.9.7/startup.spec
--- startup-0.9.6.1/startup.spec	2005-04-03 06:20:39 +0700
+++ startup-0.9.7/startup.spec	2005-04-08 16:15:22 +0700
@@ -1,7 +1,7 @@
 # $Id: startup.spec,v 1.39 2005/04/02 23:20:39 ldv Exp $
 
 Name: startup
-Version: 0.9.6.1
+Version: 0.9.7
 Release: alt1
 
 Summary: The system startup scripts
@@ -32,6 +32,8 @@
 Conflicts: kernel-headers-common < 0:1.1
 # due to netfs
 Conflicts: net-scripts < 0:0.5.4-alt1
+# due to /sbin/setsysfont's package change
+Conflicts: interactivesystem < 1:sisyphus-alt12
 
 %description
 This package contains scripts used to boot your system,
@@ -43,7 +45,6 @@
 %install
 %__mkdir_p $RPM_BUILD_ROOT%_sysconfdir/rc.d/rc{0,1,2,3,4,5,6}.d
 %__install -p -m644 inittab modules sysctl.conf $RPM_BUILD_ROOT%_sysconfdir/
-%__install -pD -m755 setsysfont $RPM_BUILD_ROOT/sbin/setsysfont
 %__cp -a rc.d sysconfig $RPM_BUILD_ROOT%_sysconfdir/
 
 # these services do not support chkconfig:
@@ -62,10 +63,9 @@
 
 %__mkdir_p $RPM_BUILD_ROOT/var/{log,run}
 touch $RPM_BUILD_ROOT/var/{log/wtmp,run/utmp}
-touch $RPM_BUILD_ROOT%_sysconfdir/sysconfig/{clock,i18n,keyboard,mouse,system}
+touch $RPM_BUILD_ROOT%_sysconfdir/sysconfig/{clock,i18n,mouse,system}
 chmod -R +x $RPM_BUILD_ROOT%_sysconfdir/rc.d
-%__mkdir_p $RPM_BUILD_ROOT%_sysconfdir/sysconfig/{console,harddisk}
-touch $RPM_BUILD_ROOT%_sysconfdir/sysconfig/console/setterm
+%__mkdir_p $RPM_BUILD_ROOT%_sysconfdir/sysconfig/harddisk
 
 %__mkdir_p $RPM_BUILD_ROOT%_sysconfdir/firsttime.d
 %__mkdir_p $RPM_BUILD_ROOT%_localstatedir/rsbac
@@ -112,7 +112,7 @@
 fi
 
 %triggerpostun -- initscripts < 1:5.49.1-alt1
-for f in %_sysconfdir/{inittab,modules,sysctl.conf,sysconfig/{clock,console/setterm,framebuffer,i18n,init,keyboard,mouse,rawdevices,system}}; do
+for f in %_sysconfdir/{inittab,modules,sysctl.conf,sysconfig/{clock,framebuffer,i18n,init,mouse,rawdevices,system}}; do
 	if [ ! -f "$f" ]; then
 	        if [ -f "$f".rpmsave ]; then
 	                %__cp -pf "$f".rpmsave "$f"
@@ -144,13 +144,19 @@
 %config %_sysconfdir/rc.d/rc
 %config %_sysconfdir/rc.d/rc.sysinit
 %config %_sysconfdir/rc.d/rc.powerfail
-/sbin/setsysfont
 %ghost %attr(664,root,utmp) /var/log/wtmp
 %ghost %attr(664,root,utmp) /var/run/utmp
 %dir %_sysconfdir/firsttime.d
 %dir %_localstatedir/rsbac
 
 %changelog
+* Mon Apr  4 2005 Ivan Zakharyaschev <imz@altlinux.ru> 0.9.7-alt1
+- Moved console-related files to console-common-scripts package:
+  /sbin/setsysfont, %_sysconfdir/sysconfig/console/setterm, 
+  %_sysconfdir/sysconfig/keyboard
+  (no extra dependency on console-common-scripts required, it belongs 
+  to interactivesystem).
+
 * Sun Apr 03 2005 Dmitry V. Levin <ldv@altlinux.org> 0.9.6.1-alt1
 - rc.sysinit: reverted previous change.
 

[-- Attachment #4: util-linux --]
[-- Type: TEXT/PLAIN, Size: 6213 bytes --]

Only in util-linux.orig: kbdrate-1.06.tar.gz
diff -dur --exclude='.emacs*' --exclude=RCS util-linux.orig/SPEC/util-linux.spec util-linux/SPEC/util-linux.spec
--- util-linux.orig/SPEC/util-linux.spec	2005-03-12 18:00:21 +0600
+++ util-linux/SPEC/util-linux.spec	2005-04-07 06:48:53 +0700
@@ -1,10 +1,10 @@
 # -*- rpm-spec -*-
-# $Id: util-linux,v 1.5 2005/03/12 11:57:04 me Exp $
+# $Id: util-linux.spec,v 1.4 2005/04/06 23:48:53 ivan Exp $
 
 %define main_ver 2.12p
 Name: util-linux
 Version: %main_ver
-Release: alt2
+Release: alt3
 
 %def_without hwclock
 %def_without getopt
@@ -19,15 +19,12 @@
 Summary: A collection of basic system utilities
 License: GPL
 Group: System/Base
-Url: ftp://ftp.win.tue.nl/pub/linux-local/utils/%name
+Url: ftp://ftp.kernel.org/pub/linux/utils/%name
 Packager: Util-linux Development Team <util-linux@packages.altlinux.org>
 
 Source: %name-%version.tar.bz2
-Source1: kbdrate-1.06.tar.gz
 Source3: %name-2.10-chfn.pamd
 Source4: %name-2.10-chsh.pamd
-Source5: %name-2.9w-kbdrate.pamd
-Source6: %name-2.9w-kbdrate.apps
 
 # Extra utils.
 Source10: pause.s
@@ -70,7 +67,6 @@
 Patch103: %name-2.12p-alt-encryption.patch
 
 #new
-Patch200: %name-2.12-rh-kbdrate-period-fix.patch
 Patch201: %name-2.12p-alt-lseek64.patch 
 Patch202: %name-2.12p-rh-raw-handle-nonpresent-devs.patch
 Patch203: %name-2.12a-rh-mountbylabel-dm.patch
@@ -164,27 +160,6 @@
 Small partitioning program with argument interface, that will be hard
 for linux newbie, but it is extra stable, and you can trust it.
 
-%package -n kbdrate
-Summary: Reset the keyboard repeat rate and delay time
-Group: System/Configuration/Hardware
-
-%description -n kbdrate
-This package is used to change the keyboard repeat rate and delay time.
-The delay is the amount of time that a key must be depressed before it
-will start to repeat.
-
-%package -n kbdrate-usermode
-Summary: Usermode bindings for kbdrate
-Group: System/Configuration/Hardware
-Requires: kbdrate = %version-%release
-
-%description -n kbdrate-usermode
-Kbdrate package is used to change the keyboard repeat rate and delay time.
-The delay is the amount of time that a key must be depressed before it
-will start to repeat.
-
-This package contains usermode bindings for kbdrate.
-
 %if_with hwclock
 %package -n hwclock
 Summary: Query and set the hardware clock
@@ -240,7 +215,7 @@
 The look utility displays any lines in file which contain string as a prefix.
 
 %prep
-%setup -q -a1
+%setup -q
 
 #setup config
 %__subst 's,^HAVE_PAM=.*,HAVE_PAM=yes,
@@ -306,7 +281,6 @@
 #end mount
 
 #begin new
-#%patch200 -p1
 %patch201 -p1
 
 %if_with raw
@@ -363,10 +337,6 @@
 	gcc $RPM_OPT_FLAGS -o rescuept rescuept.c
 popd
 
-pushd kbdrate
-    cc $RPM_OPT_FLAGS -o kbdrate kbdrate.c
-popd
-
 gcc -nostartfiles -nodefaultlibs -nostdlib pause.s -o pause
 gcc $RPM_OPT_FLAGS chstk.c -o chstk
 gcc $RPM_OPT_FLAGS stacktest.c -o stacktest
@@ -378,7 +348,7 @@
 install -p -m644 rescuept/README docs/README.rescuept
 
 %install
-mkdir -p $RPM_BUILD_ROOT/{bin,sbin,etc/{pam.d,security/console.apps}}
+mkdir -p $RPM_BUILD_ROOT/{bin,sbin,etc/pam.d}
 mkdir -p $RPM_BUILD_ROOT{%_bindir,%_sbindir,%_libdir,%_infodir,%_mandir/man{1,8}}
 
 for f in `cd po; echo *.po`; do
@@ -412,9 +382,6 @@
 install -p -m640 $RPM_SOURCE_DIR/%name-2.10-chsh.pamd $RPM_BUILD_ROOT%_sysconfdir/pam.d/chfn
 %endif
 
-install -p -m640 $RPM_SOURCE_DIR/%name-2.9w-kbdrate.pamd $RPM_BUILD_ROOT%_sysconfdir/pam.d/kbdrate
-install -p -m640 $RPM_SOURCE_DIR/%name-2.9w-kbdrate.apps $RPM_BUILD_ROOT%_sysconfdir/security/console.apps/kbdrate
-
 install -pD -m755 $RPM_SOURCE_DIR/mount.control $RPM_BUILD_ROOT/etc/control.d/facilities/mount
 install -pD -m755 $RPM_SOURCE_DIR/write.control $RPM_BUILD_ROOT/etc/control.d/facilities/write
 
@@ -423,10 +390,6 @@
 install -p -m755 nologin $RPM_BUILD_ROOT/sbin/
 install -p -m644 nologin.8 $RPM_BUILD_ROOT%_man8dir/
 
-install -p -m755 kbdrate/kbdrate $RPM_BUILD_ROOT/sbin/
-install -p -m644 kbdrate/kbdrate.8 $RPM_BUILD_ROOT%_man8dir/
-%__ln_s %_libdir/helper/consolehelper $RPM_BUILD_ROOT%_bindir/kbdrate
-
 # This has dependencies on stuff in /usr
 %ifnarch sparc sparc64 sparcv9
 mv $RPM_BUILD_ROOT/sbin/cfdisk $RPM_BUILD_ROOT%_sbindir/
@@ -488,7 +451,7 @@
 #bindir
 echo '%_defattr' >>%name.lang
 /bin/ls -1 $RPM_BUILD_ROOT%_bindir |
-	egrep -v '^(write|getopt|kbdrate|look)$' |
+	egrep -v '^(write|getopt|look)$' |
 	sed -e 's|^\(.*\)$|%%_bindir/\1|g' >>%name.lang
 
 #sbindir
@@ -501,7 +464,7 @@
 	egrep -v '^(getopt|login|look)' |
 	sed -e 's|^\(.*\)$|%%_mandir/man1/\1*|g' >>%name.lang
 /bin/ls -1 $RPM_BUILD_ROOT%_man8dir |
-	egrep -v '(mount|^swapo|losetup|^kbdrate|clock|getty|fdisk)' |
+	egrep -v '(mount|^swapo|losetup|clock|getty|fdisk)' |
 	sed -e 's|^\(.*\)$|%%_man8dir/\1*|g' >>%name.lang
 
 #/bin
@@ -511,9 +474,12 @@
 
 #/sbin
 /bin/ls -1 $RPM_BUILD_ROOT/sbin |
-	egrep -v '(^swapo|^losetup|^kbdrate|clock|getty|fdisk)' |
+	egrep -v '(^swapo|^losetup|clock|getty|fdisk)' |
 	sed -e 's|^\(.*\)$|/sbin/\1|g' >>%name.lang
 
+# Remove unpackaged files (to pass RPM check):
+rm $RPM_BUILD_ROOT/bin/login $RPM_BUILD_ROOT/usr/share/man/man1/login.*
+
 %pre
 [ $1 -eq 1 ] || /usr/sbin/control-dump write
 
@@ -586,20 +552,16 @@
 %_man8dir/sfdisk.*
 %doc sfdisk/*
 
-%files -n kbdrate
-/sbin/kbdrate
-%_man8dir/kbdrate.*
-
-%files -n kbdrate-usermode
-%config(noreplace) %_sysconfdir/pam.d/kbdrate
-%config(noreplace) %_sysconfdir/security/console.apps/kbdrate
-%_bindir/kbdrate
-
 %files -n look
 %_bindir/look
 %_man1dir/look.*
 
 %changelog
+* Thu Apr  7 2005 Ivan Zakharyaschev <imz@altlinux.ru> 2.12p-alt3
+- kbdrate is now packaged in kbd package.
+- URL changed according to 
+  ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/README-site-change.
+
 * Sat Mar 12 2005 Sergey Bolshakov <sbolshakov@altlinux.ru> 2.12p-alt2
 - NFSv4 support for mount(1) resurrected
 
Only in util-linux.orig: util-linux-2.12-rh-kbdrate-period-fix.patch
Only in util-linux.orig: util-linux-2.9w-kbdrate.apps
Only in util-linux.orig: util-linux-2.9w-kbdrate.pamd

[-- Attachment #5: bootsplash --]
[-- Type: TEXT/PLAIN, Size: 737 bytes --]

diff -dur --exclude='.emacs*' --exclude=RCS bootsplash.orig/SPEC/bootsplash.spec bootsplash/SPEC/bootsplash.spec
--- bootsplash.orig/SPEC/bootsplash.spec	2005-04-07 14:17:21 +0700
+++ bootsplash/SPEC/bootsplash.spec	2005-04-08 12:31:46 +0700
@@ -1,6 +1,6 @@
 Name: bootsplash
 Version: 3.2
-Release: alt5
+Release: alt5.1
 
 Packager: Rider <rider@altlinux.ru>
 
@@ -78,6 +78,10 @@
 %config %_sysconfdir/sysconfig/bootsplash
 
 %changelog
+* Fri Apr  8 2005 Ivan Zakharyaschev <imz@altlinux.ru> 3.2-alt5.1
+- rebuild to change deps: console-tools --> console-vt-tools
+  (console-vt-tools must be present in the build system)
+
 * Thu Apr 07 2005 Anton Farygin <rider@altlinux.ru> 3.2-alt5
 - updated previos fix
 

[-- Attachment #6: numlock --]
[-- Type: TEXT/PLAIN, Size: 1251 bytes --]

diff -dur --exclude='.emacs*' --exclude=RCS numlock.orig/SPEC/numlock.spec numlock/SPEC/numlock.spec
--- numlock.orig/SPEC/numlock.spec	2003-10-22 13:49:49 +0700
+++ numlock/SPEC/numlock.spec	2005-04-08 12:16:41 +0700
@@ -1,6 +1,6 @@
 Name: numlock
 Version: 2.0
-Release: ipl9mdk
+Release: ipl10mdk
 
 Summary: Numlock key locker
 License: GPL
@@ -9,7 +9,11 @@
 Source1: %name.init
 
 AutoReq: no
-Requires: coreutils console-tools
+Requires: coreutils
+# due to setleds
+Requires: console-tools_or_kbd
+# initscript uses setleds:
+Requires(post,preun): console-tools_or_kbd
 Obsoletes: NumLock
 
 # Automatically added by buildreq on Wed Oct 22 2003
@@ -30,6 +34,8 @@
 %install
 %makeinstall TOP=$RPM_BUILD_ROOT INITRDDIR=%_initdir
 %__install -pm755 %SOURCE1 $RPM_BUILD_ROOT%_initdir/%name
+# Remove unpackaged files:
+rm $RPM_BUILD_ROOT%_x11mandir/fr/man?/*
 
 %post
 %post_service %name
@@ -46,6 +52,9 @@
 #%lang(fr)%_x11mandir/fr/man?/*
 
 %changelog
+* Thu Apr  7 2005 Ivan Zakharyaschev <imz@altlinux.ru> 2.0-ipl10mdk
+- requires console-tools_or_kbd (instead of console-tools)
+
 * Wed Oct 22 2003 Aleksandr Blokhin (Sass) <sass@altlinux.ru> 2.0-ipl9mdk
 - changed package requires
 - specs cleanup

[-- Attachment #7: suspend --]
[-- Type: TEXT/PLAIN, Size: 992 bytes --]

diff -dur --exclude='.emacs*' --exclude=RCS suspend.orig/SPEC/suspend.spec suspend/SPEC/suspend.spec
--- suspend.orig/SPEC/suspend.spec	2004-02-07 19:59:29 +0600
+++ suspend/SPEC/suspend.spec	2005-04-08 12:12:23 +0700
@@ -1,6 +1,6 @@
 Name: suspend
 Version: 0.18
-Release: alt1
+Release: alt2
 
 Summary: Tools for hibernate
 License: GPL
@@ -16,7 +16,11 @@
 
 BuildPreReq: coreutils
 
-Requires: XFree86-utils, console-tools
+Requires: XFree86-utils
+# due to setsysfont
+Requires: console-common-scripts
+# due to fgconsole, chvt
+Requires: console-vt-tools
 
 %description
 Tools for hibernate: install /usr/sbin/hibernate and a configuration
@@ -44,6 +48,10 @@
 %config(noreplace) %_sysconfdir/suspend.conf
 
 %changelog
+* Thu Apr  7 2005 Ivan Zakharyaschev <imz@altlinux.ru> 0.18-alt2
+- requires console-common-scripts, console-vt-tools
+  (instead of console-tools)
+
 * Sat Feb 07 2004 Alex Yustasov <yust@altlinux.ru> 0.18-alt1
 - 0.18 version
 

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2005-04-12  9:51 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-04-08 16:15 [devel] request: kbd-related changes in Sisyphus Ivan Zakharyaschev
2005-04-10 20:41 ` Dmitry V. Levin
2005-04-10 23:06   ` Ivan Zakharyaschev
2005-04-10 22:15 ` Dmitry V. Levin
2005-04-10 23:53   ` Ivan Zakharyaschev
2005-04-11  6:09     ` Anton Farygin
2005-04-12  9:51 ` Ivan Zakharyaschev

ALT Linux Team development discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
		devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
	public-inbox-index devel

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git