[Lunar-commits] glibc, timezone-data: Resolve conflict between files installed.

[Moritz Heiber]

commit 397abc8fca058d677437d22037db5ee9d586f2f8
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Mon Dec 10 19:59:24 2007 +0100

    glibc, timezone-data: Resolve conflict between files installed.
    
    Resolving a conflict between timezone-data and glibc. Timezone-data was
    never actually needed. It had just been added to overcome our very old
    glibc and its very old timezone definitions. Unfortunately, glibc has to be
    recompiled in order to cope with the changes. Sorry for that.
---
 libs/glibc/DETAILS            |    2 +-
 utils/timezone-data/BUILD     |    7 -------
 utils/timezone-data/DETAILS   |   22 ----------------------
 utils/timezone-data/PRE_BUILD |    7 -------
 4 files changed, 1 insertions(+), 37 deletions(-)

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 3a097db..7513034 100644
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -10,7 +10,7 @@
      SOURCE2_VFY=sha1:2338cc9b5795f5e97a19aac6d7d00ab750e81ac3
         WEB_SITE=http://www.gnu.org/software/libc
          ENTERED=20010922
-         UPDATED=20071118
+         UPDATED=20071210
            PSAFE=no
            SHORT="C library for use with GNU/Hurd and GNU/Linux."
 cat << EOF
diff --git a/utils/timezone-data/BUILD b/utils/timezone-data/BUILD
deleted file mode 100644
index 2a413d2..0000000
--- a/utils/timezone-data/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-
-  patch_it  $SOURCE3  1  &&
-  default_make           &&
-  gather_docs Theory *.htm *.jpg
-
-) > $C_FIFO 2>&1 
diff --git a/utils/timezone-data/DETAILS b/utils/timezone-data/DETAILS
deleted file mode 100644
index 71362ad..0000000
--- a/utils/timezone-data/DETAILS
+++ /dev/null
@@ -1,22 +0,0 @@
-          MODULE=timezone-data
-         VERSION=2007h
-    DATA_VERSION=$VERSION
-    CODE_VERSION=$VERSION
-          SOURCE=tzdata${DATA_VERSION}.tar.gz
-         SOURCE2=tzcode${CODE_VERSION}.tar.gz
-         SOURCE3=$MODULE-2007c-makefile.patch
-      SOURCE_URL=$MIRROR_URL
-     SOURCE2_URL=$MIRROR_URL
-     SOURCE3_URL=$PATCH_URL
-      SOURCE_VFY=sha1:be408cd5c058a526922ee4bb94ee9595e465ea6d
-     SOURCE2_VFY=sha1:d04c6be80aa846d6927169b240b426d00dc6f8d9
-     SOURCE3_VFY=sha1:9f3234708c0baa44d5aeb132871cb473d37f9dbe
-        WEB_SITE=ftp://elsie.nci.nih.gov/pub/
-         ENTERED=20070203
-         UPDATED=20071019
-           SHORT="timezone data and utilities"
-
-cat << EOF
-timezone-data contains the timezone data (/usr/share/zoneinfo/*) and
-various timezone related utilities (tzselect/zic/zdump).
-EOF
diff --git a/utils/timezone-data/PRE_BUILD b/utils/timezone-data/PRE_BUILD
deleted file mode 100644
index 90782d7..0000000
--- a/utils/timezone-data/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-validate_source_dir  $SOURCE_DIRECTORY  &&
-mk_source_dir        $SOURCE_DIRECTORY  &&
-cp $SOURCE_CACHE/$SOURCE  $SOURCE_DIRECTORY/  &&
-cp $SOURCE_CACHE/$SOURCE2 $SOURCE_DIRECTORY/  &&
-cd $SOURCE_DIRECTORY  &&
-unpack $SOURCE        &&
-unpack $SOURCE2