[SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (150227012760c3d8eae3837ae5e8da2c0b375939)

Bor Kraljič scm at sourcemage.org
Sat Aug 20 02:35:50 EDT 2011


GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor at ver.si>:

 devel/check/BUILD             |    4 ----
 devel/check/HISTORY           |    3 +++
 disk/lvm/DETAILS              |    4 ++--
 disk/lvm/HISTORY              |    3 +++
 gnome2-apps/gucharmap/DEPENDS |    2 +-
 gnome2-apps/gucharmap/HISTORY |    3 +++
 kde4-apps/amarok2/DEPENDS     |    2 +-
 kde4-apps/amarok2/HISTORY     |    3 +++
 net/rrdtool/DEPENDS           |    2 +-
 net/rrdtool/HISTORY           |    3 +++
 net/samba/BUILD               |    1 -
 net/samba/HISTORY             |    3 +++
 php-pear/php/DETAILS          |   16 ++++++++--------
 php-pear/php/HISTORY          |    3 +++
 14 files changed, 34 insertions(+), 18 deletions(-)

New commits:
commit af4aec3e951dc2fbe042e74f19bf5f35227bc415
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    lvm 2.02.88

commit e5a8783b7de41d07ed273e7037642fdb22aeffd2
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    amarok2: typo in DEPENDS fixed

commit 70453a2c002518cf7f091ad229b06d8aa8edf6d1
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    samba: removed unrecognized options (issue #30)

commit 8e344163c8bacbbdd492754ba8d96aaa4da35aaf
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    rrdtool: fixed unrecognized options (issue #30)

commit 9477c2e3f05ea91c99c457869d523da85de0e7e0
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    gucharmap: fixed typo (issue #30)

commit b5c1cf2e3e963f2dacafcc9455e43d89ab840f92
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    check: removed BUILD, it only contained unrecognized configure option (issue #30)

commit 368c96485f6b9864e0b3650a7ec0831411308384
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    php 5.3.7, SECURITY_PATCH=13

diff --git a/devel/check/BUILD b/devel/check/BUILD
deleted file mode 100755
index 4ee8541..0000000
--- a/devel/check/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-# make it not append version info to its doc dir so we end up with only one
-# check dir in /usr/share/doc
-OPTS="--enable-plain-docdir $OPTS"  &&
-default_build
diff --git a/devel/check/HISTORY b/devel/check/HISTORY
index b94a0a9..5d6b230 100644
--- a/devel/check/HISTORY
+++ b/devel/check/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor at ver.si>
+	* BUILD: removed, it only contained unrecognized configure option (issue #30)
+
 2009-10-22 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.9.8
 
diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index 35b707f..d87a8a2 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,10 +1,10 @@
            SPELL=lvm
-         VERSION=2.02.87
+         VERSION=2.02.88
           SOURCE=LVM2.$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
    SOURCE_URL[0]=ftp://sources.redhat.com/pub/lvm2/$SOURCE
    SOURCE_URL[1]=ftp://sources.redhat.com/pub/lvm2/old/$SOURCE
-     SOURCE_HASH=sha512:dd41d834550a18ed9cd8e62fa4ade76937e6e6d6572fe7b9fd7eaac7369f24100bb4b86f562c6b018f246f2d54a839ceb3d8532d4706e48d15cdd0956e001250
+     SOURCE_HASH=sha512:5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b
         WEB_SITE=http://sources.redhat.com/lvm2/
          ENTERED=20010922
       LICENSE[0]=GPL
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index c0df616..04b5485 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.02.88
+
 2011-08-12 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.02.87
 
diff --git a/gnome2-apps/gucharmap/DEPENDS b/gnome2-apps/gucharmap/DEPENDS
index dfa5031..62dd35b 100755
--- a/gnome2-apps/gucharmap/DEPENDS
+++ b/gnome2-apps/gucharmap/DEPENDS
@@ -9,7 +9,7 @@ optional_depends gobject-introspection             \
 
 optional_depends gtk-doc                           \
                  "--enable-gtk-doc"                \
-                 "--disable-gtk-doc --disable--gtk-doc-html" \
+                 "--disable-gtk-doc --disable-gtk-doc-html" \
                  "to build documentation"  &&
 
 if is_depends_enabled $SPELL gtk-doc; then
diff --git a/gnome2-apps/gucharmap/HISTORY b/gnome2-apps/gucharmap/HISTORY
index d05a3e9..b4b55d2 100644
--- a/gnome2-apps/gucharmap/HISTORY
+++ b/gnome2-apps/gucharmap/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS: fixed typo (issue #30)
+
 2010-11-15 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.32.1
 
diff --git a/kde4-apps/amarok2/DEPENDS b/kde4-apps/amarok2/DEPENDS
index ee892f4..0ce928f 100755
--- a/kde4-apps/amarok2/DEPENDS
+++ b/kde4-apps/amarok2/DEPENDS
@@ -7,7 +7,7 @@ depends taglib-extras &&
 depends -sub STL qt4  &&
 depends -sub EMBEDDED MYSQL &&
 depends qtscriptgenerator &&
-optional_depends qjsone         "" "" &&
+optional_depends qjson          "" "" &&
 optional_depends faac           '' '' 'for M4A/AAC/MP4 tag support'        &&
 optional_depends libvisual      '' '' 'to use libvisual plugins'           &&
 optional_depends gstreamer      '' '' 'GStreamer support'                  &&
diff --git a/kde4-apps/amarok2/HISTORY b/kde4-apps/amarok2/HISTORY
index d39759e..39d8ed4 100644
--- a/kde4-apps/amarok2/HISTORY
+++ b/kde4-apps/amarok2/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: typo fixed
+
 2011-08-19 Bor Kraljič <pyrobor at ver.si>
 	* DEPENDS: added optional dependency on qjson
 
diff --git a/net/rrdtool/DEPENDS b/net/rrdtool/DEPENDS
index 6943271..394e878 100755
--- a/net/rrdtool/DEPENDS
+++ b/net/rrdtool/DEPENDS
@@ -31,6 +31,6 @@ optional_depends RUBY \
                  "for Ruby modules" &&
 
 optional_depends tcl \
-                 "--enable-tcl-site" \
+                 "--enable-tcl" \
                  "--disable-tcl" \
                  "for Tcl modules"
diff --git a/net/rrdtool/HISTORY b/net/rrdtool/HISTORY
index 0e0a93c..3253ee8 100644
--- a/net/rrdtool/HISTORY
+++ b/net/rrdtool/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS: fixed unrecognized options (issue #30)
+
 2010-08-20 Mark Bainter <mbainter at sourcemage.org>
 	* DEPENDS: Added missing dependency on intltool
 
diff --git a/net/samba/BUILD b/net/samba/BUILD
index a7f3992..24d8bd7 100755
--- a/net/samba/BUILD
+++ b/net/samba/BUILD
@@ -1,5 +1,4 @@
 OPTS="--with-swatdir=/usr/share/swat  \
-      --with-smbmount                 \
       --with-fhs                      \
       --with-automount                \
       --with-winbind                  \
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 72a5717..4e0f1a2 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor at ver.si>
+	* BUILD: removed unrecognized options (issue #30)
+
 2011-08-05 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.5.11
 
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 37a8971..2dcb692 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,8 +1,8 @@
            SPELL=php
 if [[ $PHP5_BRANCH == stable ]]; then
-         VERSION=5.3.6
-  SECURITY_PATCH=12
-     SOURCE_HASH=sha512:deb24febcd3b19787a26953229ecd67d1f4b57314c31a8a11ae9d8dfe142b8ae9ccfadf333ff21c30e1f8b7c9b22c484d2da55fd826d07b9a2093ef9bbac9ec9
+         VERSION=5.3.7
+  SECURITY_PATCH=13
+     SOURCE_HASH=sha512:235c124abb2be9b1b8c6855d3ba5739ce9a49ab0419b1c5f4febedf3e0192d6ab56e7a087bb8cc41cbbc55803d0f886916952c61d8327f146bf2a664f33ebbf1
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
    if [[ $PHP5_SUHOSIN == y ]]; then
@@ -15,8 +15,8 @@ if [[ $PHP5_BRANCH == stable ]]; then
      SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
    fi
 elif [[ $PHP5_BRANCH == alpha ]]; then
-         VERSION=5.3.6
-     SOURCE_HASH=sha512:deb24febcd3b19787a26953229ecd67d1f4b57314c31a8a11ae9d8dfe142b8ae9ccfadf333ff21c30e1f8b7c9b22c484d2da55fd826d07b9a2093ef9bbac9ec9
+         VERSION=5.3.7
+     SOURCE_HASH=sha512:235c124abb2be9b1b8c6855d3ba5739ce9a49ab0419b1c5f4febedf3e0192d6ab56e7a087bb8cc41cbbc55803d0f886916952c61d8327f146bf2a664f33ebbf1
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
 elif [[ $PHP5_BRANCH == legacy ]]; then
@@ -34,9 +34,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
      SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
   fi
 else
-         VERSION=5.3.6
-  SECURITY_PATCH=12
-     SOURCE_HASH=sha512:deb24febcd3b19787a26953229ecd67d1f4b57314c31a8a11ae9d8dfe142b8ae9ccfadf333ff21c30e1f8b7c9b22c484d2da55fd826d07b9a2093ef9bbac9ec9
+         VERSION=5.3.7
+  SECURITY_PATCH=13
+     SOURCE_HASH=sha512:235c124abb2be9b1b8c6855d3ba5739ce9a49ab0419b1c5f4febedf3e0192d6ab56e7a087bb8cc41cbbc55803d0f886916952c61d8327f146bf2a664f33ebbf1
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
 fi
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 0201766..23d967c 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 5.3.7, SECURITY_PATCH=13
+
 2011-08-11 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS, CONFIGURE: corrected apache flags; moved 'none' SAPI selector
 	  to a proper place; fixed dependencies for internal gd


More information about the SM-Commit mailing list