[WebCalendar] * Wed Mar 28 2012 Patrick Monnerat <pm at datasphere.ch> 1.2.5-1 - New upstream release.

[Patrick Monnerat]

commit a9d6fd0f927c84874b79d269caae3f4e6ec4f15b
Author: Patrick Monnerat <pm at datasphere.ch>
Date:   Wed Mar 28 16:23:49 2012 +0200

    * Wed Mar 28 2012 Patrick Monnerat <pm at datasphere.ch> 1.2.5-1
    - New upstream release.

 .gitignore                           |    1 +
 WebCalendar-1.2.4-cve2011_3814.patch |  133 ----------------------------------
 WebCalendar-1.2.4-cve2012_0846.patch |   70 ------------------
 WebCalendar.spec                     |   18 ++---
 sources                              |    2 +-
 5 files changed, 10 insertions(+), 214 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b03f6f..9b89189 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ WebCalendarUserManual-0.9.43.tar.gz
 /WebCalendar-http.conf
 /WebCalendar-taglang.php
 /WebCalendar-1.2.4-clean.tar.gz
+/WebCalendar-1.2.5-clean.tar.gz
diff --git a/WebCalendar.spec b/WebCalendar.spec
index f8d2a2a..34df84a 100644
--- a/WebCalendar.spec
+++ b/WebCalendar.spec
@@ -12,15 +12,15 @@
 # tar czf WebCalendar-%{version}-clean.tar.gz WebCalendar-%{version}/
 #
 #	Upstream tarball MD5 sum:
-#		337e784a932b8963911fffb83b9d28f7  WebCalendar-1.2.4.tar.gz
+#		965877c6344ef7dbc2e34ce80c24aee3  WebCalendar-1.2.5.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.4
-Release:	3%{?dist}
+Version:	1.2.5
+Release:	1%{?dist}
 License:	GPLv2
 Group:		Applications/Internet
 Source0:	WebCalendar-%{version}-clean.tar.gz
@@ -41,12 +41,10 @@ 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.4-usercase.patch
+Patch14:	WebCalendar-1.2.5-usercase.patch
 Patch15:	WebCalendar-1.2.3-authsettings.patch
 Patch16:	WebCalendar-1.2.3-etp.patch
 Patch17:	WebCalendar-1.2.3-canadd.patch
-Patch18:	WebCalendar-1.2.4-cve2011_3814.patch
-Patch19:	WebCalendar-1.2.4-cve2012_0846.patch
 URL:		http://www.k5n.us/webcalendar.php
 Requires:	webserver
 Requires:	php >= 4.1.0
@@ -117,8 +115,6 @@ rm -rf includes/classes/captcha
 %patch15 -p 1
 %patch16 -p 1
 %patch17 -p 1
-%patch18 -p 1
-%patch19 -p 1
 
 
 #-------------------------------------------------------------------------------
@@ -147,7 +143,7 @@ rm -rf "${RPM_BUILD_ROOT}"
 
 install -d -m 755 "${RPM_BUILD_ROOT}/%{basepath}"
 
-for DIR in docs icons images includes install themes tools translations ws
+for DIR in docs icons images includes install themes tools translations
 do	cp -a "${DIR}" "${RPM_BUILD_ROOT}/%{basepath}/${DIR}"
 done
 
@@ -189,7 +185,6 @@ find "${RPM_BUILD_ROOT}%{basepath}/tools" -type f -name '*.pl' -print0	|
 #	Java control panel is not (yet) operational.
 
 rm -f "${RPM_BUILD_ROOT}%{basepath}/controlpanel.php"
-rm -f "${RPM_BUILD_ROOT}%{basepath}/ws/webcalendar.jar"
 
 #	Process the configuration files.
 
@@ -264,6 +259,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 %changelog
 #-------------------------------------------------------------------------------
 
+* Wed Mar 28 2012 Patrick Monnerat <pm at datasphere.ch> 1.2.5-1
+- New upstream release.
+
 * Fri Feb 17 2012 Patrick Monnerat <pm at datasphere.ch> 1.2.4-3
 - Patch "cve2012_0846" fixes CVE-2012-0846 and some other XSS vulnerabilities.
   http://sourceforge.net/tracker/?func=detail&aid=3472745&group_id=3870&atid=103870
diff --git a/sources b/sources
index 36d2875..cf6b59a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-3653f846dffaa4f61a3121a1e867b81b  WebCalendar-1.2.4-clean.tar.gz
+eee0f65aaf13c3f1a208cbb4636bf5f9  WebCalendar-1.2.5-clean.tar.gz
 c746b936b582c04f69b6052c8c4be2f8  WebCalendar-1.2.0-newmenuicons.tar.gz
 ef48b67a09af50404167c66856cc724d  WebCalendarUserManual-0.9.43.tar.gz