[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b059f165fe0d10056221295015aa6d2974435429)

Treeve Jelbert scm at sourcemage.org
Sat May 9 04:27:31 EDT 2009


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 kde4/kdepim4/DETAILS   |    2 +-
 kde4/kdepim4/HISTORY   |    5 +++++
 net/socat/DETAILS      |    4 ++--
 net/socat/HISTORY      |    3 +++
 utils/sphinx/DEPENDS   |    1 +
 utils/sphinx/DETAILS   |    4 ++--
 utils/sphinx/HISTORY   |    5 +++++
 utils/sphinx/PRE_BUILD |    2 ++
 8 files changed, 21 insertions(+), 5 deletions(-)

New commits:
commit b059f165fe0d10056221295015aa6d2974435429
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdepim4 - update sha512

commit 43a35d6c38c5d342b1cc1ecca13ea7a4965d5e73
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    sphinx: => 0.9.9-rc2

commit 94abb615ebe83baceb4a14ba981ec39d1e12549c
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    socat: => 1.7.1.1

diff --git a/kde4/kdepim4/DETAILS b/kde4/kdepim4/DETAILS
index 3ff5d32..f01db28 100755
--- a/kde4/kdepim4/DETAILS
+++ b/kde4/kdepim4/DETAILS
@@ -16,7 +16,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
          VERSION=4.2.85
-     SOURCE_HASH=sha512:1a7ef9f9f1abff4850ad4f645db202eec6c784b54551c58b29553253784181e34b98cada6a6d49ed7a5d7771f68214bf520bc22bb4017f2efd4a657b8d515901
+     SOURCE_HASH=sha512:ea6e3cf5dd918a3f083bb19f7182fee63f945c1b59e4c312560c7445daa91fec87532aa1a2cb85bce38a80e4055bac8b6421f05f6472e48cbb9607a1cded556c
   else 
          VERSION=4.2.3
      SOURCE_HASH=sha512:2095b994a3f53532dc0f6083e5a62fc63325e6a964d54125cfbe04af09c84990332ea3b5fd47b5247309c71c39bfaf487634163c0e6b903a71fbcb6ab268107c
diff --git a/kde4/kdepim4/HISTORY b/kde4/kdepim4/HISTORY
index 7d47a77..5cc10d4 100644
--- a/kde4/kdepim4/HISTORY
+++ b/kde4/kdepim4/HISTORY
@@ -1,3 +1,8 @@
+2009-05-09 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 4.2.85 - update sha512
+	  there are some significant changes regarding collab
+	* PRE_BUILD: deleted
+
 2009-05-07 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.2.85 (unstable)
 	* PRE_BUILD: fix required version of KdepimLibs
diff --git a/net/socat/DETAILS b/net/socat/DETAILS
index 004e659..3b987d4 100755
--- a/net/socat/DETAILS
+++ b/net/socat/DETAILS
@@ -1,6 +1,6 @@
            SPELL=socat
-         VERSION=1.7.1.0
-     SOURCE_HASH=sha512:78ab2e700fd57737134c105c1af7d512e563ad6df95275166ba91464a28a46f3b996c7a9543195a4750f9b4e7fc7c6dd8218e8ec3fa482e13a97f3d73195596a
+         VERSION=1.7.1.1
+     SOURCE_HASH=sha512:bf741a50c29f43afb76830c72f1059e38008fcca137090b01b4ac975a45d97acabc9b7e0d39aff37a199052285ad6559dc3550d0e829f346bb504ad57a85b78a
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.dest-unreach.org/socat/download/$SOURCE
diff --git a/net/socat/HISTORY b/net/socat/HISTORY
index 7ffb9ec..aa322d8 100644
--- a/net/socat/HISTORY
+++ b/net/socat/HISTORY
@@ -1,3 +1,6 @@
+2009-05-08 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.7.1.1
+
 2009-04-04 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.7.1.0
 
diff --git a/utils/sphinx/DEPENDS b/utils/sphinx/DEPENDS
index d36d493..875fdce 100755
--- a/utils/sphinx/DEPENDS
+++ b/utils/sphinx/DEPENDS
@@ -3,6 +3,7 @@ optional_depends expat      '' '' 'XML parser' &&
 optional_depends firebird   '--with-firebird --with-firebird-includes=/usr/include --with-firebird-libs=/usr/lib'  \
                             '--without-firebird' \
                             'Firebird database' &&
+optional_depends ODBC-MGR   '--with-unixodbc'  '--without-unixodbc' 'ODBC data access' &&
 optional_depends mysql      '--with-mysql'     '--without-mysql'    'MySQL database'    &&
 optional_depends postgresql '--with-pgsql'     '--without-pgsql'    'PostgreSQL database' 
 
diff --git a/utils/sphinx/DETAILS b/utils/sphinx/DETAILS
index 5ad3cec..10bab49 100755
--- a/utils/sphinx/DETAILS
+++ b/utils/sphinx/DETAILS
@@ -1,6 +1,6 @@
            SPELL=sphinx
-         VERSION=0.9.8.1
-     SOURCE_HASH=sha512:dc2c2b1c85fe59ca03584fc25e8803bbd8bfb22a9f7e959474c9a09f2a2f50f36f45c168fd730c7d9e92f006cab3d67a0e433f490aa61c277729d2789be5f4e5
+         VERSION=0.9.9-rc2
+     SOURCE_HASH=sha512:8783f157c6f87b018c0c638bde36c4153700b6f5c8f10894acdbacf20b8788b1c3b77a3d38c37b25fc4d4901b5ca5d52e063cffa7ef670e6fe5c761903b669dd
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://sphinxsearch.com
diff --git a/utils/sphinx/HISTORY b/utils/sphinx/HISTORY
index e2aabb4..547c477 100644
--- a/utils/sphinx/HISTORY
+++ b/utils/sphinx/HISTORY
@@ -1,3 +1,8 @@
+2009-05-08 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.9.9-rc2
+	* DEPENDS: add option ODBC-MGR
+	* PRE_BUILD: only apply firebird patch is actually needed
+
 2008-11-08 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.9.8.1
 	* firebird.patch.bz2: added, for firebird support
diff --git a/utils/sphinx/PRE_BUILD b/utils/sphinx/PRE_BUILD
index c3e1f32..3f7f7a3 100755
--- a/utils/sphinx/PRE_BUILD
+++ b/utils/sphinx/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
+if is_depends_enabled $SPELL firebird;then
 # add support for firebird
 bzcat $SPELL_DIRECTORY/firebird.patch.bz2 | patch -p1  &&
 # and regenerate the config files
 autoreconf
+fi



More information about the SM-Commit mailing list