[WebCalendar/f19] * Tue Jul 23 2013 Patrick Monnerat <pm at datasphere.ch> 1.2.7-1 - New upstream release.
Patrick Monnerat
monnerat at fedoraproject.org
Tue Jul 23 14:01:43 UTC 2013
commit caff9869e30b80357561923f2e180a1ab3f8e208
Author: Patrick Monnerat <pm at datasphere.ch>
Date: Tue Jul 23 16:00:41 2013 +0200
* Tue Jul 23 2013 Patrick Monnerat <pm at datasphere.ch> 1.2.7-1
- New upstream release.
.gitignore | 1 +
...rcase.patch => WebCalendar-1.2.7-usercase.patch | 80 ++++++++++----------
WebCalendar.spec | 15 ++--
sources | 2 +-
4 files changed, 51 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b89189..d205d28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ WebCalendarUserManual-0.9.43.tar.gz
/WebCalendar-taglang.php
/WebCalendar-1.2.4-clean.tar.gz
/WebCalendar-1.2.5-clean.tar.gz
+/WebCalendar-1.2.7-clean.tar.gz
diff --git a/WebCalendar-1.2.5-usercase.patch b/WebCalendar-1.2.7-usercase.patch
similarity index 61%
rename from WebCalendar-1.2.5-usercase.patch
rename to WebCalendar-1.2.7-usercase.patch
index 45e2534..9342b32 100644
--- a/WebCalendar-1.2.5-usercase.patch
+++ b/WebCalendar-1.2.7-usercase.patch
@@ -1,7 +1,7 @@
-diff -Naur WebCalendar-1.2.5.orig/includes/classes/WebCalendar.class WebCalendar-1.2.5.new/includes/classes/WebCalendar.class
---- WebCalendar-1.2.5.orig/includes/classes/WebCalendar.class 2012-03-28 15:05:15.534347414 +0200
-+++ WebCalendar-1.2.5.new/includes/classes/WebCalendar.class 2012-03-28 15:09:17.852660755 +0200
-@@ -152,7 +152,7 @@
+diff -Naurp WebCalendar-1.2.7.orig/includes/classes/WebCalendar.class WebCalendar-1.2.7.new/includes/classes/WebCalendar.class
+--- WebCalendar-1.2.7.orig/includes/classes/WebCalendar.class 2013-07-23 15:23:59.426776877 +0200
++++ WebCalendar-1.2.7.new/includes/classes/WebCalendar.class 2013-07-23 15:22:54.467269609 +0200
+@@ -152,7 +152,7 @@ class WebCalendar {
load_global_settings ();
$this->setLanguage ();
@@ -10,7 +10,7 @@ diff -Naur WebCalendar-1.2.5.orig/includes/classes/WebCalendar.class WebCalendar
if ( empty ( $ovrd ) )
load_user_preferences ();
-@@ -572,6 +572,9 @@
+@@ -572,6 +572,9 @@ class WebCalendar {
}
}
}
@@ -20,10 +20,10 @@ diff -Naur WebCalendar-1.2.5.orig/includes/classes/WebCalendar.class WebCalendar
}
/* Initializations from includes/connect.php.
-diff -Naur WebCalendar-1.2.5.orig/includes/config.php WebCalendar-1.2.5.new/includes/config.php
---- WebCalendar-1.2.5.orig/includes/config.php 2012-02-29 02:12:22.000000000 +0100
-+++ WebCalendar-1.2.5.new/includes/config.php 2012-03-28 15:09:17.852660756 +0200
-@@ -104,9 +104,10 @@
+diff -Naurp WebCalendar-1.2.7.orig/includes/config.php WebCalendar-1.2.7.new/includes/config.php
+--- WebCalendar-1.2.7.orig/includes/config.php 2013-02-22 16:56:47.000000000 +0100
++++ WebCalendar-1.2.7.new/includes/config.php 2013-07-23 15:22:54.468269617 +0200
+@@ -104,9 +104,10 @@ function get_full_include_path ( $filena
function do_config ( $fileLoc ) {
global $db_database, $db_host, $db_login, $db_password, $db_persistent,
@@ -35,9 +35,9 @@ diff -Naur WebCalendar-1.2.5.orig/includes/config.php WebCalendar-1.2.5.new/incl
+ $settings, $single_user, $single_user_login, $TROUBLE_URL, $use_http_auth,
+ $user_inc;
- $PROGRAM_VERSION = 'v1.2.5';
- $PROGRAM_DATE = '29 Feb 2012';
-@@ -232,6 +233,11 @@
+ $PROGRAM_VERSION = 'v1.2.7';
+ $PROGRAM_DATE = '22 Feb 2013';
+@@ -232,6 +233,11 @@ function do_config ( $fileLoc ) {
$use_http_auth = ( preg_match ( '/(1|yes|true|on)/i',
$settings['use_http_auth'] ) ? true : false );
@@ -49,10 +49,10 @@ diff -Naur WebCalendar-1.2.5.orig/includes/config.php WebCalendar-1.2.5.new/incl
// Type of user authentication.
$user_inc = $settings['user_inc'];
-diff -Naur WebCalendar-1.2.5.orig/includes/functions.php WebCalendar-1.2.5.new/includes/functions.php
---- WebCalendar-1.2.5.orig/includes/functions.php 2012-03-28 15:05:15.536347327 +0200
-+++ WebCalendar-1.2.5.new/includes/functions.php 2012-03-28 15:09:17.854660665 +0200
-@@ -6162,4 +6162,19 @@
+diff -Naurp WebCalendar-1.2.7.orig/includes/functions.php WebCalendar-1.2.7.new/includes/functions.php
+--- WebCalendar-1.2.7.orig/includes/functions.php 2013-07-23 15:23:59.427776885 +0200
++++ WebCalendar-1.2.7.new/includes/functions.php 2013-07-23 15:22:54.469269624 +0200
+@@ -6164,4 +6164,19 @@ function require_valide_referring_url ()
}
}
@@ -72,10 +72,10 @@ diff -Naur WebCalendar-1.2.5.orig/includes/functions.php WebCalendar-1.2.5.new/i
+}
+
?>
-diff -Naur WebCalendar-1.2.5.orig/includes/settings.php.orig WebCalendar-1.2.5.new/includes/settings.php.orig
---- WebCalendar-1.2.5.orig/includes/settings.php.orig 2007-09-28 15:19:45.000000000 +0200
-+++ WebCalendar-1.2.5.new/includes/settings.php.orig 2012-03-28 15:09:17.854660665 +0200
-@@ -71,5 +71,10 @@
+diff -Naurp WebCalendar-1.2.7.orig/includes/settings.php.orig WebCalendar-1.2.7.new/includes/settings.php.orig
+--- WebCalendar-1.2.7.orig/includes/settings.php.orig 2007-09-28 15:19:45.000000000 +0200
++++ WebCalendar-1.2.7.new/includes/settings.php.orig 2013-07-23 15:22:54.469269624 +0200
+@@ -71,5 +71,10 @@ use_http_auth: false
# need to modify user-ldap.php to configure some settings.
user_inc: user.php
@@ -86,10 +86,10 @@ diff -Naur WebCalendar-1.2.5.orig/includes/settings.php.orig WebCalendar-1.2.5.n
+
# end */
?>
-diff -Naur WebCalendar-1.2.5.orig/install/index.php WebCalendar-1.2.5.new/install/index.php
---- WebCalendar-1.2.5.orig/install/index.php 2012-03-28 15:05:15.525347812 +0200
-+++ WebCalendar-1.2.5.new/install/index.php 2012-03-28 15:09:17.855660621 +0200
-@@ -660,6 +660,7 @@
+diff -Naurp WebCalendar-1.2.7.orig/install/index.php WebCalendar-1.2.7.new/install/index.php
+--- WebCalendar-1.2.7.orig/install/index.php 2013-07-23 15:23:59.421776838 +0200
++++ WebCalendar-1.2.7.new/install/index.php 2013-07-23 15:22:54.469269624 +0200
+@@ -661,6 +661,7 @@ if ( empty ( $x ) ) {
$settings['install_password'] = '';
$settings['single_user_login'] = '';
$settings['use_http_auth'] = 'false';
@@ -97,7 +97,7 @@ diff -Naur WebCalendar-1.2.5.orig/install/index.php WebCalendar-1.2.5.new/instal
$settings['single_user'] = 'false';
$settings['mode'] = 'prod';
}
-@@ -688,6 +689,7 @@
+@@ -689,6 +690,7 @@ if ( empty ( $x ) ) {
$y = getPostValue ( 'app_settings' );
if ( ! empty ( $y ) ) {
$settings['single_user_login'] = getPostValue ( 'form_single_user_login' );
@@ -105,7 +105,7 @@ diff -Naur WebCalendar-1.2.5.orig/install/index.php WebCalendar-1.2.5.new/instal
$settings['readonly'] = getPostValue ( 'form_readonly' );
if ( getPostValue ( 'form_user_inc' ) == 'http' ) {
$settings['use_http_auth'] = 'true';
-@@ -846,8 +848,10 @@
+@@ -847,8 +849,10 @@ function auth_handler () {
}
if ( form.form_user_inc.options[listid].selected ) {
makeVisible ( "singleuser" );
@@ -116,7 +116,7 @@ diff -Naur WebCalendar-1.2.5.orig/install/index.php WebCalendar-1.2.5.new/instal
}
}
-@@ -1506,6 +1510,16 @@
+@@ -1507,6 +1511,16 @@ translate ( 'You should select Web Serve
<td>
<input name="form_single_user_login" size="20" value="<?php echo ( empty ( $settings['single_user_login'] ) ? '' : $settings['single_user_login'] );?>" /></td>
</tr>
@@ -133,10 +133,10 @@ diff -Naur WebCalendar-1.2.5.orig/install/index.php WebCalendar-1.2.5.new/instal
<tr>
<td class="prompt"><?php etranslate ( 'Read-Only' ) ?>:</td>
<td>
-diff -Naur WebCalendar-1.2.5.orig/tools/send_reminders.php WebCalendar-1.2.5.new/tools/send_reminders.php
---- WebCalendar-1.2.5.orig/tools/send_reminders.php 2011-04-27 02:27:35.000000000 +0200
-+++ WebCalendar-1.2.5.new/tools/send_reminders.php 2012-03-28 15:09:17.855660621 +0200
-@@ -101,7 +101,7 @@
+diff -Naurp WebCalendar-1.2.7.orig/tools/send_reminders.php WebCalendar-1.2.7.new/tools/send_reminders.php
+--- WebCalendar-1.2.7.orig/tools/send_reminders.php 2011-04-27 02:27:35.000000000 +0200
++++ WebCalendar-1.2.7.new/tools/send_reminders.php 2013-07-23 15:22:54.470269632 +0200
+@@ -101,7 +101,7 @@ if ( $debug )
$allusers = user_get_users ();
$allusercnt = count ( $allusers );
for ( $i = 0; $i < $allusercnt; $i++ ) {
@@ -145,7 +145,7 @@ diff -Naur WebCalendar-1.2.5.orig/tools/send_reminders.php WebCalendar-1.2.5.new
$emails[$allusers[$i]['cal_login']] = $allusers[$i]['cal_email'];
}
-@@ -271,7 +271,7 @@
+@@ -271,7 +271,7 @@ function send_reminder ( $id, $event_dat
if ( $res ) {
while ( $row = dbi_fetch_row ( $res ) ) {
@@ -154,10 +154,10 @@ diff -Naur WebCalendar-1.2.5.orig/tools/send_reminders.php WebCalendar-1.2.5.new
$percentage[$row[0]] = $row[1];
}
}
-diff -Naur WebCalendar-1.2.5.orig/translations/English-US.txt WebCalendar-1.2.5.new/translations/English-US.txt
---- WebCalendar-1.2.5.orig/translations/English-US.txt 2012-03-28 15:05:15.497349046 +0200
-+++ WebCalendar-1.2.5.new/translations/English-US.txt 2012-03-28 15:09:17.856660577 +0200
-@@ -1843,6 +1843,7 @@
+diff -Naurp WebCalendar-1.2.7.orig/translations/English-US.txt WebCalendar-1.2.7.new/translations/English-US.txt
+--- WebCalendar-1.2.7.orig/translations/English-US.txt 2013-07-23 15:23:59.406776720 +0200
++++ WebCalendar-1.2.7.new/translations/English-US.txt 2013-07-23 15:22:54.470269632 +0200
+@@ -1843,6 +1843,7 @@ Web Server: Web Server
Web Server (detected): Web Server (detected)
Web Server (not detected): Web Server (not detected)
None (Single-User): None (Single-User)
@@ -165,10 +165,10 @@ diff -Naur WebCalendar-1.2.5.orig/translations/English-US.txt WebCalendar-1.2.5.
Read-Only: Read-Only
Environment: Environment
Production: Production
-diff -Naur WebCalendar-1.2.5.orig/translations/French.txt WebCalendar-1.2.5.new/translations/French.txt
---- WebCalendar-1.2.5.orig/translations/French.txt 2012-03-28 15:05:15.507348605 +0200
-+++ WebCalendar-1.2.5.new/translations/French.txt 2012-03-28 15:09:17.856660577 +0200
-@@ -1794,6 +1794,7 @@
+diff -Naurp WebCalendar-1.2.7.orig/translations/French.txt WebCalendar-1.2.7.new/translations/French.txt
+--- WebCalendar-1.2.7.orig/translations/French.txt 2013-07-23 15:23:59.415776791 +0200
++++ WebCalendar-1.2.7.new/translations/French.txt 2013-07-23 15:22:54.471269640 +0200
+@@ -1794,6 +1794,7 @@ Web Server: =
Web Server (detected): =
Web Server (not detected): =
None (Single-User): =
diff --git a/WebCalendar.spec b/WebCalendar.spec
index 504fd11..775dc84 100644
--- a/WebCalendar.spec
+++ b/WebCalendar.spec
@@ -12,15 +12,15 @@
# tar czf WebCalendar-%{version}-clean.tar.gz WebCalendar-%{version}/
#
# Upstream tarball MD5 sum:
-# 965877c6344ef7dbc2e34ce80c24aee3 WebCalendar-1.2.5.tar.gz
+# dbf85b8057e3b60be00dde81b82b7d06 WebCalendar-1.2.7.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.5
-Release: 4%{?dist}
+Version: 1.2.7
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
Source0: WebCalendar-%{version}-clean.tar.gz
@@ -41,7 +41,7 @@ Patch10: WebCalendar-1.2.4-php53.patch
Patch11: WebCalendar-1.2.0-daylightbug.patch
Patch12: WebCalendar-1.2.0-viewothers.patch
Patch13: WebCalendar-1.2.3-nonuser.patch
-Patch14: WebCalendar-1.2.5-usercase.patch
+Patch14: WebCalendar-1.2.7-usercase.patch
Patch15: WebCalendar-1.2.3-authsettings.patch
Patch16: WebCalendar-1.2.3-etp.patch
Patch17: WebCalendar-1.2.3-canadd.patch
@@ -257,14 +257,17 @@ rm -rf "${RPM_BUILD_ROOT}"
#-------------------------------------------------------------------------------
%changelog
+#-------------------------------------------------------------------------------
+
+* Tue Jul 23 2013 Patrick Monnerat <pm at datasphere.ch> 1.2.7-1
+- New upstream release.
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-#-------------------------------------------------------------------------------
-
* Tue Apr 24 2012 Patrick Monnerat <pm at datasphere.ch> 1.2.5-2
- Apache configuration file migrated to version 2.4. A specific version
requirement cannot be introduced in this spec file since "Provides:webserver"
diff --git a/sources b/sources
index cf6b59a..21729fa 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-eee0f65aaf13c3f1a208cbb4636bf5f9 WebCalendar-1.2.5-clean.tar.gz
+fa22512fcaeb6ff888ff3da0002d2fcd WebCalendar-1.2.7-clean.tar.gz
c746b936b582c04f69b6052c8c4be2f8 WebCalendar-1.2.0-newmenuicons.tar.gz
ef48b67a09af50404167c66856cc724d WebCalendarUserManual-0.9.43.tar.gz
More information about the scm-commits
mailing list