#2 Build with phonenumber support
Closed 2 years ago by mcrha. Opened 2 years ago by njha.
rpms/ njha/evolution-data-server master  into  master

file modified
+18 -2
@@ -2,6 +2,7 @@ 

  %define static_ldap 0

  %define krb5_support 1

  %define largefile_support 1

+ %global phonenum_support 1

  

  # Coverity scan can override this to 0, to skip checking in gtk-doc generated code

  %{!?with_docs: %global with_docs 1}
@@ -37,7 +38,7 @@ 

  

  Name: evolution-data-server

  Version: 3.36.1

- Release: 1%{?dist}

+ Release: 2%{?dist}

  Summary: Backend data server for Evolution

  License: LGPLv2+

  URL: https://wiki.gnome.org/Apps/Evolution
@@ -110,6 +111,12 @@ 

  BuildRequires: krb5-devel >= 1.11

  %endif

  

+ %if %{phonenum_support}

+ BuildRequires: libphonenumber-devel

+ BuildRequires: protobuf-devel

+ BuildRequires: boost-devel

+ %endif

+ 

  %description

  The %{name} package provides a unified backend for programs that work

  with contacts, tasks, and calendar information.
@@ -215,6 +222,12 @@ 

  %define largefile_flags -DENABLE_LARGEFILE=OFF

  %endif

  

+ %if %{phonenum_support}

+ %define phonenum_flags -DWITH_PHONENUMBER=ON

+ %else

+ %define phonenum_flags -DWITH_PHONENUMBER=OFF

+ %endif

+ 

  %define ssl_flags -DENABLE_SMIME=ON

  

  %if %{with_docs}
@@ -249,7 +262,7 @@ 

  	-DDBUS_SERVICES_PREFIX=%{?_eds_dbus_services_prefix} \

  	%endif

  	%ldap_flags %krb5_flags %ssl_flags \

- 	%largefile_flags %gtkdoc_flags \

+ 	%largefile_flags %gtkdoc_flags %phonenum_flags \

  	..

  

  make %{?_smp_mflags}
@@ -464,6 +477,9 @@ 

  %{_datadir}/installed-tests

  

  %changelog

+ * Sat Mar 28 2020 Nikhil Jha <hi@nikhiljha.com> - 3.36.1-2

+ - Build with phonenumber support

+ 

  * Fri Mar 27 2020 Milan Crha <mcrha@redhat.com> - 3.36.1-1

  - Update to 3.36.1

  

This adds support to evolution-data-server for phone numbers, which is used by quite a few PinePhone related packages (as you might expect from a phone). :)

1 new commit added

  • typo
2 years ago

1 new commit added

  • fix package release
2 years ago

Aaah, sorry for all the commits. I tried adapting my specfile to the 3.36.1 update without testing the change locally and that clearly didn't work. It should be good now.

Thanks for the patch. Could you squash the change into a single commit, please? Also, I've been told that the new code should use global instead of define, thus doing that might be a good idea too (I know, the spec is old and uses deprecated stuff, thus such change causes inconsistency, but anyway).

1 new commit added

  • use global
2 years ago

rebased onto abf2f1a

2 years ago

Squashed and switched it to global.

Thanks, the patch looks almost fine. The %changelog date is wrong, but, more importantly, we clashed in time, unfortunately, as I committed a change approximately two hours before you (if I count it properly), but you didn't update the master branch in your fork, thus the change cannot be merged from the web UI. I can merge is manually, if it'll be easier for you, that's okay. Just let me know. (This is embarrassing, I'm sorry about that, but it's the way the web UI works; I do not know whether I can do anything with it.)

One more note: I'm wondering how the things should work with respect of the flatpak build. Should the flatpak build build with libphonenumber or not? If yes, then the libphonenumber should be added into its dependencies at https://src.fedoraproject.org/flatpaks/evolution/blob/master/f/evolution.yaml

Yes, please merge it manually instead. I'm not sure how to properly rebase this either :(

The flatpak probably should also build with libphonenumber, but I'm going to avoid touching that for now because I don't know how flatpaks work.

Pull-Request has been closed by mcrha

2 years ago