rdieter pushed to akonadi (f20). "Merge branch 'master' into f20"

[notifications at fedoraproject.org]

>From e63d049f4904552a77ad3a66c442f37a2c7c6cf9 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata at redhat.com>
Date: Wed, 4 Feb 2015 14:09:07 +0100
Subject: Bump for rebuild.


diff --git a/akonadi.spec b/akonadi.spec
index b99b605..e81020d 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -18,7 +18,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.13.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: LGPLv2+
 URL:     http://community.kde.org/KDE_PIM/Akonadi 
@@ -230,6 +230,9 @@ fi
 
 
 %changelog
+* Wed Feb 04 2015 Petr Machata <pmachata at redhat.com> - 1.13.0-9
+- Bump for rebuild.
+
 * Sat Jan 31 2015 Rex Dieter <rdieter at fedoraproject.org> 1.13.0-8
 - latest 1.13 branch fixes
 
-- 
cgit v0.10.2


>From 8b319ccb4c25dcca5f4ee8e1dc4032a8f9a09882 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 18 Feb 2015 09:02:17 -0600
Subject: rebuild (gcc5)


diff --git a/akonadi.spec b/akonadi.spec
index e81020d..2f0433f 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -18,7 +18,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.13.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: LGPLv2+
 URL:     http://community.kde.org/KDE_PIM/Akonadi 
@@ -230,6 +230,9 @@ fi
 
 
 %changelog
+* Wed Feb 18 2015 Rex Dieter <rdieter at fedoraproject.org> 1.13.0-10
+- rebuild (gcc5)
+
 * Wed Feb 04 2015 Petr Machata <pmachata at redhat.com> - 1.13.0-9
 - Bump for rebuild.
 
-- 
cgit v0.10.2


>From a4f5b0576ff8c8bd0532f97a8e5bd433be6efd1a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 8 Mar 2015 14:17:39 -0500
Subject: explicitly Requires: mariadb(-sesrver) only as needed (#1199797)


diff --git a/akonadi.spec b/akonadi.spec
index 2f0433f..af397c6 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -11,14 +11,15 @@
 %endif
 
 %global mysql mysql
-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?rhel} > 6
+# el7 mariadb pkgs don't have compat Provides: mysql (apparently?)
 %global mysql mariadb
 %endif
 
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.13.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: LGPLv2+
 URL:     http://community.kde.org/KDE_PIM/Akonadi 
@@ -230,6 +231,9 @@ fi
 
 
 %changelog
+* Sun Mar 08 2015 Rex Dieter <rdieter at fedoraproject.org> 1.13.0-11
+- explicitly Requires: mariadb(-sesrver) only as needed (#1199797)
+
 * Wed Feb 18 2015 Rex Dieter <rdieter at fedoraproject.org> 1.13.0-10
 - rebuild (gcc5)
 
-- 
cgit v0.10.2


>From c9783c242fae0208d09e9e45b1c73c3d4369a574 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 8 Mar 2015 15:00:57 -0500
Subject: 1.13.0-12

- explicit BuildRequires: mariadb-server
- -mysql: Recommends: mariadb-server (f22+, #1199797)

diff --git a/akonadi.spec b/akonadi.spec
index af397c6..fd254ea 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -19,7 +19,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.13.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 License: LGPLv2+
 URL:     http://community.kde.org/KDE_PIM/Akonadi 
@@ -86,7 +86,7 @@ BuildRequires: pkgconfig(sqlite3) >= 3.6.23
 BuildRequires: dbus-x11 xorg-x11-server-Xvfb
 # backends, used at buildtime to query known locations of server binaries
 # FIXME/TODO: set these via cmake directives, avoids needless buildroot items
-BuildRequires: %{mysql}-server
+BuildRequires: mariadb-server
 BuildRequires: postgresql-server
 
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
@@ -108,6 +108,9 @@ Summary: Akonadi MySQL backend support
 Obsoletes: akonadi < 1.7.90-2
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{mysql}-server
+%if "%{?mysql}" != "mariadb" && 0%{?fedora} > 21
+Recommends: mariadb-server
+%endif
 Requires: qt4-mysql%{?_isa}
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
@@ -231,6 +234,10 @@ fi
 
 
 %changelog
+* Sun Mar 08 2015 Rex Dieter <rdieter at fedoraproject.org> - 1.13.0-12
+- explicit BuildRequires: mariadb-server
+- -mysql: Recommends: mariadb-server (f22+, #1199797)
+
 * Sun Mar 08 2015 Rex Dieter <rdieter at fedoraproject.org> 1.13.0-11
 - explicitly Requires: mariadb(-sesrver) only as needed (#1199797)
 
-- 
cgit v0.10.2


>From 3ceac1733cf1ccb9c9cc92e71ffa5355bc227adb Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 11 Apr 2015 18:36:53 -0500
Subject: use Recommends for f21 too


diff --git a/akonadi.spec b/akonadi.spec
index fd254ea..5704924 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -108,7 +108,7 @@ Summary: Akonadi MySQL backend support
 Obsoletes: akonadi < 1.7.90-2
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{mysql}-server
-%if "%{?mysql}" != "mariadb" && 0%{?fedora} > 21
+%if "%{?mysql}" != "mariadb" && 0%{?fedora} > 20
 Recommends: mariadb-server
 %endif
 Requires: qt4-mysql%{?_isa}
@@ -236,7 +236,7 @@ fi
 %changelog
 * Sun Mar 08 2015 Rex Dieter <rdieter at fedoraproject.org> - 1.13.0-12
 - explicit BuildRequires: mariadb-server
-- -mysql: Recommends: mariadb-server (f22+, #1199797)
+- -mysql: Recommends: mariadb-server (f21+, #1199797)
 
 * Sun Mar 08 2015 Rex Dieter <rdieter at fedoraproject.org> 1.13.0-11
 - explicitly Requires: mariadb(-sesrver) only as needed (#1199797)
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/akonadi.git/commit/?h=f20&id=946dc68fe0d5ac6515ef2c5c017ff854c9f9260c