From 0b305b23c3834fae4c68bc6418d798d02b4cc9ca Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Oct 04 2017 07:08:28 +0000 Subject: Update to 0.12.0. Rebase patch. --- diff --git a/geary-0.12-libdir.patch b/geary-0.12-libdir.patch index d44d7fc..8e84ffa 100644 --- a/geary-0.12-libdir.patch +++ b/geary-0.12-libdir.patch @@ -1,6 +1,6 @@ -diff -up geary-02e3d30/src/client/application/geary-application.vala.orig geary-02e3d30/src/client/application/geary-application.vala ---- geary-02e3d30/src/client/application/geary-application.vala.orig 2017-03-21 17:53:04.000000000 +0100 -+++ geary-02e3d30/src/client/application/geary-application.vala 2017-03-22 19:46:04.485957986 +0100 +diff -up geary-0.12.0/src/client/application/geary-application.vala.orig geary-0.12.0/src/client/application/geary-application.vala +--- geary-0.12.0/src/client/application/geary-application.vala.orig 2017-10-02 11:53:11.000000000 +0200 ++++ geary-0.12.0/src/client/application/geary-application.vala 2017-10-04 09:06:00.563953050 +0200 @@ -7,6 +7,7 @@ // Defined by CMake build script. extern const string _INSTALL_PREFIX; @@ -9,7 +9,7 @@ diff -up geary-02e3d30/src/client/application/geary-application.vala.orig geary- extern const string _SOURCE_ROOT_DIR; extern const string _BUILD_ROOT_DIR; extern const string GETTEXT_PACKAGE; -@@ -27,6 +28,7 @@ public class GearyApplication : Gtk.Appl +@@ -28,6 +29,7 @@ public class GearyApplication : Gtk.Appl public const string VERSION = Geary.Version.GEARY_VERSION; public const string INSTALL_PREFIX = _INSTALL_PREFIX; public const string GSETTINGS_DIR = _GSETTINGS_DIR; @@ -17,7 +17,7 @@ diff -up geary-02e3d30/src/client/application/geary-application.vala.orig geary- public const string SOURCE_ROOT_DIR = _SOURCE_ROOT_DIR; public const string BUILD_ROOT_DIR = _BUILD_ROOT_DIR; -@@ -300,12 +302,12 @@ public class GearyApplication : Gtk.Appl +@@ -302,12 +304,12 @@ public class GearyApplication : Gtk.Appl * Returns the directory containing the application's WebExtension libs. * * If the application is installed, this will be @@ -32,10 +32,10 @@ diff -up geary-02e3d30/src/client/application/geary-application.vala.orig geary- else dir = File.new_for_path(BUILD_ROOT_DIR).get_child("src"); return dir; -diff -up geary-02e3d30/src/CMakeLists.txt.orig geary-02e3d30/src/CMakeLists.txt ---- geary-02e3d30/src/CMakeLists.txt.orig 2017-03-21 17:53:04.000000000 +0100 -+++ geary-02e3d30/src/CMakeLists.txt 2017-03-22 19:43:29.616530792 +0100 -@@ -566,6 +566,7 @@ set(CFLAGS +diff -up geary-0.12.0/src/CMakeLists.txt.orig geary-0.12.0/src/CMakeLists.txt +--- geary-0.12.0/src/CMakeLists.txt.orig 2017-10-02 11:53:11.000000000 +0200 ++++ geary-0.12.0/src/CMakeLists.txt 2017-10-04 09:06:00.565953028 +0200 +@@ -567,6 +567,7 @@ set(CFLAGS ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER} -D_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" @@ -43,7 +43,7 @@ diff -up geary-02e3d30/src/CMakeLists.txt.orig geary-02e3d30/src/CMakeLists.txt -D_BUILD_ROOT_DIR=\"${CMAKE_BINARY_DIR}\" -D_SOURCE_ROOT_DIR=\"${CMAKE_SOURCE_DIR}\" -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\" -@@ -744,7 +745,7 @@ OPTIONS +@@ -745,7 +746,7 @@ OPTIONS add_library(geary-web-process MODULE ${WEB_PROCESS_VALA_C}) target_link_libraries(geary-web-process PRIVATE ${DEPS_LIBRARIES} geary-engine) diff --git a/geary.spec b/geary.spec index ba671ed..9ea8830 100644 --- a/geary.spec +++ b/geary.spec @@ -1,10 +1,6 @@ -%global commit 02e3d30ae131f1d7ef6e4e9cccf2a908958c3bfe -%global date 20170322 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: geary Version: 0.12.0 -Release: 0.3.%{date}.%{shortcommit}%{?dist} +Release: 1%{?dist} Summary: A lightweight email program designed around conversations # Geary is under LGPLv2+. # SQLite3-unicodesn code is in the Public Domain. @@ -13,8 +9,7 @@ Summary: A lightweight email program designed around conversations # COPYING.icons). License: LGPLv2+ and BSD and CC-BY and CC-BY-SA and Public Domain URL: https://wiki.gnome.org/Apps/Geary -# Source0: https://download.gnome.org/sources/geary/0.11/%%{name}-%%{version}.tar.xz -Source0: https://git.gnome.org/browse/geary/snapshot/geary-%{shortcommit}.tar.xz +Source0: https://download.gnome.org/sources/geary/0.12/%{name}-%{version}.tar.xz Patch0: geary-0.12-libdir.patch BuildRequires: vala >= 0.22.1 BuildRequires: vala-tools >= 0.22.1 @@ -57,10 +52,8 @@ all kinds of nifty features in a modular way. %prep -%setup -q -n geary-%{shortcommit} +%setup -q %patch0 -p1 -b.orig -sed -r -e 's,set[(]VERSION ".*"[)],set(VERSION "master~g%{shortcommit}"),' \ - -i CMakeLists.txt %build @@ -133,6 +126,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog +* Wed Oct 4 2017 Thomas Moschny - 0.12.0-1 +- Update to 0.12.0. +- Rebase patch. + * Wed Aug 02 2017 Fedora Release Engineering - 0.12.0-0.3.20170322.02e3d30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 8b33492..a59c986 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geary-02e3d30.tar.xz) = 53c4a73041d1b218ddfc93cb8fe42e23f24090e52104be016b9dd4155f5a0c3445c8e87382ffc170def2e7fa5e5b872a2bb997304012a6fd89d2386b1ad8a96d +SHA512 (geary-0.12.0.tar.xz) = caaf49065181f84234bbdb3dc20808f68cb7339e7ef3e992bd83789d3a474b5f59a210d54db2b4fe5f44539a2d52ad7f328087580748c74a513cca7be31c2e52