diff --git a/sources b/sources index 7a29acd..fcddf62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a421d00239c6daedde56dd987c3aed7 syncevolution-1.5.1.tar.gz +2066d44913867a1aaf826402fb9db427 syncevolution-1.5.2.tar.gz diff --git a/syncevolution-1.5.1-gcc6.patch b/syncevolution-1.5.1-gcc6.patch deleted file mode 100644 index e854370..0000000 --- a/syncevolution-1.5.1-gcc6.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up syncevolution-1.5.1/src/syncevo/Logging.h.gcc6 syncevolution-1.5.1/src/syncevo/Logging.h ---- syncevolution-1.5.1/src/syncevo/Logging.h.gcc6 2014-04-25 09:55:47.000000000 +0200 -+++ syncevolution-1.5.1/src/syncevo/Logging.h 2016-02-08 16:23:54.988845287 +0100 -@@ -255,7 +255,7 @@ class Logger - Handle &operator = (const Handle &other) throw (); - ~Handle() throw (); - -- operator bool () const { return m_logger; } -+ operator bool () const { return m_logger.get() != 0; } - bool operator == (Logger *logger) const { return m_logger.get() == logger; } - Logger *get() const { return m_logger.get(); } - -@@ -398,7 +398,7 @@ template class PushLogger : boo - } - } - -- operator bool () const { return m_logger; } -+ operator bool () const { return m_logger.get() != 0; } - - void reset(const Logger::Handle &logger) - { -diff -up syncevolution-1.5.1/src/syncevo/StringDataBlob.h.gcc6 syncevolution-1.5.1/src/syncevo/StringDataBlob.h ---- syncevolution-1.5.1/src/syncevo/StringDataBlob.h.gcc6 2014-04-25 09:55:47.000000000 +0200 -+++ syncevolution-1.5.1/src/syncevo/StringDataBlob.h 2016-02-08 16:23:54.988845287 +0100 -@@ -53,7 +53,7 @@ class StringDataBlob : public DataBlob - - virtual boost::shared_ptr getData() { return m_data; } - virtual std::string getName() const { return m_name; } -- virtual bool exists() const { return m_data; } -+ virtual bool exists() const { return m_data.get() != 0; } - virtual bool isReadonly() const { return m_readonly; } - }; - -diff -up syncevolution-1.5.1/src/synthesis/src/sysync/itemfield.cpp.gcc6 syncevolution-1.5.1/src/synthesis/src/sysync/itemfield.cpp ---- syncevolution-1.5.1/src/synthesis/src/sysync/itemfield.cpp.gcc6 2015-03-03 09:06:40.000000000 +0100 -+++ syncevolution-1.5.1/src/synthesis/src/sysync/itemfield.cpp 2016-02-08 16:23:54.989845287 +0100 -@@ -1488,7 +1488,7 @@ void TTimestampField::getAsRFC822date(st - " %c%02hd%02hd", - moffs>=0 ? '+' : '-', - (uInt16)(abs(moffs) / MinsPerHour), -- (uInt16)(abs(moffs) % MinsPerHour) -+ (uInt16)(((uInt16)abs(moffs)) % MinsPerHour) - ); - } - } // TTimestampField::getAsRFC822date diff --git a/syncevolution.spec b/syncevolution.spec index 0c6cf02..acb782c 100644 --- a/syncevolution.spec +++ b/syncevolution.spec @@ -1,8 +1,8 @@ Summary: SyncML client for evolution Name: syncevolution Epoch: 1 -Version: 1.5.1 -Release: 12%{?dist} +Version: 1.5.2 +Release: 1%{?dist} License: LGPLv2+ Group: Applications/Productivity URL: http://syncevolution.org/ @@ -10,7 +10,6 @@ Source: http://downloads.syncevolution.org/%{name}/sources/%{name}-%{vers Patch0: syncevolution-1.4.1-akonadi.patch Patch1: syncevolution-1.5.1-libical2.patch -Patch2: syncevolution-1.5.1-gcc6.patch BuildRequires: pkgconfig(dbus-glib-1) @@ -93,7 +92,6 @@ Akonadi backend for %{name}. %setup -q %patch0 -p1 -b .akonadi %patch1 -p1 -b .libical2 -%patch2 -p1 -b .gcc6 # use the ac macros in Makefile.am sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am @@ -206,6 +204,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/syncevolution/xml/*.pl %changelog +* Thu Nov 10 2016 Milan Crha - 1:1.5.2-1 +- Update to 1.5.2 +- Remove patch for GCC 6 build break (fixed upstream) + * Tue Oct 25 2016 Milan Crha - 1:1.5.1-12 - Rebuild for newer evolution-data-server