rpms/zsnes/F-15 zsnes-1.51-psr.patch, NONE, 1.1 zsnes.spec, 1.8, 1.9 zsnes-1.51-parsegen.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/zsnes/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10152
Modified Files:
zsnes.spec
Added Files:
zsnes-1.51-psr.patch
Removed Files:
zsnes-1.51-parsegen.patch
Log Message:
* Sun Sep 18 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-10
- used a patch by Ralf Corsepius to fix issues with parsegen
zsnes-1.51-psr.patch:
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE zsnes-1.51-psr.patch ---
diff -Naur zsnes_1_51/src/Makefile.in zsnes_1_51.hacked/src/Makefile.in
--- zsnes_1_51/src/Makefile.in 2007-01-24 21:54:12.000000000 +0100
+++ zsnes_1_51.hacked/src/Makefile.in 2011-09-05 04:35:09.297967796 +0200
@@ -94,8 +94,8 @@
@CC@ @CFLAGS@ -o $@ -c $<
%.o: %.cpp
@CXX@ @CXXFLAGS@ -o $@ -c $<
-%.o %.h: %.psr $(PSR)
- ./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
+%.c %.h: %.psr $(PSR)
+ ./$(PSR) @PSRFLAGS@ -cheader $*.h -fname $* $*.c $<
default: main
all: main tools
Index: zsnes.spec
===================================================================
RCS file: /cvs/free/rpms/zsnes/F-15/zsnes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zsnes.spec 4 Sep 2011 18:12:23 -0000 1.8
+++ zsnes.spec 18 Sep 2011 17:38:54 -0000 1.9
@@ -4,7 +4,7 @@
Summary: A Super Nintendo emulator
Name: zsnes
Version: 1.51
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.zsnes.com/
@@ -17,8 +17,8 @@
Patch3: zsnes-1.51-gcc43.patch
# Upstream CVS
Patch4: zsnes-1.51-pulseaudio.patch
-# Hans de Goede
-Patch5: zsnes-1.51-parsegen.patch
+# Ralf Corsepius
+Patch5: zsnes-1.51-psr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is to build only for ix86 on plague
#ExclusiveArch: %{ix86}
@@ -128,6 +128,9 @@
%doc ../docs/readme.htm/ ../docs/readme.txt/
%changelog
+* Sun Sep 18 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-10
+- used a patch by Ralf Corsepius to fix issues with parsegen
+
* Sun Sep 04 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-9
- fixed FTBFS with gcc 4.6.0 using a patch made by Hans De Goede
- removed package name from summary
--- zsnes-1.51-parsegen.patch DELETED ---
13 years, 2 months
rpms/zsnes/devel zsnes-1.51-psr.patch, NONE, 1.1 zsnes.spec, 1.8, 1.9 zsnes-1.51-parsegen.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/zsnes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9786
Modified Files:
zsnes.spec
Added Files:
zsnes-1.51-psr.patch
Removed Files:
zsnes-1.51-parsegen.patch
Log Message:
* Sun Sep 18 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-10
- used a patch by Ralf Corsepius to fix issues with parsegen
zsnes-1.51-psr.patch:
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE zsnes-1.51-psr.patch ---
diff -Naur zsnes_1_51/src/Makefile.in zsnes_1_51.hacked/src/Makefile.in
--- zsnes_1_51/src/Makefile.in 2007-01-24 21:54:12.000000000 +0100
+++ zsnes_1_51.hacked/src/Makefile.in 2011-09-05 04:35:09.297967796 +0200
@@ -94,8 +94,8 @@
@CC@ @CFLAGS@ -o $@ -c $<
%.o: %.cpp
@CXX@ @CXXFLAGS@ -o $@ -c $<
-%.o %.h: %.psr $(PSR)
- ./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
+%.c %.h: %.psr $(PSR)
+ ./$(PSR) @PSRFLAGS@ -cheader $*.h -fname $* $*.c $<
default: main
all: main tools
Index: zsnes.spec
===================================================================
RCS file: /cvs/free/rpms/zsnes/devel/zsnes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zsnes.spec 4 Sep 2011 18:11:31 -0000 1.8
+++ zsnes.spec 18 Sep 2011 17:37:24 -0000 1.9
@@ -4,7 +4,7 @@
Summary: A Super Nintendo emulator
Name: zsnes
Version: 1.51
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.zsnes.com/
@@ -17,8 +17,8 @@
Patch3: zsnes-1.51-gcc43.patch
# Upstream CVS
Patch4: zsnes-1.51-pulseaudio.patch
-# Hans de Goede
-Patch5: zsnes-1.51-parsegen.patch
+# Ralf Corsepius
+Patch5: zsnes-1.51-psr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is to build only for ix86 on plague
#ExclusiveArch: %{ix86}
@@ -128,6 +128,9 @@
%doc ../docs/readme.htm/ ../docs/readme.txt/
%changelog
+* Sun Sep 18 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-10
+- used a patch by Ralf Corsepius to fix issues with parsegen
+
* Sun Sep 04 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-9
- fixed FTBFS with gcc 4.6.0 using a patch made by Hans De Goede
- removed package name from summary
--- zsnes-1.51-parsegen.patch DELETED ---
13 years, 2 months
rpms/z-push/F-15 z-push-1.5.5-package.patch, NONE, 1.1 z-push-1.5.5-zarafa.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 z-push.spec, 1.2, 1.3 z-push-1.5.2-package.patch, 1.1, NONE z-push-1.5.2-zarafa.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11656/F-15
Modified Files:
.cvsignore sources z-push.spec
Added Files:
z-push-1.5.5-package.patch z-push-1.5.5-zarafa.patch
Removed Files:
z-push-1.5.2-package.patch z-push-1.5.2-zarafa.patch
Log Message:
Upgrade to 1.5.5
z-push-1.5.5-package.patch:
config.php | 20 +++++---------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 15 insertions(+), 16 deletions(-)
--- NEW FILE z-push-1.5.5-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.5, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.5/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.5/debug.php.package 2011-09-18 03:00:36.000000000 +0200
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.5/config.php 2011-03-18 20:22:53.000000000 +0100
+++ z-push-1.5.5/config.php.package 2011-09-18 03:02:16.000000000 +0200
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -91,16 +89,8 @@
// SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
- // The data providers that we are using (see configuration below)
- $BACKEND_PROVIDER = "BackendICS";
-
- // ************************
- // BackendICS settings
- // ************************
-
- // Defines the server to which we want to connect
- define('MAPI_SERVER', 'file:///var/run/zarafa');
-
+ // The data provider that we are using
+ $BACKEND_PROVIDER = "BackendIMAP";
// ************************
// BackendIMAP settings
--- z-push-1.5.5/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.5/index.php.package 2011-09-18 03:06:31.000000000 +0200
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
z-push-1.5.5-zarafa.patch:
config.php | 45 ++++-----------------------------------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 14 insertions(+), 42 deletions(-)
--- NEW FILE z-push-1.5.5-zarafa.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.5, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.5/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.5/debug.php.zarafa 2011-09-18 03:13:32.000000000 +0200
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/zarafa-z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.5/config.php 2011-03-18 20:22:53.000000000 +0100
+++ z-push-1.5.5/config.php.zarafa 2011-09-18 03:17:00.000000000 +0200
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/zarafa-z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -91,7 +89,7 @@
// SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
- // The data providers that we are using (see configuration below)
+ // The data provider that we are using
$BACKEND_PROVIDER = "BackendICS";
// ************************
@@ -102,41 +100,6 @@
define('MAPI_SERVER', 'file:///var/run/zarafa');
- // ************************
- // BackendIMAP settings
- // ************************
-
- // Defines the server to which we want to connect
- // recommended to use local servers only
- define('IMAP_SERVER', 'localhost');
- // connecting to default port (143)
- define('IMAP_PORT', 143);
- // best cross-platform compatibility (see http://php.net/imap_open for options)
- define('IMAP_OPTIONS', '/notls/norsh');
- // overwrite the "from" header if it isn't set when sending emails
- // options: 'username' - the username will be set (usefull if your login is equal to your emailaddress)
- // 'domain' - the value of the "domain" field is used
- // '@mydomain.com' - the username is used and the given string will be appended
- define('IMAP_DEFAULTFROM', '');
- // copy outgoing mail to this folder. If not set z-push will try the default folders
- define('IMAP_SENTFOLDER', '');
- // forward messages inline (default off - as attachment)
- define('IMAP_INLINE_FORWARD', false);
- // use imap_mail() to send emails (default) - off uses mail()
- define('IMAP_USE_IMAPMAIL', true);
-
-
- // ************************
- // BackendMaildir settings
- // ************************
- define('MAILDIR_BASE', '/tmp');
- define('MAILDIR_SUBDIR', 'Maildir');
-
- // **********************
- // BackendVCDir settings
- // **********************
- define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf');
-
// Alternative backend to perform SEARCH requests (GAL search)
// if an empty value is used, the default search functionality of the main backend is used
// use 'SearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
--- z-push-1.5.5/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.5/index.php.zarafa 2011-09-18 03:15:15.000000000 +0200
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/F-15/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Jul 2011 22:14:55 -0000 1.3
+++ .cvsignore 18 Sep 2011 01:27:12 -0000 1.4
@@ -1,2 +1,2 @@
-z-push-1.5.4-707.tar.gz
+z-push-1.5.5-790.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/F-15/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Jul 2011 22:14:55 -0000 1.3
+++ sources 18 Sep 2011 01:27:12 -0000 1.4
@@ -1,2 +1,2 @@
-268e5e108cc737d035692b91cea74f14 z-push-1.5.4-707.tar.gz
+16641d2a7cc9c05eb5c556c4b18497a1 z-push-1.5.5-790.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/F-15/z-push.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- z-push.spec 17 Jul 2011 22:14:55 -0000 1.2
+++ z-push.spec 18 Sep 2011 01:27:12 -0000 1.3
@@ -1,9 +1,9 @@
-%global svnrevision 707
+%global svnrevision 790
%global with_ldap 1
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 1.5.4
+Version: 1.5.5
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
@@ -14,8 +14,8 @@
Source3: z-push-README.FEDORA.zarafa
Source4: z-push.conf
Source5: zarafa-z-push.conf
-Patch0: z-push-1.5.2-package.patch
-Patch1: z-push-1.5.2-zarafa.patch
+Patch0: z-push-1.5.5-package.patch
+Patch1: z-push-1.5.5-zarafa.patch
Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
@@ -142,7 +142,7 @@
# Remove all unwanted files and directories
rm -rf $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{state,backend/{kolab,zarafa}}/
-rm -f $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{INSTALL,LICENSE,{config,debug}.php.{package,zarafa},README.FEDORA}
+rm -f $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{INSTALL,LICENSE,{config,debug,index}.php.{package,zarafa},README.FEDORA}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -178,6 +178,9 @@
%attr(-,apache,apache) %dir %{_localstatedir}/lib/zarafa-%{name}/state/
%changelog
+* Sun Sep 18 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.5-1
+- Upgrade to 1.5.5
+
* Mon Jul 18 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.4-1
- Upgrade to 1.5.4
--- z-push-1.5.2-package.patch DELETED ---
--- z-push-1.5.2-zarafa.patch DELETED ---
13 years, 2 months
rpms/z-push/F-14 z-push-1.5.5-package.patch, NONE, 1.1 z-push-1.5.5-zarafa.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 z-push.spec, 1.2, 1.3 z-push-1.5.2-package.patch, 1.1, NONE z-push-1.5.2-zarafa.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11656/F-14
Modified Files:
.cvsignore sources z-push.spec
Added Files:
z-push-1.5.5-package.patch z-push-1.5.5-zarafa.patch
Removed Files:
z-push-1.5.2-package.patch z-push-1.5.2-zarafa.patch
Log Message:
Upgrade to 1.5.5
z-push-1.5.5-package.patch:
config.php | 20 +++++---------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 15 insertions(+), 16 deletions(-)
--- NEW FILE z-push-1.5.5-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.5, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.5/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.5/debug.php.package 2011-09-18 03:00:36.000000000 +0200
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.5/config.php 2011-03-18 20:22:53.000000000 +0100
+++ z-push-1.5.5/config.php.package 2011-09-18 03:02:16.000000000 +0200
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -91,16 +89,8 @@
// SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
- // The data providers that we are using (see configuration below)
- $BACKEND_PROVIDER = "BackendICS";
-
- // ************************
- // BackendICS settings
- // ************************
-
- // Defines the server to which we want to connect
- define('MAPI_SERVER', 'file:///var/run/zarafa');
-
+ // The data provider that we are using
+ $BACKEND_PROVIDER = "BackendIMAP";
// ************************
// BackendIMAP settings
--- z-push-1.5.5/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.5/index.php.package 2011-09-18 03:06:31.000000000 +0200
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
z-push-1.5.5-zarafa.patch:
config.php | 45 ++++-----------------------------------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 14 insertions(+), 42 deletions(-)
--- NEW FILE z-push-1.5.5-zarafa.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.5, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.5/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.5/debug.php.zarafa 2011-09-18 03:13:32.000000000 +0200
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/zarafa-z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.5/config.php 2011-03-18 20:22:53.000000000 +0100
+++ z-push-1.5.5/config.php.zarafa 2011-09-18 03:17:00.000000000 +0200
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/zarafa-z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -91,7 +89,7 @@
// SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
- // The data providers that we are using (see configuration below)
+ // The data provider that we are using
$BACKEND_PROVIDER = "BackendICS";
// ************************
@@ -102,41 +100,6 @@
define('MAPI_SERVER', 'file:///var/run/zarafa');
- // ************************
- // BackendIMAP settings
- // ************************
-
- // Defines the server to which we want to connect
- // recommended to use local servers only
- define('IMAP_SERVER', 'localhost');
- // connecting to default port (143)
- define('IMAP_PORT', 143);
- // best cross-platform compatibility (see http://php.net/imap_open for options)
- define('IMAP_OPTIONS', '/notls/norsh');
- // overwrite the "from" header if it isn't set when sending emails
- // options: 'username' - the username will be set (usefull if your login is equal to your emailaddress)
- // 'domain' - the value of the "domain" field is used
- // '@mydomain.com' - the username is used and the given string will be appended
- define('IMAP_DEFAULTFROM', '');
- // copy outgoing mail to this folder. If not set z-push will try the default folders
- define('IMAP_SENTFOLDER', '');
- // forward messages inline (default off - as attachment)
- define('IMAP_INLINE_FORWARD', false);
- // use imap_mail() to send emails (default) - off uses mail()
- define('IMAP_USE_IMAPMAIL', true);
-
-
- // ************************
- // BackendMaildir settings
- // ************************
- define('MAILDIR_BASE', '/tmp');
- define('MAILDIR_SUBDIR', 'Maildir');
-
- // **********************
- // BackendVCDir settings
- // **********************
- define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf');
-
// Alternative backend to perform SEARCH requests (GAL search)
// if an empty value is used, the default search functionality of the main backend is used
// use 'SearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
--- z-push-1.5.5/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.5/index.php.zarafa 2011-09-18 03:15:15.000000000 +0200
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/F-14/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Jul 2011 22:14:55 -0000 1.3
+++ .cvsignore 18 Sep 2011 01:27:12 -0000 1.4
@@ -1,2 +1,2 @@
-z-push-1.5.4-707.tar.gz
+z-push-1.5.5-790.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/F-14/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Jul 2011 22:14:55 -0000 1.3
+++ sources 18 Sep 2011 01:27:12 -0000 1.4
@@ -1,2 +1,2 @@
-268e5e108cc737d035692b91cea74f14 z-push-1.5.4-707.tar.gz
+16641d2a7cc9c05eb5c556c4b18497a1 z-push-1.5.5-790.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/F-14/z-push.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- z-push.spec 17 Jul 2011 22:14:55 -0000 1.2
+++ z-push.spec 18 Sep 2011 01:27:12 -0000 1.3
@@ -1,9 +1,9 @@
-%global svnrevision 707
+%global svnrevision 790
%global with_ldap 1
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 1.5.4
+Version: 1.5.5
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
@@ -14,8 +14,8 @@
Source3: z-push-README.FEDORA.zarafa
Source4: z-push.conf
Source5: zarafa-z-push.conf
-Patch0: z-push-1.5.2-package.patch
-Patch1: z-push-1.5.2-zarafa.patch
+Patch0: z-push-1.5.5-package.patch
+Patch1: z-push-1.5.5-zarafa.patch
Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
@@ -142,7 +142,7 @@
# Remove all unwanted files and directories
rm -rf $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{state,backend/{kolab,zarafa}}/
-rm -f $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{INSTALL,LICENSE,{config,debug}.php.{package,zarafa},README.FEDORA}
+rm -f $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{INSTALL,LICENSE,{config,debug,index}.php.{package,zarafa},README.FEDORA}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -178,6 +178,9 @@
%attr(-,apache,apache) %dir %{_localstatedir}/lib/zarafa-%{name}/state/
%changelog
+* Sun Sep 18 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.5-1
+- Upgrade to 1.5.5
+
* Mon Jul 18 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.4-1
- Upgrade to 1.5.4
--- z-push-1.5.2-package.patch DELETED ---
--- z-push-1.5.2-zarafa.patch DELETED ---
13 years, 2 months
rpms/z-push/EL-6 z-push-1.5.5-package.patch, NONE, 1.1 z-push-1.5.5-zarafa.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 z-push.spec, 1.2, 1.3 z-push-1.5.2-package.patch, 1.1, NONE z-push-1.5.2-zarafa.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/EL-6
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11656/EL-6
Modified Files:
.cvsignore sources z-push.spec
Added Files:
z-push-1.5.5-package.patch z-push-1.5.5-zarafa.patch
Removed Files:
z-push-1.5.2-package.patch z-push-1.5.2-zarafa.patch
Log Message:
Upgrade to 1.5.5
z-push-1.5.5-package.patch:
config.php | 20 +++++---------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 15 insertions(+), 16 deletions(-)
--- NEW FILE z-push-1.5.5-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.5, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.5/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.5/debug.php.package 2011-09-18 03:00:36.000000000 +0200
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.5/config.php 2011-03-18 20:22:53.000000000 +0100
+++ z-push-1.5.5/config.php.package 2011-09-18 03:02:16.000000000 +0200
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -91,16 +89,8 @@
// SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
- // The data providers that we are using (see configuration below)
- $BACKEND_PROVIDER = "BackendICS";
-
- // ************************
- // BackendICS settings
- // ************************
-
- // Defines the server to which we want to connect
- define('MAPI_SERVER', 'file:///var/run/zarafa');
-
+ // The data provider that we are using
+ $BACKEND_PROVIDER = "BackendIMAP";
// ************************
// BackendIMAP settings
--- z-push-1.5.5/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.5/index.php.package 2011-09-18 03:06:31.000000000 +0200
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
z-push-1.5.5-zarafa.patch:
config.php | 45 ++++-----------------------------------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 14 insertions(+), 42 deletions(-)
--- NEW FILE z-push-1.5.5-zarafa.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.5, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.5/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.5/debug.php.zarafa 2011-09-18 03:13:32.000000000 +0200
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/zarafa-z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.5/config.php 2011-03-18 20:22:53.000000000 +0100
+++ z-push-1.5.5/config.php.zarafa 2011-09-18 03:17:00.000000000 +0200
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/zarafa-z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -91,7 +89,7 @@
// SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
- // The data providers that we are using (see configuration below)
+ // The data provider that we are using
$BACKEND_PROVIDER = "BackendICS";
// ************************
@@ -102,41 +100,6 @@
define('MAPI_SERVER', 'file:///var/run/zarafa');
- // ************************
- // BackendIMAP settings
- // ************************
-
- // Defines the server to which we want to connect
- // recommended to use local servers only
- define('IMAP_SERVER', 'localhost');
- // connecting to default port (143)
- define('IMAP_PORT', 143);
- // best cross-platform compatibility (see http://php.net/imap_open for options)
- define('IMAP_OPTIONS', '/notls/norsh');
- // overwrite the "from" header if it isn't set when sending emails
- // options: 'username' - the username will be set (usefull if your login is equal to your emailaddress)
- // 'domain' - the value of the "domain" field is used
- // '@mydomain.com' - the username is used and the given string will be appended
- define('IMAP_DEFAULTFROM', '');
- // copy outgoing mail to this folder. If not set z-push will try the default folders
- define('IMAP_SENTFOLDER', '');
- // forward messages inline (default off - as attachment)
- define('IMAP_INLINE_FORWARD', false);
- // use imap_mail() to send emails (default) - off uses mail()
- define('IMAP_USE_IMAPMAIL', true);
-
-
- // ************************
- // BackendMaildir settings
- // ************************
- define('MAILDIR_BASE', '/tmp');
- define('MAILDIR_SUBDIR', 'Maildir');
-
- // **********************
- // BackendVCDir settings
- // **********************
- define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf');
-
// Alternative backend to perform SEARCH requests (GAL search)
// if an empty value is used, the default search functionality of the main backend is used
// use 'SearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
--- z-push-1.5.5/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.5/index.php.zarafa 2011-09-18 03:15:15.000000000 +0200
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Jul 2011 22:14:55 -0000 1.3
+++ .cvsignore 18 Sep 2011 01:27:11 -0000 1.4
@@ -1,2 +1,2 @@
-z-push-1.5.4-707.tar.gz
+z-push-1.5.5-790.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Jul 2011 22:14:55 -0000 1.3
+++ sources 18 Sep 2011 01:27:12 -0000 1.4
@@ -1,2 +1,2 @@
-268e5e108cc737d035692b91cea74f14 z-push-1.5.4-707.tar.gz
+16641d2a7cc9c05eb5c556c4b18497a1 z-push-1.5.5-790.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/z-push.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- z-push.spec 17 Jul 2011 22:14:55 -0000 1.2
+++ z-push.spec 18 Sep 2011 01:27:12 -0000 1.3
@@ -1,9 +1,9 @@
-%global svnrevision 707
+%global svnrevision 790
%global with_ldap 1
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 1.5.4
+Version: 1.5.5
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
@@ -14,8 +14,8 @@
Source3: z-push-README.FEDORA.zarafa
Source4: z-push.conf
Source5: zarafa-z-push.conf
-Patch0: z-push-1.5.2-package.patch
-Patch1: z-push-1.5.2-zarafa.patch
+Patch0: z-push-1.5.5-package.patch
+Patch1: z-push-1.5.5-zarafa.patch
Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
@@ -142,7 +142,7 @@
# Remove all unwanted files and directories
rm -rf $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{state,backend/{kolab,zarafa}}/
-rm -f $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{INSTALL,LICENSE,{config,debug}.php.{package,zarafa},README.FEDORA}
+rm -f $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{INSTALL,LICENSE,{config,debug,index}.php.{package,zarafa},README.FEDORA}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -178,6 +178,9 @@
%attr(-,apache,apache) %dir %{_localstatedir}/lib/zarafa-%{name}/state/
%changelog
+* Sun Sep 18 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.5-1
+- Upgrade to 1.5.5
+
* Mon Jul 18 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.4-1
- Upgrade to 1.5.4
--- z-push-1.5.2-package.patch DELETED ---
--- z-push-1.5.2-zarafa.patch DELETED ---
13 years, 2 months
rpms/z-push/EL-5 z-push-1.5.5-package.patch, NONE, 1.1 z-push-1.5.5-zarafa.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 z-push.spec, 1.2, 1.3 z-push-1.5.2-package.patch, 1.1, NONE z-push-1.5.2-zarafa.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11656/EL-5
Modified Files:
.cvsignore sources z-push.spec
Added Files:
z-push-1.5.5-package.patch z-push-1.5.5-zarafa.patch
Removed Files:
z-push-1.5.2-package.patch z-push-1.5.2-zarafa.patch
Log Message:
Upgrade to 1.5.5
z-push-1.5.5-package.patch:
config.php | 20 +++++---------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 15 insertions(+), 16 deletions(-)
--- NEW FILE z-push-1.5.5-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.5, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.5/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.5/debug.php.package 2011-09-18 03:00:36.000000000 +0200
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.5/config.php 2011-03-18 20:22:53.000000000 +0100
+++ z-push-1.5.5/config.php.package 2011-09-18 03:02:16.000000000 +0200
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -91,16 +89,8 @@
// SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
- // The data providers that we are using (see configuration below)
- $BACKEND_PROVIDER = "BackendICS";
-
- // ************************
- // BackendICS settings
- // ************************
-
- // Defines the server to which we want to connect
- define('MAPI_SERVER', 'file:///var/run/zarafa');
-
+ // The data provider that we are using
+ $BACKEND_PROVIDER = "BackendIMAP";
// ************************
// BackendIMAP settings
--- z-push-1.5.5/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.5/index.php.package 2011-09-18 03:06:31.000000000 +0200
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
z-push-1.5.5-zarafa.patch:
config.php | 45 ++++-----------------------------------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 14 insertions(+), 42 deletions(-)
--- NEW FILE z-push-1.5.5-zarafa.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.5, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.5/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.5/debug.php.zarafa 2011-09-18 03:13:32.000000000 +0200
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/zarafa-z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.5/config.php 2011-03-18 20:22:53.000000000 +0100
+++ z-push-1.5.5/config.php.zarafa 2011-09-18 03:17:00.000000000 +0200
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/zarafa-z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -91,7 +89,7 @@
// SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
- // The data providers that we are using (see configuration below)
+ // The data provider that we are using
$BACKEND_PROVIDER = "BackendICS";
// ************************
@@ -102,41 +100,6 @@
define('MAPI_SERVER', 'file:///var/run/zarafa');
- // ************************
- // BackendIMAP settings
- // ************************
-
- // Defines the server to which we want to connect
- // recommended to use local servers only
- define('IMAP_SERVER', 'localhost');
- // connecting to default port (143)
- define('IMAP_PORT', 143);
- // best cross-platform compatibility (see http://php.net/imap_open for options)
- define('IMAP_OPTIONS', '/notls/norsh');
- // overwrite the "from" header if it isn't set when sending emails
- // options: 'username' - the username will be set (usefull if your login is equal to your emailaddress)
- // 'domain' - the value of the "domain" field is used
- // '@mydomain.com' - the username is used and the given string will be appended
- define('IMAP_DEFAULTFROM', '');
- // copy outgoing mail to this folder. If not set z-push will try the default folders
- define('IMAP_SENTFOLDER', '');
- // forward messages inline (default off - as attachment)
- define('IMAP_INLINE_FORWARD', false);
- // use imap_mail() to send emails (default) - off uses mail()
- define('IMAP_USE_IMAPMAIL', true);
-
-
- // ************************
- // BackendMaildir settings
- // ************************
- define('MAILDIR_BASE', '/tmp');
- define('MAILDIR_SUBDIR', 'Maildir');
-
- // **********************
- // BackendVCDir settings
- // **********************
- define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf');
-
// Alternative backend to perform SEARCH requests (GAL search)
// if an empty value is used, the default search functionality of the main backend is used
// use 'SearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
--- z-push-1.5.5/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.5/index.php.zarafa 2011-09-18 03:15:15.000000000 +0200
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Jul 2011 22:14:54 -0000 1.3
+++ .cvsignore 18 Sep 2011 01:27:09 -0000 1.4
@@ -1,2 +1,2 @@
-z-push-1.5.4-707.tar.gz
+z-push-1.5.5-790.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Jul 2011 22:14:54 -0000 1.3
+++ sources 18 Sep 2011 01:27:10 -0000 1.4
@@ -1,2 +1,2 @@
-268e5e108cc737d035692b91cea74f14 z-push-1.5.4-707.tar.gz
+16641d2a7cc9c05eb5c556c4b18497a1 z-push-1.5.5-790.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/z-push.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- z-push.spec 17 Jul 2011 22:14:54 -0000 1.2
+++ z-push.spec 18 Sep 2011 01:27:11 -0000 1.3
@@ -1,9 +1,9 @@
-%global svnrevision 707
+%global svnrevision 790
%global with_ldap 1
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 1.5.4
+Version: 1.5.5
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
@@ -14,8 +14,8 @@
Source3: z-push-README.FEDORA.zarafa
Source4: z-push.conf
Source5: zarafa-z-push.conf
-Patch0: z-push-1.5.2-package.patch
-Patch1: z-push-1.5.2-zarafa.patch
+Patch0: z-push-1.5.5-package.patch
+Patch1: z-push-1.5.5-zarafa.patch
Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
@@ -142,7 +142,7 @@
# Remove all unwanted files and directories
rm -rf $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{state,backend/{kolab,zarafa}}/
-rm -f $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{INSTALL,LICENSE,{config,debug}.php.{package,zarafa},README.FEDORA}
+rm -f $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{INSTALL,LICENSE,{config,debug,index}.php.{package,zarafa},README.FEDORA}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -178,6 +178,9 @@
%attr(-,apache,apache) %dir %{_localstatedir}/lib/zarafa-%{name}/state/
%changelog
+* Sun Sep 18 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.5-1
+- Upgrade to 1.5.5
+
* Mon Jul 18 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.4-1
- Upgrade to 1.5.4
--- z-push-1.5.2-package.patch DELETED ---
--- z-push-1.5.2-zarafa.patch DELETED ---
13 years, 2 months
rpms/z-push/devel z-push-1.5.5-package.patch, NONE, 1.1 z-push-1.5.5-zarafa.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 z-push.spec, 1.2, 1.3 z-push-1.5.2-package.patch, 1.1, NONE z-push-1.5.2-zarafa.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11656/devel
Modified Files:
.cvsignore sources z-push.spec
Added Files:
z-push-1.5.5-package.patch z-push-1.5.5-zarafa.patch
Removed Files:
z-push-1.5.2-package.patch z-push-1.5.2-zarafa.patch
Log Message:
Upgrade to 1.5.5
z-push-1.5.5-package.patch:
config.php | 20 +++++---------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 15 insertions(+), 16 deletions(-)
--- NEW FILE z-push-1.5.5-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.5, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.5/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.5/debug.php.package 2011-09-18 03:00:36.000000000 +0200
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.5/config.php 2011-03-18 20:22:53.000000000 +0100
+++ z-push-1.5.5/config.php.package 2011-09-18 03:02:16.000000000 +0200
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -91,16 +89,8 @@
// SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
- // The data providers that we are using (see configuration below)
- $BACKEND_PROVIDER = "BackendICS";
-
- // ************************
- // BackendICS settings
- // ************************
-
- // Defines the server to which we want to connect
- define('MAPI_SERVER', 'file:///var/run/zarafa');
-
+ // The data provider that we are using
+ $BACKEND_PROVIDER = "BackendIMAP";
// ************************
// BackendIMAP settings
--- z-push-1.5.5/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.5/index.php.package 2011-09-18 03:06:31.000000000 +0200
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
z-push-1.5.5-zarafa.patch:
config.php | 45 ++++-----------------------------------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 14 insertions(+), 42 deletions(-)
--- NEW FILE z-push-1.5.5-zarafa.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.5, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.5/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.5/debug.php.zarafa 2011-09-18 03:13:32.000000000 +0200
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/zarafa-z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.5/config.php 2011-03-18 20:22:53.000000000 +0100
+++ z-push-1.5.5/config.php.zarafa 2011-09-18 03:17:00.000000000 +0200
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/zarafa-z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -91,7 +89,7 @@
// SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
- // The data providers that we are using (see configuration below)
+ // The data provider that we are using
$BACKEND_PROVIDER = "BackendICS";
// ************************
@@ -102,41 +100,6 @@
define('MAPI_SERVER', 'file:///var/run/zarafa');
- // ************************
- // BackendIMAP settings
- // ************************
-
- // Defines the server to which we want to connect
- // recommended to use local servers only
- define('IMAP_SERVER', 'localhost');
- // connecting to default port (143)
- define('IMAP_PORT', 143);
- // best cross-platform compatibility (see http://php.net/imap_open for options)
- define('IMAP_OPTIONS', '/notls/norsh');
- // overwrite the "from" header if it isn't set when sending emails
- // options: 'username' - the username will be set (usefull if your login is equal to your emailaddress)
- // 'domain' - the value of the "domain" field is used
- // '@mydomain.com' - the username is used and the given string will be appended
- define('IMAP_DEFAULTFROM', '');
- // copy outgoing mail to this folder. If not set z-push will try the default folders
- define('IMAP_SENTFOLDER', '');
- // forward messages inline (default off - as attachment)
- define('IMAP_INLINE_FORWARD', false);
- // use imap_mail() to send emails (default) - off uses mail()
- define('IMAP_USE_IMAPMAIL', true);
-
-
- // ************************
- // BackendMaildir settings
- // ************************
- define('MAILDIR_BASE', '/tmp');
- define('MAILDIR_SUBDIR', 'Maildir');
-
- // **********************
- // BackendVCDir settings
- // **********************
- define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf');
-
// Alternative backend to perform SEARCH requests (GAL search)
// if an empty value is used, the default search functionality of the main backend is used
// use 'SearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
--- z-push-1.5.5/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.5/index.php.zarafa 2011-09-18 03:15:15.000000000 +0200
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Jul 2011 22:14:55 -0000 1.3
+++ .cvsignore 18 Sep 2011 01:27:12 -0000 1.4
@@ -1,2 +1,2 @@
-z-push-1.5.4-707.tar.gz
+z-push-1.5.5-790.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Jul 2011 22:14:55 -0000 1.3
+++ sources 18 Sep 2011 01:27:12 -0000 1.4
@@ -1,2 +1,2 @@
-268e5e108cc737d035692b91cea74f14 z-push-1.5.4-707.tar.gz
+16641d2a7cc9c05eb5c556c4b18497a1 z-push-1.5.5-790.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/z-push.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- z-push.spec 17 Jul 2011 22:14:55 -0000 1.2
+++ z-push.spec 18 Sep 2011 01:27:12 -0000 1.3
@@ -1,9 +1,9 @@
-%global svnrevision 707
+%global svnrevision 790
%global with_ldap 1
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 1.5.4
+Version: 1.5.5
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
@@ -14,8 +14,8 @@
Source3: z-push-README.FEDORA.zarafa
Source4: z-push.conf
Source5: zarafa-z-push.conf
-Patch0: z-push-1.5.2-package.patch
-Patch1: z-push-1.5.2-zarafa.patch
+Patch0: z-push-1.5.5-package.patch
+Patch1: z-push-1.5.5-zarafa.patch
Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
@@ -142,7 +142,7 @@
# Remove all unwanted files and directories
rm -rf $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{state,backend/{kolab,zarafa}}/
-rm -f $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{INSTALL,LICENSE,{config,debug}.php.{package,zarafa},README.FEDORA}
+rm -f $RPM_BUILD_ROOT%{_datadir}/{%{name},zarafa-%{name}}/{INSTALL,LICENSE,{config,debug,index}.php.{package,zarafa},README.FEDORA}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -178,6 +178,9 @@
%attr(-,apache,apache) %dir %{_localstatedir}/lib/zarafa-%{name}/state/
%changelog
+* Sun Sep 18 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.5-1
+- Upgrade to 1.5.5
+
* Mon Jul 18 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.4-1
- Upgrade to 1.5.4
--- z-push-1.5.2-package.patch DELETED ---
--- z-push-1.5.2-zarafa.patch DELETED ---
13 years, 2 months
rpms/k3b-extras-freeworld/devel k3b-extras-freeworld.spec, 1.24, 1.25
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/k3b-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22143/devel
Modified Files:
k3b-extras-freeworld.spec
Log Message:
Release--, the previous build failed anyway. :-)
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- k3b-extras-freeworld.spec 17 Sep 2011 13:55:06 -0000 1.24
+++ k3b-extras-freeworld.spec 17 Sep 2011 13:57:30 -0000 1.25
@@ -3,7 +3,7 @@
Summary: Additional codec plugins for the k3b CD/DVD burning application
Epoch: 1
Version: 2.0.2
-Release: 2%{?dist}
+Release: 1%{?dist}
Group: Applications/Archiving
License: GPLv2+
@@ -94,12 +94,9 @@
%changelog
-* Sat Sep 17 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1:2.0.2-2
-- Requires: k3b >= %{epoch}:%{version} (plugins do load in newer versions, oops)
-
* Sat Sep 17 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1:2.0.2-1
- update to 2.0.2
-- Requires: k3b = %{epoch}:%{version} (plugins won't load in newer versions)
+- Requires: k3b >= %{epoch}:%{version} rather than just %{version}
* Wed Oct 13 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.1-2
- rebuild (gcc)
13 years, 2 months
rpms/k3b-extras-freeworld/devel k3b-extras-freeworld.spec, 1.23, 1.24
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/k3b-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22053/devel
Modified Files:
k3b-extras-freeworld.spec
Log Message:
* Sat Sep 17 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1:2.0.2-2
- Requires: k3b >= %{epoch}:%{version} (plugins do load in newer versions, oops)
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- k3b-extras-freeworld.spec 17 Sep 2011 13:47:45 -0000 1.23
+++ k3b-extras-freeworld.spec 17 Sep 2011 13:55:06 -0000 1.24
@@ -3,7 +3,7 @@
Summary: Additional codec plugins for the k3b CD/DVD burning application
Epoch: 1
Version: 2.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Archiving
License: GPLv2+
@@ -37,8 +37,7 @@
BuildRequires: libdvdread-devel
BuildRequires: libmad-devel
-# The plugins only load in the exact version of K3b they come from.
-Requires: k3b = %{epoch}:%{version}
+Requires: k3b >= %{epoch}:%{version}
%description
@@ -95,6 +94,9 @@
%changelog
+* Sat Sep 17 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1:2.0.2-2
+- Requires: k3b >= %{epoch}:%{version} (plugins do load in newer versions, oops)
+
* Sat Sep 17 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1:2.0.2-1
- update to 2.0.2
- Requires: k3b = %{epoch}:%{version} (plugins won't load in newer versions)
13 years, 2 months
rpms/k3b-extras-freeworld/devel .cvsignore, 1.11, 1.12 k3b-extras-freeworld.spec, 1.22, 1.23 sources, 1.11, 1.12
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/k3b-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20784/devel
Modified Files:
.cvsignore k3b-extras-freeworld.spec sources
Log Message:
* Sat Sep 17 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1:2.0.2-1
- update to 2.0.2
- Requires: k3b = %{epoch}:%{version} (plugins won't load in newer versions)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 13 Sep 2010 13:52:17 -0000 1.11
+++ .cvsignore 17 Sep 2011 13:47:45 -0000 1.12
@@ -1 +1 @@
-k3b-2.0.1.tar.bz2
+k3b-2.0.2.tar.bz2
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- k3b-extras-freeworld.spec 13 Oct 2010 17:44:28 -0000 1.22
+++ k3b-extras-freeworld.spec 17 Sep 2011 13:47:45 -0000 1.23
@@ -2,8 +2,8 @@
Name: k3b-extras-freeworld
Summary: Additional codec plugins for the k3b CD/DVD burning application
Epoch: 1
-Version: 2.0.1
-Release: 2%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
Group: Applications/Archiving
License: GPLv2+
@@ -37,7 +37,8 @@
BuildRequires: libdvdread-devel
BuildRequires: libmad-devel
-Requires: k3b >= %{version}
+# The plugins only load in the exact version of K3b they come from.
+Requires: k3b = %{epoch}:%{version}
%description
@@ -94,6 +95,10 @@
%changelog
+* Sat Sep 17 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1:2.0.2-1
+- update to 2.0.2
+- Requires: k3b = %{epoch}:%{version} (plugins won't load in newer versions)
+
* Wed Oct 13 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.1-2
- rebuild (gcc)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 13 Sep 2010 13:52:17 -0000 1.11
+++ sources 17 Sep 2011 13:47:45 -0000 1.12
@@ -1 +1 @@
-4e5b6665d91d4984cbfa814b797257cb k3b-2.0.1.tar.bz2
+c86113af31a2032e57fd2f302b5f637a k3b-2.0.2.tar.bz2
13 years, 2 months