- rel 2; sysconfig/clock and it's action is gone (obsolete; hwclock can decide the...

Changed files:
    rc-scripts-svn.patch -> 1.9
    rc-scripts.spec -> 1.343

diff --git a/rc-scripts-svn.patch b/rc-scripts-svn.patch
new file mode 100644 (file)
index 0000000..d5d54b9
--- /dev/null
+++ b/rc-scripts-svn.patch
@@ -0,0 +1,121 @@
+Index: doc/sysconfig.txt
+===================================================================
+--- doc/sysconfig.txt  (wersja 12087)
++++ doc/sysconfig.txt  (kopia robocza)
+@@ -3,23 +3,6 @@
+ Files in /etc/sysconfig
+ =======================
+ 
+-/etc/sysconfig/clock:
+-
+-  deprecated values from earlier releases:
+-
+-    CLOCKMODE=GMT indicates that the clock is set to UTC
+-    CLOCKMODE=ARC on alpha only indicates the ARC console's
+-      42-year time offset is in effect
+-
+-  currently correct values:
+-
+-    UTC=true indicates that the clock is set to UTC; anything
+-      else indicates that it is set to local time
+-    ARC=true on alpha only indicates the ARC console's
+-      42-year time offset is in effect; otherwise the normal
+-      Unix epoch is assumed
+-
+-
+ /etc/sysconfig/keyboard:
+ 
+   KEYTABLE=<keytable file>
+Index: rc.d/rc.sysinit
+===================================================================
+--- rc.d/rc.sysinit    (wersja 12087)
++++ rc.d/rc.sysinit    (kopia robocza)
+@@ -289,50 +289,9 @@
+       # may be missing).
+       sysctl -e -p /etc/sysctl.conf > /dev/null 2>&1
+ 
+-      # Set the system clock.
+-      ARC=0
+-      SRM=0
+-      UTC=0
+-
+-      if [ -f /etc/sysconfig/clock ]; then
+-              . /etc/sysconfig/clock
+-
+-              # convert old style clock config to new values
+-              if [ "${CLOCKMODE}" = "GMT" ]; then
+-                      UTC=true
+-              elif [ "${CLOCKMODE}" = "ARC" ]; then
+-                      ARC=true
+-              fi
+-      fi
+-
+-      if grep "system serial" /proc/cpuinfo 2>/dev/null | grep -q MILO 2>/dev/null ; then
+-              ARC=true
+-      fi
+-
+-      CLOCKDEF=""
+-      CLOCKFLAGS="--hctosys"
+-
+-      if is_yes "$UTC" ; then
+-              CLOCKFLAGS="$CLOCKFLAGS --utc"
+-              CLOCKDEF="$CLOCKDEF (utc)"
+-      else
+-              CLOCKFLAGS="$CLOCKFLAGS --localtime"
+-              CLOCKDEF="$CLOCKDEF (local)"
+-      fi
+-
+-      if is_yes "$ARC" ; then
+-              CLOCKFLAGS="$CLOCKFLAGS -A"
+-              CLOCKDEF="$CLOCKDEF (arc)"
+-      fi
+-
+-      if is_yes "$SRM" ; then
+-              CLOCKFLAGS="$CLOCKFLAGS -S"
+-              CLOCKDEF="$CLOCKDEF (srm)"
+-      fi
+-
+       # Check if timezone definition is available
+-      if [ -e /etc/localtime -a -e /dev/rtc ] ; then
+-              if run_cmd "$(nls 'Setting clock')$CLOCKDEF" hwclock $CLOCKFLAGS; then
++      if [ -e /etc/localtime ] && [ -e /dev/rtc -o -e /dev/rtc0 ] ; then
++              if run_cmd "$(nls 'Setting clock')" hwclock --hctosys; then
+                       show "$(nls 'Today`s date:') $(LC_CTYPE=C date)"; ok
+               fi
+       else
+@@ -918,8 +877,8 @@
+       fi
+ 
+       # Set the clock if timezone definition wasn't available (eg. /usr not mounted)
+-      if is_yes "$TIME_SETUP_DELAYED" && [ -e /dev/rtc ]; then
+-              if run_cmd "$(nls 'Setting clock')$CLOCKDEF" hwclock $CLOCKFLAGS; then
++      if is_yes "$TIME_SETUP_DELAYED" && [ -e /dev/rtc -o -e /dev/rtc0 ]; then
++              if run_cmd "$(nls 'Setting clock')" hwclock --hctosys; then
+                       show "$(nls 'Today`s date:') $(LC_CTYPE=C date)"; ok
+               fi
+       fi
+Index: sysconfig/Makefile.am
+===================================================================
+--- sysconfig/Makefile.am      (wersja 12087)
++++ sysconfig/Makefile.am      (kopia robocza)
+@@ -5,7 +5,6 @@
+ sysconfigdir = @sysconfigdir@
+ 
+ sysconfig_DATA = \
+-      clock \
+       init-colors \
+       hwprof \
+       system \
+Index: sysconfig/clock
+===================================================================
+--- sysconfig/clock    (wersja 12087)
++++ sysconfig/clock    (kopia robocza)
+@@ -1,8 +0,0 @@
+-# $Id$
+-# Should the hardware clock be kept in Coordinated Universal Time
+-# (instead of local time).
+-UTC=true
+-# true means your machine uses epoch 1980 in its hardware clock
+-ARC=false
+-# true means your machine uses epoch 1900 in its hardware clock
+-SRM=false

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 4ebce44d5a8831d340538de09318c12e5d3db12f..2a925cd3bf85ba1aef1173fb0c77cd4e05effb90 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -9,11 +9,12 @@ Summary(pl.UTF-8):    inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):     inittab ve /etc/rc.d dosyaları
 Name:          rc-scripts
 Version:       0.4.3.8
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Base
 Source0:       ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 # Source0-md5: 52305571d87f83d453007189a9a4f42f
+Patch0:                %{name}-svn.patch
 URL:           http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -108,6 +109,7 @@ programcıklar içerir.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %{__aclocal}
@@ -334,7 +336,6 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/inittab
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysctl.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/clock
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cpusets/cpuset-test
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/hwprof
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/i18n