summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2008-02-09 11:25:38 -0800
committerEric Sandall2008-02-09 11:25:38 -0800
commit0cdc93194e4b89ff58e7630c7d7bff64048c5e6f (patch)
tree8d5b389e7fd0924a027919a06344ffb2c8c109f5
parentf24d9219cfb1694322c0b7e0d23173a5bdfa7506 (diff)
Revert "coreutils provides mktemp [Bug 14271]"
This reverts commit 25dd1e78c0e573edb761ce4b1f1c420536130eb0. Reverting coreutils update for this stable release cycle
-rw-r--r--ChangeLog3
-rwxr-xr-xutils/coreutils/CONFLICTS1
-rwxr-xr-xutils/coreutils/DETAILS1
-rw-r--r--utils/coreutils/HISTORY3
4 files changed, 0 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 232b5295ab..44f5b9ca87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,3 @@
-2008-02-03 Ladislav Hagara <hgr@vabo.cz>
- * utils/mktemp: deprecated in favour of coreutils [Bug 14271]
-
2008-02-03 Treeve Jelbert <treeve@sourcemage.org>
* devel/falcon: new spell, general purpose untyped scripting language
diff --git a/utils/coreutils/CONFLICTS b/utils/coreutils/CONFLICTS
deleted file mode 100755
index 26e7dbb54b..0000000000
--- a/utils/coreutils/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts mktemp y
diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index 0dd376ba31..8ed6b0e49b 100755
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -1,6 +1,5 @@
SPELL=coreutils
VERSION=6.10
- PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 4323ff6a40..a7a7aaacfa 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,9 +1,6 @@
2008-02-03 Ladislav Hagara <hgr@vabo.cz>
* DEPENDS: removed linux-pam [Bug 14270]
* TRIGGERS: removed
- * DETAILS: mktemp is provided by coreutils not by mktemp [Bug 14271]
- PATCHLEVEL=1
- * CONFLICTS: conflicts mktemp y
2008-01-30 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DEPENDS: no longer needs util-linux for kill