[WebCalendar/f14/master] * Fri Oct 8 2010 Patrick Monnerat <pm at datasphere.ch> 1.2.3-1 - New upstream version (bugfix release
Patrick Monnerat
monnerat at fedoraproject.org
Fri Oct 8 15:56:53 UTC 2010
commit 4975b137d5b2e595c0384726a19e3a63c29b0d17
Author: Patrick Monnerat <pm at datasphere.ch>
Date: Fri Oct 8 17:56:25 2010 +0200
* Fri Oct 8 2010 Patrick Monnerat <pm at datasphere.ch> 1.2.3-1
- New upstream version (bugfix release).
.gitignore | 5 ++
WebCalendar-1.2.0-extmenu.patch | 3 +-
...rcase.patch => WebCalendar-1.2.3-usercase.patch | 56 ++++++++++----------
WebCalendar.spec | 9 ++-
sources | 4 +-
5 files changed, 43 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3d20df0..6077857 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
WebCalendar-1.2.1-clean.tar.gz
WebCalendar-1.2.0-newmenuicons.tar.gz
WebCalendarUserManual-0.9.43.tar.gz
+/WebCalendar-1.2.3-clean.tar.gz
+/WebCalendar-1.2.0-newmenuicons.tar.gz
+/WebCalendarUserManual-0.9.43.tar.gz
+/WebCalendar-http.conf
+/WebCalendar-taglang.php
diff --git a/WebCalendar-1.2.0-extmenu.patch b/WebCalendar-1.2.0-extmenu.patch
index 7a2f70c..7fad8e3 100644
--- a/WebCalendar-1.2.0-extmenu.patch
+++ b/WebCalendar-1.2.0-extmenu.patch
@@ -28,8 +28,7 @@ diff -Naur WebCalendar-1.2.0.orig/includes/init.php WebCalendar-1.2.0.new/includ
diff -Naur WebCalendar-1.2.0.orig/includes/menu/index.php WebCalendar-1.2.0.new/includes/menu/index.php
--- WebCalendar-1.2.0.orig/includes/menu/index.php 2008-07-02 02:49:03.000000000 +0200
+++ WebCalendar-1.2.0.new/includes/menu/index.php 2009-06-10 19:20:57.000000000 +0200
-@@ -2,6 +2,7 @@
- /* $Id: WebCalendar-1.2.0-extmenu.patch,v 1.1 2010/07/05 13:17:16 monnerat Exp $
+@@ -3,6 +3,7 @@
*
* This menu was created using some fantastic free tools out on the internet:
+ * http://jscook.yuanheng.org/JSCookMenu/MenuBuilder.html
diff --git a/WebCalendar-1.2.1-usercase.patch b/WebCalendar-1.2.3-usercase.patch
similarity index 75%
rename from WebCalendar-1.2.1-usercase.patch
rename to WebCalendar-1.2.3-usercase.patch
index 762c8e0..7ca29f9 100644
--- a/WebCalendar-1.2.1-usercase.patch
+++ b/WebCalendar-1.2.3-usercase.patch
@@ -1,6 +1,6 @@
-diff -Naur WebCalendar-1.2.1.orig/includes/classes/WebCalendar.class WebCalendar-1.2.1.new/includes/classes/WebCalendar.class
---- WebCalendar-1.2.1.orig/includes/classes/WebCalendar.class 2010-05-07 19:24:50.000000000 +0200
-+++ WebCalendar-1.2.1.new/includes/classes/WebCalendar.class 2010-05-07 19:27:24.000000000 +0200
+diff -Naur WebCalendar-1.2.3.orig/includes/classes/WebCalendar.class WebCalendar-1.2.3.new/includes/classes/WebCalendar.class
+--- WebCalendar-1.2.3.orig/includes/classes/WebCalendar.class 2010-10-08 15:16:09.000000000 +0200
++++ WebCalendar-1.2.3.new/includes/classes/WebCalendar.class 2010-10-08 15:17:44.000000000 +0200
@@ -143,7 +143,8 @@
*/
function _initInitSecondPhase () {
@@ -45,10 +45,10 @@ diff -Naur WebCalendar-1.2.1.orig/includes/classes/WebCalendar.class WebCalendar
}
/* Initializations from includes/connect.php.
-diff -Naur WebCalendar-1.2.1.orig/includes/config.php WebCalendar-1.2.1.new/includes/config.php
---- WebCalendar-1.2.1.orig/includes/config.php 2010-04-09 15:47:49.000000000 +0200
-+++ WebCalendar-1.2.1.new/includes/config.php 2010-05-07 19:27:24.000000000 +0200
-@@ -92,9 +92,10 @@
+diff -Naur WebCalendar-1.2.3.orig/includes/config.php WebCalendar-1.2.3.new/includes/config.php
+--- WebCalendar-1.2.3.orig/includes/config.php 2010-08-15 20:54:34.000000000 +0200
++++ WebCalendar-1.2.3.new/includes/config.php 2010-10-08 15:17:44.000000000 +0200
+@@ -104,9 +104,10 @@
function do_config ( $fileLoc ) {
global $db_database, $db_host, $db_login, $db_password, $db_persistent,
@@ -60,9 +60,9 @@ diff -Naur WebCalendar-1.2.1.orig/includes/config.php WebCalendar-1.2.1.new/incl
+ $settings, $single_user, $single_user_login, $TROUBLE_URL, $use_http_auth,
+ $user_inc;
- $PROGRAM_VERSION = 'v1.2.1';
- $PROGRAM_DATE = '09 Apr 2010';
-@@ -220,6 +221,11 @@
+ $PROGRAM_VERSION = 'v1.2.3';
+ $PROGRAM_DATE = '14 Aug 2010';
+@@ -232,6 +233,11 @@
$use_http_auth = ( preg_match ( '/(1|yes|true|on)/i',
$settings['use_http_auth'] ) ? true : false );
@@ -74,9 +74,9 @@ diff -Naur WebCalendar-1.2.1.orig/includes/config.php WebCalendar-1.2.1.new/incl
// Type of user authentication.
$user_inc = $settings['user_inc'];
-diff -Naur WebCalendar-1.2.1.orig/includes/settings.php.orig WebCalendar-1.2.1.new/includes/settings.php.orig
---- WebCalendar-1.2.1.orig/includes/settings.php.orig 2010-04-06 16:29:09.000000000 +0200
-+++ WebCalendar-1.2.1.new/includes/settings.php.orig 2010-05-07 19:27:24.000000000 +0200
+diff -Naur WebCalendar-1.2.3.orig/includes/settings.php.orig WebCalendar-1.2.3.new/includes/settings.php.orig
+--- WebCalendar-1.2.3.orig/includes/settings.php.orig 2007-09-28 15:19:45.000000000 +0200
++++ WebCalendar-1.2.3.new/includes/settings.php.orig 2010-10-08 15:17:44.000000000 +0200
@@ -71,5 +71,10 @@
# need to modify user-ldap.php to configure some settings.
user_inc: user.php
@@ -88,9 +88,9 @@ diff -Naur WebCalendar-1.2.1.orig/includes/settings.php.orig WebCalendar-1.2.1.n
+
# end */
?>
-diff -Naur WebCalendar-1.2.1.orig/install/index.php WebCalendar-1.2.1.new/install/index.php
---- WebCalendar-1.2.1.orig/install/index.php 2010-05-07 19:24:50.000000000 +0200
-+++ WebCalendar-1.2.1.new/install/index.php 2010-05-07 19:27:24.000000000 +0200
+diff -Naur WebCalendar-1.2.3.orig/install/index.php WebCalendar-1.2.3.new/install/index.php
+--- WebCalendar-1.2.3.orig/install/index.php 2010-10-08 15:16:09.000000000 +0200
++++ WebCalendar-1.2.3.new/install/index.php 2010-10-08 15:17:44.000000000 +0200
@@ -660,6 +660,7 @@
$settings['install_password'] = '';
$settings['single_user_login'] = '';
@@ -107,7 +107,7 @@ diff -Naur WebCalendar-1.2.1.orig/install/index.php WebCalendar-1.2.1.new/instal
$settings['readonly'] = getPostValue ( 'form_readonly' );
$settings['mode'] = getPostValue ( 'form_mode' );
if ( getPostValue ( 'form_user_inc' ) == 'http' ) {
-@@ -835,8 +837,10 @@
+@@ -836,8 +838,10 @@
}
if ( form.form_user_inc.options[listid].selected ) {
makeVisible ( "singleuser" );
@@ -118,7 +118,7 @@ diff -Naur WebCalendar-1.2.1.orig/install/index.php WebCalendar-1.2.1.new/instal
}
}
-@@ -1495,6 +1499,16 @@
+@@ -1496,6 +1500,16 @@
<td>
<input name="form_single_user_login" size="20" value="<?php echo ( empty ( $settings['single_user_login'] ) ? '' : $settings['single_user_login'] );?>" /></td>
</tr>
@@ -135,9 +135,9 @@ diff -Naur WebCalendar-1.2.1.orig/install/index.php WebCalendar-1.2.1.new/instal
<tr>
<td class="prompt"><?php etranslate ( 'Read-Only' ) ?>:</td>
<td>
-diff -Naur WebCalendar-1.2.1.orig/tools/send_reminders.php WebCalendar-1.2.1.new/tools/send_reminders.php
---- WebCalendar-1.2.1.orig/tools/send_reminders.php 2010-05-07 19:24:50.000000000 +0200
-+++ WebCalendar-1.2.1.new/tools/send_reminders.php 2010-05-07 19:27:24.000000000 +0200
+diff -Naur WebCalendar-1.2.3.orig/tools/send_reminders.php WebCalendar-1.2.3.new/tools/send_reminders.php
+--- WebCalendar-1.2.3.orig/tools/send_reminders.php 2010-10-08 15:16:09.000000000 +0200
++++ WebCalendar-1.2.3.new/tools/send_reminders.php 2010-10-08 15:17:44.000000000 +0200
@@ -103,6 +103,10 @@
for ( $i = 0; $i < $allusercnt; $i++ ) {
$names[$allusers[$i]['cal_login']] = $allusers[$i]['cal_fullname'];
@@ -172,10 +172,10 @@ diff -Naur WebCalendar-1.2.1.orig/tools/send_reminders.php WebCalendar-1.2.1.new
$percentage[$row[0]] = $row[1];
}
}
-diff -Naur WebCalendar-1.2.1.orig/translations/English-US.txt WebCalendar-1.2.1.new/translations/English-US.txt
---- WebCalendar-1.2.1.orig/translations/English-US.txt 2010-05-07 19:24:50.000000000 +0200
-+++ WebCalendar-1.2.1.new/translations/English-US.txt 2010-05-07 19:27:24.000000000 +0200
-@@ -1846,6 +1846,7 @@
+diff -Naur WebCalendar-1.2.3.orig/translations/English-US.txt WebCalendar-1.2.3.new/translations/English-US.txt
+--- WebCalendar-1.2.3.orig/translations/English-US.txt 2010-10-08 15:16:09.000000000 +0200
++++ WebCalendar-1.2.3.new/translations/English-US.txt 2010-10-08 15:17:44.000000000 +0200
+@@ -1844,6 +1844,7 @@
Web Server (detected): Web Server (detected)
Web Server (not detected): Web Server (not detected)
None (Single-User): None (Single-User)
@@ -183,9 +183,9 @@ diff -Naur WebCalendar-1.2.1.orig/translations/English-US.txt WebCalendar-1.2.1.
Read-Only: Read-Only
Environment: Environment
Production: Production
-diff -Naur WebCalendar-1.2.1.orig/translations/French.txt WebCalendar-1.2.1.new/translations/French.txt
---- WebCalendar-1.2.1.orig/translations/French.txt 2010-05-07 19:24:50.000000000 +0200
-+++ WebCalendar-1.2.1.new/translations/French.txt 2010-05-07 19:27:24.000000000 +0200
+diff -Naur WebCalendar-1.2.3.orig/translations/French.txt WebCalendar-1.2.3.new/translations/French.txt
+--- WebCalendar-1.2.3.orig/translations/French.txt 2010-10-08 15:16:09.000000000 +0200
++++ WebCalendar-1.2.3.new/translations/French.txt 2010-10-08 15:17:44.000000000 +0200
@@ -1794,6 +1794,7 @@
Web Server (detected): =
Web Server (not detected): =
diff --git a/WebCalendar.spec b/WebCalendar.spec
index a2cfa72..8238dd5 100644
--- a/WebCalendar.spec
+++ b/WebCalendar.spec
@@ -12,14 +12,14 @@
# tar czf WebCalendar-%{version}-clean.tar.gz WebCalendar-%{version}/
#
# Upstream tarball MD5 sum:
-# f349ad32a09a76db0526fb27016842fe WebCalendar-1.2.1.tar.gz
+# c1dc4772e2d0d64d1e08f7dd236ec5f4 WebCalendar-1.2.3.tar.gz
#
# Source tarball WebCalendar-1.2.0-newmenuicons.tar.gz is Fedora-
# specific and thus, has no "upstream".
Name: WebCalendar
Summary: Single/multi-user web-based calendar application
-Version: 1.2.1
+Version: 1.2.3
Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
@@ -40,7 +40,7 @@ Patch9: WebCalendar-1.2.0-eventstatus.patch
Patch10: WebCalendar-1.2.0-php53.patch
Patch11: WebCalendar-1.2.0-daylightbug.patch
Patch12: WebCalendar-1.2.0-viewothers.patch
-Patch13: WebCalendar-1.2.1-usercase.patch
+Patch13: WebCalendar-1.2.3-usercase.patch
URL: http://www.k5n.us/webcalendar.php
Requires: webserver
Requires: php >= 4.1.0
@@ -242,6 +242,9 @@ rm -rf "${RPM_BUILD_ROOT}"
%changelog
#-------------------------------------------------------------------------------
+* Fri Oct 8 2010 Patrick Monnerat <pm at datasphere.ch> 1.2.3-1
+- New upstream version (bugfix release).
+
* Wed Jul 7 2010 Patrick Monnerat <pm at datasphere.ch> 1.2.1-1
- New upstream version.
- Patch "php53" to get rid of PHP 5.3 deprecated features.
diff --git a/sources b/sources
index 7a9cfea..318f279 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,5 @@
-05175c2eb7143033ad31a1e0a806c27f WebCalendar-1.2.1-clean.tar.gz
+24abd68064ecf044bfabff0e4aa4f43a WebCalendar-1.2.3-clean.tar.gz
c746b936b582c04f69b6052c8c4be2f8 WebCalendar-1.2.0-newmenuicons.tar.gz
ef48b67a09af50404167c66856cc724d WebCalendarUserManual-0.9.43.tar.gz
+d10cef8fbd0e4a4acae2d393122da07b WebCalendar-http.conf
+9d4d438b872f288a152a28fe63857127 WebCalendar-taglang.php
More information about the scm-commits
mailing list