[z-push] Update to 2.2.12
by Sérgio M. Basto
commit be057123e64ecde897b83400a7ff97e7beb66d71
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Sep 15 12:56:02 2016 +0100
Update to 2.2.12
z-push-2.2.4-package.patch | 4 ++--
z-push.spec | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/z-push-2.2.4-package.patch b/z-push-2.2.4-package.patch
index c494275..d3459f0 100644
--- a/z-push-2.2.4-package.patch
+++ b/z-push-2.2.4-package.patch
@@ -92,12 +92,12 @@ configuration hints regarding multiple data backend providers.
include('lib/exceptions/exceptions.php');
include('lib/core/zpushdefs.php');
include('lib/core/zpush.php');
-@@ -61,7 +65,6 @@
+@@ -61,7 +65,6 @@ include('version.php');
* MAIN
*/
declare(ticks = 1);
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
-
+ set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
try {
ZPush::CheckConfig();
--- z-push-2.2.4/tools/migrate-2.0.x-2.1.0.php 2015-09-30 19:10:45.000000000 +0200
diff --git a/z-push.spec b/z-push.spec
index 97ee739..e7fa40f 100644
--- a/z-push.spec
+++ b/z-push.spec
@@ -1,7 +1,7 @@
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 2.2.9
-Release: 2%{?dist}
+Version: 2.2.12
+Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
URL: https://z-push.org/
@@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Sep 15 2016 Sérgio Basto <sergio(a)serjux.com> - 2.2.12-1
+- Update to 2.2.12
+
* Thu Sep 15 2016 Sérgio Basto <sergio(a)serjux.com> - 2.2.9-2
- Only need z-push-zarafa for Zarafa, which is no longer in Fedora, rfbz #3892
8 years, 2 months
[z-push: 7/7] Only need z-push-zarafa for Zarafa, which is no longer in Fedora, rfbz #3892
by Sérgio M. Basto
commit c3fcdc847cdc162cb83792495fd08d969e6b52ce
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Sep 15 12:12:20 2016 +0100
Only need z-push-zarafa for Zarafa, which is no longer in Fedora, rfbz #3892
z-push.spec | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/z-push.spec b/z-push.spec
index b7397b7..97ee739 100644
--- a/z-push.spec
+++ b/z-push.spec
@@ -1,7 +1,7 @@
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
Version: 2.2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
URL: https://z-push.org/
@@ -100,6 +100,7 @@ The z-push-vcarddir package contains the vCard directory backend data
provider for Z-Push. If you want Z-Push to access a vCard directory,
you will need to install this package.
+%if 0%{?rhel}
%package zarafa
Summary: Zarafa data backend provider for Z-Push
Group: Applications/Productivity
@@ -112,6 +113,7 @@ The z-push-zarafa package contains the Zarafa Collaboration Plattform
data backend provider for Z-Push. If you want Z-Push to access a MAPI-
based service or the Zarafa Collaboration Plattform, you will need to
install this package.
+%endif
%prep
%setup -q -n %{name}-%{version}
@@ -132,11 +134,17 @@ cp -af * $RPM_BUILD_ROOT%{_datadir}/%{name}/
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
-for backend in combined imap maildir searchldap vcarddir zarafa; do
+%if 0%{?rhel}
+variants="zarafa"
+%endif
+
+for backend in combined imap maildir searchldap vcarddir $variants; do
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
done
+
+
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/autodiscover/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/autodiscover.php
ln -sf ../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/autodiscover/config.php
@@ -219,12 +227,20 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/%{name}/vcarddir.php
%{_datadir}/%{name}/backend/vcarddir/
+%if 0%{?rhel}
%files zarafa
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/zarafa.php
%{_datadir}/%{name}/backend/zarafa/
+%endif
%changelog
+* Thu Sep 15 2016 Sérgio Basto <sergio(a)serjux.com> - 2.2.9-2
+- Only need z-push-zarafa for Zarafa, which is no longer in Fedora, rfbz #3892
+
+* Sat Aug 20 2016 Sérgio Basto <sergio(a)serjux.com> - 2.2.8-2
+- Only need z-push-zarafa for Zarafa, which is no longer in Fedora, rfbz #3892
+
* Thu Mar 24 2016 Robert Scheck <robert(a)fedoraproject.org> 2.2.9-1
- Upgrade to 2.2.9
@@ -306,7 +322,7 @@ rm -rf $RPM_BUILD_ROOT
* 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
+* Tue Jan 25 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
8 years, 2 months
[z-push/el5] (3 commits) ...Upgrade to 2.2.9
by Sérgio M. Basto
Summary of changes:
e8703f4... Merge branches 'master' and 'el6' into el6 (*)
564b70a... Merge branch 'el5' into el6 (*)
1d6a0e8... Upgrade to 2.2.9 (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 2 months
[z-push: 6/7] Merge branch 'el6'
by Sérgio M. Basto
commit ad06ec153985f7916a0ce3335a99ed1ebf24dba0
Merge: d081fe2 1d6a0e8
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Sep 15 12:03:58 2016 +0100
Merge branch 'el6'
.gitignore | 2 +-
sources | 2 +-
z-push.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
8 years, 2 months
[z-push: 5/7] Revert last commit to merge el branches
by Sérgio M. Basto
commit d081fe2b462de28f9bedd9a9371bbce6986aafac
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Sep 15 12:03:10 2016 +0100
Revert last commit to merge el branches
This reverts commit 7b49d0c89f5226764383fd70f42b959a141fdff1.
z-push.spec | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/z-push.spec b/z-push.spec
index 39ffdbb..9ec2aa1 100644
--- a/z-push.spec
+++ b/z-push.spec
@@ -1,7 +1,7 @@
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
Version: 2.2.8
-Release: 2%{?dist}
+Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
URL: https://z-push.org/
@@ -100,7 +100,6 @@ The z-push-vcarddir package contains the vCard directory backend data
provider for Z-Push. If you want Z-Push to access a vCard directory,
you will need to install this package.
-%if 0%{?rhel}
%package zarafa
Summary: Zarafa data backend provider for Z-Push
Group: Applications/Productivity
@@ -113,7 +112,6 @@ The z-push-zarafa package contains the Zarafa Collaboration Plattform
data backend provider for Z-Push. If you want Z-Push to access a MAPI-
based service or the Zarafa Collaboration Plattform, you will need to
install this package.
-%endif
%prep
%setup -q -n %{name}-%{version}
@@ -134,17 +132,11 @@ cp -af * $RPM_BUILD_ROOT%{_datadir}/%{name}/
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
-%if 0%{?rhel}
-variants="zarafa"
-%endif
-
-for backend in combined imap maildir searchldap vcarddir $variants; do
+for backend in combined imap maildir searchldap vcarddir zarafa; do
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
done
-
-
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/autodiscover/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/autodiscover.php
ln -sf ../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/autodiscover/config.php
@@ -227,17 +219,12 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/%{name}/vcarddir.php
%{_datadir}/%{name}/backend/vcarddir/
-%if 0%{?rhel}
%files zarafa
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/zarafa.php
%{_datadir}/%{name}/backend/zarafa/
-%endif
%changelog
-* Sat Aug 20 2016 Sérgio Basto <sergio(a)serjux.com> - 2.2.8-2
-- Only need z-push-zarafa for Zarafa, which is no longer in Fedora, rfbz #3892
-
* Tue Feb 02 2016 Robert Scheck <robert(a)fedoraproject.org> 2.2.8-1
- Upgrade to 2.2.8
@@ -316,7 +303,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Feb 11 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.1-1
- Upgrade to 1.5.1
-* Tue Jan 25 2011 Robert Scheck <robert(a)fedoraproject.org> 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
8 years, 2 months
[z-push/el6] (3 commits) ...Upgrade to 2.2.9
by Sérgio M. Basto
Summary of changes:
171e21d... Merge branches 'master' and 'el5' into el5 (*)
564b70a... Merge branch 'el5' into el6 (*)
1d6a0e8... Upgrade to 2.2.9 (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 2 months
[z-push: 4/7] Upgrade to 2.2.9
by Sérgio M. Basto
commit 1d6a0e8a2f7ad591767a5f39c098932e257d10c2
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Sep 15 11:32:55 2016 +0100
Upgrade to 2.2.9
.gitignore | 2 +-
sources | 2 +-
z-push.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f34284a..cc0bc33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-z-push-2.2.8.tar.gz
+z-push-2.2.9.tar.gz
z-push-permission.pdf
diff --git a/sources b/sources
index a33bb59..43f2b40 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e55b04680bb9c698301155c47aeb87f8 z-push-2.2.8.tar.gz
+43a05472efb0af432f0bd390a1429df4 z-push-2.2.9.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
diff --git a/z-push.spec b/z-push.spec
index 9ec2aa1..b7397b7 100644
--- a/z-push.spec
+++ b/z-push.spec
@@ -1,6 +1,6 @@
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 2.2.8
+Version: 2.2.9
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
@@ -225,6 +225,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}/backend/zarafa/
%changelog
+* Thu Mar 24 2016 Robert Scheck <robert(a)fedoraproject.org> 2.2.9-1
+- Upgrade to 2.2.9
+
* Tue Feb 02 2016 Robert Scheck <robert(a)fedoraproject.org> 2.2.8-1
- Upgrade to 2.2.8
8 years, 2 months
[z-push: 3/7] Merge branch 'el5' into el6
by Sérgio M. Basto
commit 564b70ae1a9b33096edf9f8034c981e48438cd60
Merge: e8703f4 171e21d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Sep 15 11:08:48 2016 +0100
Merge branch 'el5' into el6
---
8 years, 2 months
[z-push] (7 commits) ...Only need z-push-zarafa for Zarafa, which is no longer in Fedora, rfbz #3892
by Sérgio M. Basto
Summary of changes:
171e21d... Merge branches 'master' and 'el5' into el5 (*)
e8703f4... Merge branches 'master' and 'el6' into el6 (*)
564b70a... Merge branch 'el5' into el6
1d6a0e8... Upgrade to 2.2.9
d081fe2... Revert last commit to merge el branches
ad06ec1... Merge branch 'el6'
c3fcdc8... Only need z-push-zarafa for Zarafa, which is no longer in F
(*) This commit already existed in another branch; no separate mail sent
8 years, 2 months
[qarte/f24] New upstream release.
by Milan Bouchet-Valat
Summary of changes:
4af82af... New upstream release. (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 2 months
