New commits:
commit 61ccb2a699621430723f3c725512a50bbfab5eab
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
commit b92a92162a89fc8e7d7928a082be3ca3090435d0
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
commit 288f6a01cd8fad6ab5679b3df2508b0002301711
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
yafc: fixing bug 13587
(cherry picked from commit 0e0350b70b539edfc574156f72ae69da7c6f4599)
commit fff3b74dede67e2aa332a223ff2fc63314dddae9
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
init.d: fixed kernel version checking in DEPENDS that erroneously caused
udev-old to be pulled in as dependency in some cases
(cherry picked from commit c096a4f91a4de3bb07ce858fa95a629fd8db2546)
Conflicts:
smgl/init.d/HISTORY
commit fec74f468bb68dbc7f2c75406fe61d4a1098af25
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
shadow: fixing bug 13600, pam_unix_auth.so is replaced by pam_unix.so
(cherry picked from commit 1cacf5cbe4a6705b2c10b0a5a8e616965e12323f)
diff --git a/e/edje_viewer/DETAILS b/e/edje_viewer/DETAILS
index 0ba95fc..0716250 100755
--- a/e/edje_viewer/DETAILS
+++ b/e/edje_viewer/DETAILS
@@ -1,4 +1,5 @@
SPELL=edje_viewer
+ PATCHLEVEL=1
if [ "$EDJE_VIEWER_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
@@ -6,7 +7,7 @@ else
fi
SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.enlightenment.org:/var/cvs/e:e17/proto/$SPELL
+
SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.enlightenment.org:/var/cvs/e:e17/apps/$SPELL
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
WEB_SITE=http://enlightenment.org/
diff --git a/e/edje_viewer/HISTORY b/e/edje_viewer/HISTORY
index 5e46a1d..3cba83c 100644
--- a/e/edje_viewer/HISTORY
+++ b/e/edje_viewer/HISTORY
@@ -1,3 +1,8 @@
+2007-03-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: SOURCE_URL's fix, e17/proto -> e17/apps [Bug 13586]
+ PATCHLEVEL=1
+ * PRE_BUILD: sources from old SOURCE_URL must be removed
+
2006-06-20 Ladislav Hagara <hgr AT vabo.cz>
* *: created this spell
diff --git a/e/edje_viewer/PRE_BUILD b/e/edje_viewer/PRE_BUILD
index 534a7d3..7de6369 100755
--- a/e/edje_viewer/PRE_BUILD
+++ b/e/edje_viewer/PRE_BUILD
@@ -1,3 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+
+if grep proto CVS/Repository > /dev/null; then
+message "${PROBLEM_COLOR}SOURCE_URL of $SPELL has been changed.
+Please remove old /var/spool/sorcery/$SPELL-cvs.tar.bz2${DEFAULT_COLOR}" &&
+return 1
+fi &&
+
NOCONFIGURE=ON ./autogen.sh
diff --git a/e/estickies/DETAILS b/e/estickies/DETAILS
index b91e2ea..3192fb1 100755
--- a/e/estickies/DETAILS
+++ b/e/estickies/DETAILS
@@ -1,4 +1,5 @@
SPELL=estickies
+ PATCHLEVEL=1
if [ "$ESTICKIES_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
@@ -6,7 +7,7 @@ else
fi
SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.enlightenment.org:/var/cvs/e:e17/proto/$SPELL
+
SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.enlightenment.org:/var/cvs/e:e17/apps/$SPELL
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
WEB_SITE=http://enlightenment.org/
diff --git a/e/estickies/HISTORY b/e/estickies/HISTORY
index bdc9da0..749e5dd 100644
--- a/e/estickies/HISTORY
+++ b/e/estickies/HISTORY
@@ -1,3 +1,8 @@
+2007-03-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: SOURCE_URL's fix, e17/proto -> e17/apps [Bug 13584]
+ PATCHLEVEL=1
+ * PRE_BUILD: sources from old SOURCE_URL must be removed
+
2006-08-02 Ladislav Hagara <hgr AT vabo.cz>
* *: created this spell
diff --git a/e/estickies/PRE_BUILD b/e/estickies/PRE_BUILD
index 534a7d3..7de6369 100755
--- a/e/estickies/PRE_BUILD
+++ b/e/estickies/PRE_BUILD
@@ -1,3 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+
+if grep proto CVS/Repository > /dev/null; then
+message "${PROBLEM_COLOR}SOURCE_URL of $SPELL has been changed.
+Please remove old /var/spool/sorcery/$SPELL-cvs.tar.bz2${DEFAULT_COLOR}" &&
+return 1
+fi &&
+
NOCONFIGURE=ON ./autogen.sh
diff --git a/ftp/yafc/BUILD b/ftp/yafc/BUILD
index 3bfea15..c94a3a4 100755
--- a/ftp/yafc/BUILD
+++ b/ftp/yafc/BUILD
@@ -2,4 +2,5 @@ aclocal -I cf &&
autoheader &&
autoconf &&
automake --add-missing --gnu &&
+OPTS="--without-krb5 $OPTS" &&
default_build
diff --git a/ftp/yafc/HISTORY b/ftp/yafc/HISTORY
index 16f5e7a..cddc2b1 100644
--- a/ftp/yafc/HISTORY
+++ b/ftp/yafc/HISTORY
@@ -1,3 +1,6 @@
+2007-03-04 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * BUILD: removed krb5 support because of bug 13587
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.