rpms/z-push/devel z-push-1.5.2-package.patch, NONE, 1.1 z-push-1.5.2-zarafa.patch, NONE, 1.1 z-push-1.5.3-license.patch, NONE, 1.1 z-push-README.FEDORA.package, NONE, 1.1 z-push-README.FEDORA.zarafa, NONE, 1.1 z-push.conf, NONE, 1.1 z-push.spec, NONE, 1.1 zarafa-z-push.conf, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12496/devel
Modified Files:
.cvsignore sources
Added Files:
z-push-1.5.2-package.patch z-push-1.5.2-zarafa.patch
z-push-1.5.3-license.patch z-push-README.FEDORA.package
z-push-README.FEDORA.zarafa z-push.conf z-push.spec
zarafa-z-push.conf
Log Message:
Inital import of z-push into RPM Fusion
z-push-1.5.2-package.patch:
config.php | 18 +++++-------------
debug.php | 2 +-
2 files changed, 6 insertions(+), 14 deletions(-)
--- NEW FILE z-push-1.5.2-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.2, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push/debug.php.package 2011-04-27 00:03:07.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/config.php 2011-03-18 20:22:53.000000000 +0100
+++ z-push/config.php.package 2011-04-27 00:04:11.000000000 +0200
@@ -40,9 +40,9 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
+ // Defines the default time zone, change e.g. to "Europe/Amsterdam" when needed
if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
+ date_default_timezone_set(date_default_timezone_get());
}
// Defines the base path on the server, terminated by a slash
@@ -57,7 +57,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 +91,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.2-zarafa.patch:
config.php | 43 ++++---------------------------------------
debug.php | 2 +-
2 files changed, 5 insertions(+), 40 deletions(-)
--- NEW FILE z-push-1.5.2-zarafa.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.2, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push/debug.php.zarafa 2011-04-26 23:57:27.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/config.php 2011-03-18 20:22:53.000000000 +0100
+++ z-push/config.php.zarafa 2011-04-26 23:58:46.000000000 +0200
@@ -40,9 +40,9 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
+ // Defines the default time zone, change e.g. to "Europe/Amsterdam" when needed
if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
+ date_default_timezone_set(date_default_timezone_get());
}
// Defines the base path on the server, terminated by a slash
@@ -57,7 +57,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 +91,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 +102,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.3-license.patch:
LICENSE | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
--- NEW FILE z-push-1.5.3-license.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.3, which just
backports the forgotten licensing exception (additional clauses) to LICENSE file.
The next z-push release will no longer require this backported patch. More details
are available at https://developer.berlios.de/mantis/view.php?id=462. Verification
of this patch: "svn diff -r425:696 svn://svn.berlios.de/z-push/trunk/LICENSE"
--- z-push-1.5.3-685/LICENSE 2010-07-06 20:06:03.000000000 +0200
+++ z-push-1.5.3-685/LICENSE.license 2011-06-04 15:16:24.000000000 +0200
@@ -659,3 +659,37 @@
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.
+
+---
+
+Copyright 2007 - 2011 Zarafa Deutschland GmbH
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License, version 3,
+as published by the Free Software Foundation with the following additional
+term according to sec. 7:
+
+According to sec. 7 of the GNU Affero General Public License, version 3,
+the terms of the AGPL are supplemented with the following terms:
+
+"Zarafa" is a registered trademark of Zarafa B.V.
+"Z-Push" is a registered trademark of Zarafa Deutschland GmbH
+The licensing of the Program under the AGPL does not imply a trademark license.
+Therefore any rights, title and interest in our trademarks remain entirely with us.
+
+However, if you propagate an unmodified version of the Program you are
+allowed to use the term "Z-Push" to indicate that you distribute the Program.
+Furthermore you may use our trademarks where it is necessary to indicate
+the intended purpose of a product or service provided you use it in accordance
+with honest practices in industrial or commercial matters.
+If you want to propagate modified versions of the Program under the name "Z-Push",
+you may only do so if you have a written permission by Zarafa Deutschland GmbH
+(to acquire a permission please contact Zarafa at trademark(a)zarafa.com).
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
--- NEW FILE z-push-README.FEDORA.package ---
Using Z-Push
============
Setting up your PocketPC
------------------------
This is simply a case of adding an 'exchange server' to your activesync
server list, specifying the IP address of the Z-Push apache server,
disabling SSL, unless you have already setup SSL on your Apache server,
setting the correct username & password (the domain is ignored, you can
simply specify 'domain' or some other random string), and then going
through the standard activesync settings.
Once you have done this, you should be able to synchronise your PocketPC
simply by clicking the 'Sync' button in ActiveSync on your PocketPC.
Troubleshooting
---------------
Most problems will be caused by incorrect Apache settings. To test whether
your Apache setup is working correctly, you can simply type the Z-Push URL
in your browser, to see if apache is correctly redirecting your request to
z-push. You can simply use:
http://<serverip>/Microsoft-Server-ActiveSync
If correctly configured, you should see a username/password request, and
when you specify a valid username & password, you should see a string like
"Your device requested the Z-Push URL without the required GET parameters"
If not, then check your PHP and Apache settings.
If you have other synchronisation problems, you can create the file
'debug.txt' in the root directory of z-push, which should also be either
world-writable or writeable to the apache webserver user:
touch /var/lib/z-push/debug.txt
chmod 777 /var/lib/z-push/debug.txt
or
touch /var/lib/z-push/debug.txt
chown apache:apache /var/lib/z-push/debug.txt
The debug.txt file will then collect debug information from your
synchronisation.
Documentation
-------------
Further information can be found in the Zarafa Z-Push configuration manual
http://download.zarafa.com/zarafa/release/docs/z-push_installation_manual...
and at the homepage of Z-Push, http://z-push.sourceforge.net.
--- NEW FILE z-push-README.FEDORA.zarafa ---
Using Z-Push and Zarafa
=======================
Setting up your PocketPC
------------------------
This is simply a case of adding an 'exchange server' to your activesync
server list, specifying the IP address of the Z-Push apache server,
disabling SSL, unless you have already setup SSL on your Apache server,
setting the correct username & password (the domain is ignored, you can
simply specify 'domain' or some other random string), and then going
through the standard activesync settings.
Once you have done this, you should be able to synchronise your PocketPC
simply by clicking the 'Sync' button in ActiveSync on your PocketPC.
Troubleshooting
---------------
Most problems will be caused by incorrect Apache settings. To test whether
your Apache setup is working correctly, you can simply type the Z-Push URL
in your browser, to see if apache is correctly redirecting your request to
z-push. You can simply use:
http://<serverip>/Microsoft-Server-ActiveSync
If correctly configured, you should see a username/password request, and
when you specify a valid username & password, you should see a string like
"Your device requested the Z-Push URL without the required GET parameters"
If not, then check your PHP and Apache settings.
If you have other synchronisation problems, you can create the file
'debug.txt' in the root directory of z-push, which should also be either
world-writable or writeable to the apache webserver user:
touch /var/lib/zarafa-z-push/debug.txt
chmod 777 /var/lib/zarafa-z-push/debug.txt
or
touch /var/lib/zarafa-z-push/debug.txt
chown apache:apache /var/lib/zarafa-z-push/debug.txt
The debug.txt file will then collect debug information from your
synchronisation.
Documentation
-------------
Further information can be found in the Zarafa Z-Push configuration manual
http://download.zarafa.com/zarafa/release/docs/z-push_installation_manual...
and at the homepage of Z-Push, http://z-push.sourceforge.net.
--- NEW FILE z-push.conf ---
#
# Z-Push - ActiveSync over-the-air implementation
#
Alias /Microsoft-Server-ActiveSync /usr/share/z-push/index.php
# If the PHP settings are not set up correctly, login will fail
#
<Directory /usr/share/z-push/>
# Some apache settings
Options -Indexes +FollowSymLinks
# Register globals must be off
php_value register_globals off
# Magic quotes must be off
php_value magic_quotes_gpc off
php_value magic_quotes_runtime off
# Short open tags must be on
php_value short_open_tag on
# Allow passing variable by reference
php_value allow_call_time_pass_reference on
</Directory>
--- NEW FILE z-push.spec ---
%global svnrevision 685
%global with_ldap 1
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
Version: 1.5.3
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
URL: http://z-push.sourceforge.net/
Source0: http://download.berlios.de/%{name}/%{name}-%{version}-%{svnrevision}.tar.gz
Source1: z-push-permission.pdf
Source2: z-push-README.FEDORA.package
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
Patch2: z-push-1.5.3-license.patch
Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
%endif
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Z-Push is an implementation of the ActiveSync protocol which is used
'over-the-air' for multi platform ActiveSync devices, including Windows
Mobile, Android, iPhone, Sony Ericsson and Nokia mobile devices. With
Z-Push any groupware can be connected and synced with these devices.
For use cases of Z-Push with the Zarafa Collaboration Platform and Open
Source Collaboration, please use the prepared package zarafa-z-push.
%package -n zarafa-%{name}
Summary: ActiveSync over-the-air implementation for Zarafa
Group: Applications/Productivity
Requires: httpd, php >= 4.3.0, php-mapi >= 6.40.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
%endif
%description -n zarafa-%{name}
Z-Push is an implementation of the ActiveSync protocol which is used
'over-the-air' for multi platform ActiveSync devices, including Windows
Mobile, Android, iPhone, Sony Ericsson and Nokia mobile devices. With
Z-Push any groupware can be connected and synced with these devices.
This package is prepared for use with the Zarafa Collaboration Platform
and Open Source Collaboration. For non-Zarafa use cases, please use the
regular Z-Push package.
%prep
%setup -q -T -c -a 0
# Copy permission for later usage
cp -pf %{SOURCE1} permission.pdf
# Correct wrong file permissions
chmod 644 %{name}-%{version}-%{svnrevision}/{include/z_RFC822,streamer}.php
# Z-Push for Zarafa
mkdir zarafa-%{name}-%{version}-%{svnrevision}
pushd zarafa-%{name}-%{version}-%{svnrevision}
cp -af ../%{name}-%{version}-%{svnrevision}/* .
cp -pf %{SOURCE3} README.FEDORA
%patch1 -p1 -b .zarafa
touch -c -r config.php{.zarafa,}
%patch2 -p1
popd
# Z-Push without Zarafa
pushd %{name}-%{version}-%{svnrevision}
cp -pf %{SOURCE2} README.FEDORA
%patch0 -p1 -b .package
touch -c -r config.php{.package,}
%patch2 -p1
popd
%build
%install
rm -rf $RPM_BUILD_ROOT
# Create all needed directories
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{{,zarafa}/%{name},httpd/conf.d}/
mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/{%{name},zarafa-%{name}}}/
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/{%{name},zarafa-%{name}}/state/
# Z-Push without Zarafa
pushd %{name}-%{version}-%{svnrevision}
# Install all files into destination
cp -af * $RPM_BUILD_ROOT%{_datadir}/%{name}/
# Move configuration file to its place
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.php
ln -sf ../../..%{_sysconfdir}/%{name}/config.php $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php
# Install the apache configuration file
install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
# Remove all Zarafa requiring files
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{backend/ics,include/z_{ical,tnef}}.php
# Move searchldap configuration to its place
%if %{with_ldap}
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/searchldap/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/searchldap.php
ln -sf ../../../../..%{_sysconfdir}/%{name}/searchldap.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/searchldap/config.php
%else
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/{searchbackend.php,searchldap/}
%endif
popd
# Z-Push for Zarafa
pushd zarafa-%{name}-%{version}-%{svnrevision}
# Install all files into destination
cp -af * $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/
# Move configuration file to its place
mv -f $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/zarafa/%{name}/config.php
ln -sf ../../..%{_sysconfdir}/zarafa/%{name}/config.php $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/config.php
# Install the apache configuration file
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zarafa-%{name}.conf
# Remove all non-Zarafa related files
rm -f $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/backend/{diffbackend,imap,maildir,vcarddir}.php
# Move searchldap configuration to its place
%if %{with_ldap}
mv -f $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/backend/searchldap/config.php $RPM_BUILD_ROOT%{_sysconfdir}/zarafa/%{name}/searchldap.php
ln -sf ../../../../..%{_sysconfdir}/zarafa/%{name}/searchldap.php $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/backend/searchldap/config.php
%else
rm -rf $RPM_BUILD_ROOT%{_datadir}/zarafa-%{name}/backend/{searchbackend.php,searchldap/}
%endif
# Install Zarafa-related command line tool
install -p -m 755 backend/zarafa/z-push-admin.php $RPM_BUILD_ROOT%{_bindir}/z-push-admin
popd
# 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}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc %{name}-%{version}-%{svnrevision}/LICENSE permission.pdf
%doc %{name}-%{version}-%{svnrevision}/README.FEDORA
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%dir %{_sysconfdir}/%{name}/
%config(noreplace) %{_sysconfdir}/%{name}/config.php
%if %{with_ldap}
%config(noreplace) %{_sysconfdir}/%{name}/searchldap.php
%endif
%{_datadir}/%{name}/
%dir %{_localstatedir}/lib/%{name}/
%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}/state/
%files -n zarafa-%{name}
%defattr(-,root,root,-)
%doc zarafa-%{name}-%{version}-%{svnrevision}/LICENSE permission.pdf
%doc zarafa-%{name}-%{version}-%{svnrevision}/README.FEDORA
%config(noreplace) %{_sysconfdir}/httpd/conf.d/zarafa-%{name}.conf
%dir %{_sysconfdir}/zarafa/
%dir %{_sysconfdir}/zarafa/%{name}/
%config(noreplace) %{_sysconfdir}/zarafa/%{name}/config.php
%if %{with_ldap}
%config(noreplace) %{_sysconfdir}/zarafa/%{name}/searchldap.php
%endif
%{_bindir}/z-push-admin
%{_datadir}/zarafa-%{name}/
%dir %{_localstatedir}/lib/zarafa-%{name}/
%attr(-,apache,apache) %dir %{_localstatedir}/lib/zarafa-%{name}/state/
%changelog
* Tue Jun 07 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.3-1
- Upgrade to 1.5.3
* Wed Apr 27 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.2-1
- Upgrade to 1.5.2
* Fri Feb 11 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.1-1
- Upgrade to 1.5.1
* Mon Jan 26 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5-1
- Upgrade to 1.5
* Thu May 27 2010 Robert Scheck <robert(a)fedoraproject.org> 1.3-2
- Use date_default_timezone_get() as default (RHBZ #570398)
* Mon May 17 2010 Robert Scheck <robert(a)fedoraproject.org> 1.3-1
- Upgrade to 1.3
* Sat Feb 27 2010 Robert Scheck <robert(a)fedoraproject.org> 1.2.2-3
- Use the equivalent namespaces as zarafa-webaccess package
* Sun Aug 09 2009 Robert Scheck <robert(a)fedoraproject.org> 1.2.2-2
- Require httpd instead of webserver at runtime (RFBZ #585 #c20)
* Sun Jul 05 2009 Robert Scheck <robert(a)fedoraproject.org> 1.2.2-1
- Upgrade to 1.2.2
* Sun May 10 2009 Robert Scheck <robert(a)fedoraproject.org> 1.2.1-2
- Re-added the forgotten MAPI_SERVER definement for Zarafa
- Enabled the allow_call_time_pass_reference in PHP settings
- Corrected STATE_DIR value from absolute to relative path
* Thu Apr 30 2009 Robert Scheck <robert(a)fedoraproject.org> 1.2.1-1
- Upgrade to 1.2.1
- Initial spec file for Fedora and Red Hat Enterprise Linux
--- NEW FILE zarafa-z-push.conf ---
#
# Z-Push - ActiveSync over-the-air implementation for Zarafa
#
Alias /Microsoft-Server-ActiveSync /usr/share/zarafa-z-push/index.php
# If the PHP settings are not set up correctly, login will fail
#
<Directory /usr/share/zarafa-z-push/>
# Some apache settings
Options -Indexes +FollowSymLinks
# Register globals must be off
php_value register_globals off
# Magic quotes must be off
php_value magic_quotes_gpc off
php_value magic_quotes_runtime off
# Short open tags must be on
php_value short_open_tag on
# Allow passing variable by reference
php_value allow_call_time_pass_reference on
</Directory>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Jun 2011 21:16:06 -0000 1.1
+++ .cvsignore 12 Jun 2011 22:42:40 -0000 1.2
@@ -0,0 +1,2 @@
+z-push-1.5.3-685.tar.gz
+z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Jun 2011 21:16:06 -0000 1.1
+++ sources 12 Jun 2011 22:42:40 -0000 1.2
@@ -0,0 +1,2 @@
+73cddd092a3975e18e6ec7ee084cbbb3 z-push-1.5.3-685.tar.gz
+0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
12 years, 10 months
rpms/vboxgtk/F-15 sources,1.2,NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vboxgtk/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv814
Removed Files:
sources
Log Message:
Fix dead.package
--- sources DELETED ---
12 years, 10 months
rpms/vboxgtk/devel sources,1.2,NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vboxgtk/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv759
Removed Files:
sources
Log Message:
clean for dead.package
--- sources DELETED ---
12 years, 10 months
rpms/ffmpeg/devel sources, 1.23, 1.24 .cvsignore, 1.23, 1.24 ffmpeg.spec, 1.43, 1.44
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30194
Modified Files:
sources .cvsignore ffmpeg.spec
Log Message:
Update to current oldabi snapshot
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 12 Jun 2011 18:13:29 -0000 1.23
+++ sources 12 Jun 2011 21:29:58 -0000 1.24
@@ -1 +1 @@
-390f5454c985f1321fe1ffa4fc98b5f6 ffmpeg-0.7-rc1.tar.bz2
+881aca23a4e13a7eb3207d98a1e38643 ffmpeg-oldabi-20110612.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 12 Jun 2011 18:13:29 -0000 1.23
+++ .cvsignore 12 Jun 2011 21:29:58 -0000 1.24
@@ -1 +1 @@
-ffmpeg-0.7-rc1.tar.bz2
+ffmpeg-oldabi-20110612.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ffmpeg.spec 12 Jun 2011 18:13:29 -0000 1.43
+++ ffmpeg.spec 12 Jun 2011 21:29:58 -0000 1.44
@@ -1,13 +1,13 @@
# TODO: add make test to %%check section
%global branch oldabi-
-#global date 20110612
-%global rel rc1
+%global date 20110612
+#global rel rc1
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.7
-Release: 0.1.%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 0.2.%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -20,7 +20,7 @@
%else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}-%{rel}.tar.bz2
%endif
-Source1: ffmpeg-snapshot.sh
+Source1: ffmpeg-snapshot-oldabi.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: bzip2-devel
@@ -238,6 +238,9 @@
%changelog
+* Sun Jun 12 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7-0.2.20110612git
+- Update to 20110612git from oldabi branch
+
* Sun Jun 12 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7-0.1.rc1
- Update to 7.0-rc1
- Remove upstreamed patch
12 years, 10 months
rpms/z-push/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/z-push/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsw29000/rpms/z-push/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module z-push
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: z-push
# $Id: Makefile,v 1.1 2011/06/12 21:16:06 kwizart Exp $
NAME := z-push
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
12 years, 10 months
rpms/z-push Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/z-push
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsw29000/rpms/z-push
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module z-push
--- NEW FILE Makefile ---
# Top level Makefile for module z-push
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
12 years, 10 months
rpms/z-push/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/z-push/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsw29000/rpms/z-push/devel
Log Message:
Directory /cvs/free/rpms/z-push/devel added to the repository
12 years, 10 months
rpms/z-push - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/z-push
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsw29000/rpms/z-push
Log Message:
Directory /cvs/free/rpms/z-push added to the repository
12 years, 10 months
rpms/ffmpeg/F-15 .cvsignore, 1.22, 1.23 ffmpeg.spec, 1.42, 1.43 sources, 1.22, 1.23
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17276/F-15
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
Update to 7.0-rc1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-15/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 4 Apr 2011 15:26:35 -0000 1.22
+++ .cvsignore 12 Jun 2011 19:28:41 -0000 1.23
@@ -1 +1 @@
-ffmpeg-0.6.90-rc0.tar.bz2
+ffmpeg-0.7-rc1.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-15/ffmpeg.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ffmpeg.spec 12 Apr 2011 00:30:53 -0000 1.42
+++ ffmpeg.spec 12 Jun 2011 19:28:41 -0000 1.43
@@ -1,13 +1,13 @@
# TODO: add make test to %%check section
-%global git 0
-%global date 20110227
-%global rel rc0
+%global branch oldabi-
+#global date 20110612
+%global rel rc1
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.6.90
-Release: 0.2.%{rel}%{?dist}
+Version: 0.7
+Release: 0.1.%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -15,14 +15,12 @@
%endif
Group: Applications/Multimedia
URL: http://ffmpeg.org/
-%if %{git}
-Source0: ffmpeg-%{date}.tar.bz2
+%if 0%{?date}
+Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}-%{rel}.tar.bz2
%endif
Source1: ffmpeg-snapshot.sh
-# http://git.videolan.org/gitweb.cgi?p=ffmpeg.git;a=patch;h=1f6265e011f6e56...
-Patch0: ffmpeg-av_parser_parse-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: bzip2-devel
@@ -44,7 +42,7 @@
BuildRequires: speex-devel
BuildRequires: subversion
BuildRequires: texi2html
-BuildRequires: x264-devel >= 0.0.0-0.29
+%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.29}
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
%ifarch %{ix86} x86_64
@@ -105,7 +103,7 @@
--enable-libtheora \\\
--enable-libvorbis \\\
--enable-libvpx \\\
- --enable-libx264 \\\
+ %{!?_without_x264:--enable-libx264} \\\
--enable-libxvid \\\
--enable-x11grab \\\
--enable-avfilter \\\
@@ -119,13 +117,12 @@
%prep
-%if %{git}
-%setup -q -n ffmpeg-%{date}
-echo "git-snapshot-%{date}-RPMFusion" > VERSION
+%if 0%{?date}
+%setup -q -n ffmpeg-%{?branch}%{date}
+echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
%setup -q -n ffmpeg-%{version}-%{rel}
%endif
-%patch0 -p1 -b .av_parser_parse-fix
%build
mkdir generic
@@ -241,6 +238,12 @@
%changelog
+* Sun Jun 12 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7-0.1.rc1
+- Update to 7.0-rc1
+- Remove upstreamed patch
+- Fix flv - rfbz#1743
+- New RPM build conditional --without x264.
+
* Tue Apr 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.90-0.2.rc0
- fixed missing av_parser_parse symbol (upstream patch)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-15/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 4 Apr 2011 15:26:35 -0000 1.22
+++ sources 12 Jun 2011 19:28:41 -0000 1.23
@@ -1 +1 @@
-d2e701a363c6ecebc47fdb917a164bb3 ffmpeg-0.6.90-rc0.tar.bz2
+390f5454c985f1321fe1ffa4fc98b5f6 ffmpeg-0.7-rc1.tar.bz2
12 years, 10 months
rpms/ffmpeg/devel ffmpeg-av_parser_parse-fix.patch,1.1,NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17101/devel
Removed Files:
ffmpeg-av_parser_parse-fix.patch
Log Message:
Clean unused patch
--- ffmpeg-av_parser_parse-fix.patch DELETED ---
12 years, 10 months