OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 23-Aug-2009 10:13:07
Branch: HEAD Handle: 2009082309130700
Modified files:
openpkg-src/drupal-module-misc
drupal-module-misc.patch drupal-module-misc.spec
Log:
modifying package: drupal-module-misc-6.x 20090821 -> 20090823
Summary:
Revision Changes Path
1.2 +0 -38
openpkg-src/drupal-module-misc/drupal-module-misc.patch
1.45 +2 -2
openpkg-src/drupal-module-misc/drupal-module-misc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal-module-misc/drupal-module-misc.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 drupal-module-misc.patch
--- openpkg-src/drupal-module-misc/drupal-module-misc.patch 8 Jun 2009
17:28:25 -0000 1.1
+++ openpkg-src/drupal-module-misc/drupal-module-misc.patch 23 Aug 2009
08:13:07 -0000 1.2
@@ -280,41 +280,3 @@
break;
}
------------------------------------------------------------------------------
-
-No need in SWF player if no according media selected.
-http://drupal.org/node/437618http://drupal.org/node/437618
-
-Index: sites/all/modules/shadowbox/shadowbox.module
---- sites/all/modules/shadowbox/shadowbox.module.orig 2009-02-10
18:08:54 +0100
-+++ sites/all/modules/shadowbox/shadowbox.module 2009-05-11 22:23:03
+0200
-@@ -450,6 +450,7 @@
- * Validate admin settings form inputs.
- */
- function shadowbox_global_settings_validate($form, &$form_state) {
-+ $flv_formats =
array_values($form_state['values']['shadowbox_supported_flv']);
- $flv_player = $form_state['values']['shadowbox_flv_player'];
- $color = $form_state['values']['shadowbox_overlay_color'];
- $opacity = $form_state['values']['shadowbox_overlay_opacity'];
-@@ -462,13 +463,15 @@
- $initial_width = $form_state['values']['shadowbox_initial_width'];
- $counter_limit = $form_state['values']['shadowbox_counter_limit'];
-
-- if (!preg_match('!^([a-z0-9_\-\.]+/)*[a-z0-9_\-]+\.swf$!i', $flv_player))
{
-- form_set_error('shadowbox_flv_player', t('You must enter a valid path
to an SWF Flash Player in the form <code>flvplayer.swf</code>.'));
-+ if( sizeof(array_intersect($flv_formats, shadowbox_get_types('flv'))) !=
0){
-+ if (!preg_match('!^([a-z0-9_\-\.]+/)*[a-z0-9_\-]+\.swf$!i',
$flv_player)) {
-+ form_set_error('shadowbox_flv_player', t('You must enter a valid path
to an SWF Flash Player in the form <code>flvplayer.swf</code>.'));
-+ }
-+ elseif (!file_exists($flv_player)) {
-+ form_set_error('shadowbox_flv_player', t('The FLV player does not
exist.'));
-+ }
- }
-- elseif (!file_exists($flv_player)) {
-- form_set_error('shadowbox_flv_player', t('The FLV player does not
exist.'));
-- }
--
-+
- if (!is_numeric($resize_duration) || $resize_duration < 0 ||
$resize_duration > 10) {
- form_set_error('shadowbox_resize_duration', t('You must enter a number
between 0 and 10.'));
- }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/drupal-module-misc/drupal-module-misc.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 drupal-module-misc.spec
--- openpkg-src/drupal-module-misc/drupal-module-misc.spec 21 Aug 2009
06:57:15 -0000 1.44
+++ openpkg-src/drupal-module-misc/drupal-module-misc.spec 23 Aug 2009
08:13:07 -0000 1.45
@@ -145,7 +145,7 @@
%define V_module_search404 6.x-1.7
%define V_module_sections 6.x-1.2
%define V_module_services 6.x-0.13
-%define V_module_shadowbox 6.x-2.1
+%define V_module_shadowbox 6.x-3.0
%define V_module_shoutbox 6.x-1.0
%define V_module_simplefeed 6.x-1.x-dev
%define V_module_slideshow_creator 6.x-1.32
@@ -214,7 +214,7 @@
Group: CMS
License: GPL
Version: %{V_drupal}
-Release: 20090821
+Release: 20090823
# list of sources
Source0: http://ftp.drupal.org/files/projects/acl-%{V_module_acl}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
