From 0c0cbc216961cddf113a6738b7030baed86270c9 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Mon, 19 Sep 2016 13:20:57 +0400 Subject: [PATCH 01/21] Rebuild --- evolution-data-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index ec11295..8901bcd 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -48,7 +48,7 @@ Name: evolution-data-server Summary: Evolution Data Server Version: 3.16.4 -Release: 2 +Release: 3 License: LGPLv2+ Group: System/Libraries URL: http://www.gnome.org/projects/evolution/ From c0d274503a2113aaa836fd4f46510cb42a67189e Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 3 Oct 2016 13:33:48 +1000 Subject: [PATCH 02/21] New version 3.22.0 Spec cleanup --- .abf.yml | 2 +- evolution-data-server.spec | 514 +++++++++++++++++++------------------ 2 files changed, 265 insertions(+), 251 deletions(-) diff --git a/.abf.yml b/.abf.yml index 4b3a1e9..5729612 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - evolution-data-server-3.16.4.tar.xz: 95c851903a62de9b5213ca5cc176238bb4b96b8c + evolution-data-server-3.22.0.tar.xz: 9c13174cd38a651b2c150be64b4e5423481b4e8a diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 8901bcd..87fda8e 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -4,43 +4,37 @@ %define base_version 3.0 %define dir_version 3.16 -%define oldmajor 6 -%define oldlibname %mklibname %{name} %{oldmajor} - -%define oldmajor2006 4 -%define oldlibname2006 %mklibname %{name} %{oldmajor2006} - %define camelmajor 52 -%define camel_libname %mklibname camel %{camelmajor} -%define camel_devel %mklibname camel -d +%define libcamel %mklibname camel %{camelmajor} +%define devcamel %mklibname camel -d %define ebackendmajor 10 -%define ebackend_libname %mklibname ebackend %{ebackendmajor} -%define ebackend_devel %mklibname ebackend -d +%define libebackend %mklibname ebackend %{ebackendmajor} +%define devebackend %mklibname ebackend -d %define ebookmajor 16 -%define ebook_libname %mklibname ebook %{ebookmajor} -%define ebook_devel %mklibname ebook -d +%define libebook %mklibname ebook %{ebookmajor} +%define devebook %mklibname ebook -d %define ebookcontactsmajor 1 -%define ebookcontacts_libname %mklibname ebook-contacts %{ebookcontactsmajor} -%define ebookcontacts_devel %mklibname ebook-contacts -d +%define libebookcontacts %mklibname ebook-contacts %{ebookcontactsmajor} +%define devebookcontacts %mklibname ebook-contacts -d %define ecalmajor 18 -%define ecal_libname %mklibname ecal %{ecalmajor} -%define ecal_devel %mklibname ecal -d +%define libecal %mklibname ecal %{ecalmajor} +%define devecal %mklibname ecal -d %define edatabookmajor 25 -%define edatabook_libname %mklibname edata-book %{edatabookmajor} -%define edatabook_devel %mklibname edata-book -d +%define libedatabook %mklibname edata-book %{edatabookmajor} +%define devedatabook %mklibname edata-book -d %define edatacalmajor 27 -%define edatacal_libname %mklibname edata-cal %{edatacalmajor} -%define edatacal_devel %mklibname edata-cal -d +%define libedatacal %mklibname edata-cal %{edatacalmajor} +%define devedatacal %mklibname edata-cal -d %define edataservermajor 20 -%define edataserver_libname %mklibname edataserver %{edataservermajor} -%define edataserver_devel %mklibname -d edataserver +%define libedataserver %mklibname edataserver %{edataservermajor} +%define devedataserver %mklibname edataserver -d %define girmajor 1.2 %define girname %mklibname %{name}-gir %{girmajor} @@ -48,40 +42,40 @@ Name: evolution-data-server Summary: Evolution Data Server Version: 3.16.4 -Release: 3 -License: LGPLv2+ +Release: 1 +License: LGPLv2+ Group: System/Libraries -URL: http://www.gnome.org/projects/evolution/ -Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz +Url: http://www.gnome.org/projects/evolution/ +Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz Source10: %{name}.rpmlintrc - BuildRequires: bison -BuildRequires: db-devel BuildRequires: gettext BuildRequires: gnome-common BuildRequires: gperf BuildRequires: gtk-doc BuildRequires: intltool +BuildRequires: vala-tools +BuildRequires: db-devel BuildRequires: openldap-devel -BuildRequires: krb5-devel -BuildRequires: pkgconfig(gio-2.0) >= 2.28 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.0 -BuildRequires: pkgconfig(gconf-2.0) >= 2.0.0 -BuildRequires: pkgconfig(libxml-2.0) >= 2.0.0 -BuildRequires: pkgconfig(libsoup-2.4) >= 2.31.2 -BuildRequires: pkgconfig(libgdata) >= 0.16.1 -BuildRequires: pkgconfig(goa-1.0) >= 3.12.0 +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gcr-base-3) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(goa-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gnome-keyring-1) >= 3.12.0 +BuildRequires: pkgconfig(gnome-keyring-1) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gweather-3.0) +BuildRequires: pkgconfig(krb5) +BuildRequires: pkgconfig(libgdata) +BuildRequires: pkgconfig(libical) +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(nspr) BuildRequires: pkgconfig(nss) -BuildRequires: pkgconfig(gweather-3.0) >= 3.12.0 -BuildRequires: pkgconfig(sqlite3) >= 3.5 -BuildRequires: pkgconfig(libical) >= 0.43 -BuildRequires: pkgconfig(oauth) >= 0.9.4 -BuildRequires: pkgconfig(gcr-base-3) >= 3.12 -BuildRequires: pkgconfig(libsecret-1) -BuildRequires: vala-devel vala-tools +BuildRequires: pkgconfig(oauth) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(vapigen) # workaround for libedbus-private library %ifarch x86_64 @@ -90,192 +84,10 @@ Provides: devel(libedbus-private(64bit)) Provides: devel(libedbus-private) %endif -Obsoletes: %oldlibname - %description Evolution Data Server provides a central location for your addressbook and calendar in the gnome desktop. -%package -n %{camel_libname} -Summary: Shared libraries for using Evolution Data Server -Group: System/Libraries -Obsoletes: %{_lib}camel43 - -%description -n %{camel_libname} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{ebackend_libname} -Summary: Shared libraries for using Evolution Data Server -Group: System/Libraries -Obsoletes: %{_lib}ebackend6 - -%description -n %{ebackend_libname} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{ebook_libname} -Summary: Shared libraries for using Evolution Data Server -Group: System/Libraries - -%description -n %{ebook_libname} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{ebookcontacts_libname} -Summary: Shared libraries for using Evolution Data Server -Group: System/Libraries - -%description -n %{ebookcontacts_libname} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{ecal_libname} -Summary: Shared libraries for using Evolution Data Server -Group: System/Libraries -Obsoletes: %{_lib}ecal15 - -%description -n %{ecal_libname} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{edatabook_libname} -Summary: Shared libraries for using Evolution Data Server -Group: System/Libraries -Obsoletes: %{_lib}edata-book17 - -%description -n %{edatabook_libname} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{edatacal_libname} -Summary: Shared libraries for using Evolution Data Server -Group: System/Libraries -Obsoletes: %{_lib}edata-cal20 - -%description -n %{edatacal_libname} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{edataserver_libname} -Summary: Shared libraries for using Evolution Data Server -Group: System/Libraries -Obsoletes: %{_lib}edataserver17 - -%description -n %{edataserver_libname} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{camel_devel} -Summary: Libraries and include files for using Evolution Data Server - camel -Group: Development/GNOME and GTK+ -Requires: %{camel_libname} = %{version}-%{release} - -%description -n %{camel_devel} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{ebackend_devel} -Summary: Libraries and include files for using Evolution Data Server - ebackend -Group: Development/GNOME and GTK+ -Requires: %{ebackend_libname} = %{version}-%{release} - -%description -n %{ebackend_devel} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{ebook_devel} -Summary: Libraries and include files for using Evolution Data Server - ebook -Group: Development/GNOME and GTK+ -Requires: %{ebook_libname} = %{version}-%{release} - -%description -n %{ebook_devel} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{ebookcontacts_devel} -Summary: Libraries and include files for using Evolution Data Server - ebookcontacts -Group: Development/GNOME and GTK+ -Requires: %{ebookcontacts_libname} = %{version}-%{release} - -%description -n %{ebookcontacts_devel} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{ecal_devel} -Summary: Libraries and include files for using Evolution Data Server - ecal -Group: Development/GNOME and GTK+ -Requires: %{ecal_libname} = %{version}-%{release} - -%description -n %{ecal_devel} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{edatabook_devel} -Summary: Libraries and include files for using Evolution Data Server - edatabook -Group: Development/GNOME and GTK+ -Requires: %{edatabook_libname} = %{version}-%{release} - -%description -n %{edatabook_devel} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{edatacal_devel} -Summary: Libraries and include files for using Evolution Data Server - edatacal -Group: Development/GNOME and GTK+ -Requires: %{edatacal_libname} = %{version}-%{release} - -%description -n %{edatacal_devel} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{edataserver_devel} -Summary: Libraries and include files for using Evolution Data Server -Group: Development/GNOME and GTK+ -Requires: %{edataserver_libname} = %{version}-%{release} -Provides: %{name}-devel = %{version}-%{release} -Obsoletes: %mklibname -d edataserver 9 - -%description -n %{edataserver_devel} -Evolution Data Server provides a central location for your addressbook -and calendar in the gnome desktop. - -%package -n %{girname} -Summary: GObject Introspection interface description for %{name} -Group: System/Libraries - -%description -n %{girname} -GObject Introspection interface description for %{name}. - -%prep -%setup -q -%apply_patches - -%build -%configure2_5x \ - --with-krb5=%{_prefix} \ - --with-krb5-libs=%{_libdir} \ - --with-libdb=%{_prefix} \ - --disable-static \ - --with-openldap=yes \ - --with-static-ldap=no \ - --enable-gtk-doc=yes \ - --disable-uoa \ - --enable-vala-bindings - -%make - -%install -%makeinstall_std - -# remove libtool archives for importers and the like -find %{buildroot}/%{_libdir} -name '*.la' -exec rm {} \; - -# give the libraries some executable bits -find %{buildroot} -name '*.so.*' -exec chmod +x {} \; - -%find_lang %{name}-%{dir_version} - %files -f %{name}-%{dir_version}.lang %doc COPYING NEWS %doc %{_datadir}/gtk-doc/html/eds/* @@ -288,7 +100,6 @@ find %{buildroot} -name '*.so.*' -exec chmod +x {} \; %{_libexecdir}/evolution-source-registry %{_libexecdir}/evolution-addressbook-factory-subprocess %{_libexecdir}/evolution-calendar-factory-subprocess - %attr(2755,root,mail) %{_libexecdir}/camel-lock-helper-%{api} %{_datadir}/%{name} %{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service @@ -297,7 +108,6 @@ find %{buildroot} -name '*.so.*' -exec chmod +x {} \; %{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.UserPrompter.service %{_datadir}/pixmaps/%{name} %{_datadir}/GConf/gsettings/evolution-data-server.convert - #GSettings %{_datadir}/glib-2.0/schemas/org.gnome.evolution.eds-shell.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.network-config.gschema.xml @@ -306,50 +116,156 @@ find %{buildroot} -name '*.so.*' -exec chmod +x {} \; %{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.calendar.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.gschema.xml -%files -n %{camel_libname} +#---------------------------------------------------------------------------- + +%package -n %{libcamel} +Summary: Shared libraries for using Evolution Data Server +Group: System/Libraries + +%description -n %{libcamel} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{libcamel} %{_libdir}/libcamel-%{api}.so.%{camelmajor}* -%files -n %{ebackend_libname} +#---------------------------------------------------------------------------- + +%package -n %{libebackend} +Summary: Shared libraries for using Evolution Data Server +Group: System/Libraries + +%description -n %{libebackend} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{libebackend} %{_libdir}/libebackend-%{api}.so.%{ebackendmajor}* -%files -n %{ebook_libname} +#---------------------------------------------------------------------------- + +%package -n %{libebook} +Summary: Shared libraries for using Evolution Data Server +Group: System/Libraries + +%description -n %{libebook} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{libebook} %{_libdir}/libebook-%{api}.so.%{ebookmajor}* -%files -n %{ebookcontacts_libname} +#---------------------------------------------------------------------------- + +%package -n %{libebookcontacts} +Summary: Shared libraries for using Evolution Data Server +Group: System/Libraries + +%description -n %{libebookcontacts} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{libebookcontacts} %{_libdir}/libebook-contacts-%{api}.so.%{ebookcontactsmajor}* -%files -n %{ecal_libname} +#---------------------------------------------------------------------------- + +%package -n %{libecal} +Summary: Shared libraries for using Evolution Data Server +Group: System/Libraries + +%description -n %{libecal} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{libecal} %{_libdir}/libecal-%{api}.so.%{ecalmajor}* -%files -n %{edatabook_libname} +#---------------------------------------------------------------------------- + +%package -n %{libedatabook} +Summary: Shared libraries for using Evolution Data Server +Group: System/Libraries + +%description -n %{libedatabook} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{libedatabook} %{_libdir}/libedata-book-%{api}.so.%{edatabookmajor}* -%files -n %{edatacal_libname} +#---------------------------------------------------------------------------- + +%package -n %{libedatacal} +Summary: Shared libraries for using Evolution Data Server +Group: System/Libraries + +%description -n %{libedatacal} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{libedatacal} %{_libdir}/libedata-cal-%{api}.so.%{edatacalmajor}* -%files -n %{edataserver_libname} +#---------------------------------------------------------------------------- + +%package -n %{libedataserver} +Summary: Shared libraries for using Evolution Data Server +Group: System/Libraries + +%description -n %{libedataserver} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{libedataserver} %{_libdir}/libedataserver-%{api}.so.%{edataservermajor}* %{_libdir}/libedataserverui-%{api}.so.* -%files -n %{girname} -%{_libdir}/girepository-1.0/EDataServer-%{girmajor}.typelib -%{_libdir}/girepository-1.0/EBook-%{girmajor}.typelib -%{_libdir}/girepository-1.0/EBookContacts-%{girmajor}.typelib +#---------------------------------------------------------------------------- -%files -n %{camel_devel} +%package -n %{devcamel} +Summary: Libraries and include files for using Evolution Data Server - camel +Group: Development/GNOME and GTK+ +Requires: %{libcamel} = %{EVRD} + +%description -n %{devcamel} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{devcamel} %doc %{_datadir}/gtk-doc/html/camel/* %{_includedir}/%{name}/camel %{_libdir}/pkgconfig/camel-%{api}.pc -##{_libdir}/pkgconfig/camel-provider-%{api}.pc %{_libdir}/libcamel-%{api}.so -##{_libdir}/libcamel-provider-%{api}.so -%files -n %{ebackend_devel} +#---------------------------------------------------------------------------- + +%package -n %{devebackend} +Summary: Libraries and include files for using Evolution Data Server - ebackend +Group: Development/GNOME and GTK+ +Requires: %{libebackend} = %{EVRD} + +%description -n %{devebackend} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{devebackend} %{_includedir}/%{name}/libebackend %{_libdir}/pkgconfig/libebackend-%{api}.pc %{_libdir}/libebackend-%{api}.so -%files -n %{ebook_devel} +#---------------------------------------------------------------------------- + +%package -n %{devebook} +Summary: Libraries and include files for using Evolution Data Server - ebook +Group: Development/GNOME and GTK+ +Requires: %{libebook} = %{EVRD} + +%description -n %{devebook} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{devebook} %{_includedir}/%{name}/libebook/ %{_libdir}/pkgconfig/libebook-%{api}.pc %{_libdir}/libebook-%{api}.so @@ -357,7 +273,18 @@ find %{buildroot} -name '*.so.*' -exec chmod +x {} \; %{_datadir}/vala/vapi/libebook-1.2.deps %{_datadir}/vala/vapi/libebook-1.2.vapi -%files -n %{ebookcontacts_devel} +#---------------------------------------------------------------------------- + +%package -n %{devebookcontacts} +Summary: Libraries and include files for using Evolution Data Server - ebookcontacts +Group: Development/GNOME and GTK+ +Requires: %{libebookcontacts} = %{EVRD} + +%description -n %{devebookcontacts} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{devebookcontacts} %{_includedir}/%{name}/libebook-contacts/ %{_libdir}/pkgconfig/libebook-contacts-%{api}.pc %{_libdir}/libebook-contacts-%{api}.so @@ -365,22 +292,67 @@ find %{buildroot} -name '*.so.*' -exec chmod +x {} \; %{_datadir}/vala/vapi/libebook-contacts-1.2.deps %{_datadir}/vala/vapi/libebook-contacts-1.2.vapi -%files -n %{ecal_devel} +#---------------------------------------------------------------------------- + +%package -n %{devecal} +Summary: Libraries and include files for using Evolution Data Server - ecal +Group: Development/GNOME and GTK+ +Requires: %{libecal} = %{EVRD} + +%description -n %{devecal} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{devecal} %{_includedir}/%{name}/libecal/ %{_libdir}/pkgconfig/libecal-%{api}.pc %{_libdir}/libecal-%{api}.so -%files -n %{edatabook_devel} +#---------------------------------------------------------------------------- + +%package -n %{devedatabook} +Summary: Libraries and include files for using Evolution Data Server - edatabook +Group: Development/GNOME and GTK+ +Requires: %{libedatabook} = %{EVRD} + +%description -n %{devedatabook} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{devedatabook} %{_includedir}/%{name}/libedata-book/ %{_libdir}/pkgconfig/libedata-book-%{api}.pc %{_libdir}/libedata-book-%{api}.so -%files -n %{edatacal_devel} +#---------------------------------------------------------------------------- + +%package -n %{devedatacal} +Summary: Libraries and include files for using Evolution Data Server - edatacal +Group: Development/GNOME and GTK+ +Requires: %{libedatacal} = %{EVRD} + +%description -n %{devedatacal} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{devedatacal} %{_includedir}/%{name}/libedata-cal/ %{_libdir}/pkgconfig/libedata-cal-%{api}.pc %{_libdir}/libedata-cal-%{api}.so -%files -n %{edataserver_devel} +#---------------------------------------------------------------------------- + +%package -n %{devedataserver} +Summary: Libraries and include files for using Evolution Data Server +Group: Development/GNOME and GTK+ +Requires: %{libedataserver} = %{EVRD} +Provides: %{name}-devel = %{EVRD} + +%description -n %{devedataserver} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{devedataserver} %{_includedir}/%{name}/libedataserver/ %{_includedir}/%{name}/libedataserverui/ %{_libdir}/pkgconfig/libedataserver-%{api}.pc @@ -392,3 +364,45 @@ find %{buildroot} -name '*.so.*' -exec chmod +x {} \; %{_datadir}/vala/vapi/libedataserver-1.2.deps %{_datadir}/vala/vapi/libedataserver-1.2.vapi +#---------------------------------------------------------------------------- + +%package -n %{girname} +Summary: GObject Introspection interface description for %{name} +Group: System/Libraries + +%description -n %{girname} +GObject Introspection interface description for %{name}. + +%files -n %{girname} +%{_libdir}/girepository-1.0/EDataServer-%{girmajor}.typelib +%{_libdir}/girepository-1.0/EBook-%{girmajor}.typelib +%{_libdir}/girepository-1.0/EBookContacts-%{girmajor}.typelib + +#---------------------------------------------------------------------------- + +%prep +%setup -q +%apply_patches + +%build +%configure2_5x \ + --with-krb5=%{_prefix} \ + --with-krb5-libs=%{_libdir} \ + --with-libdb=%{_prefix} \ + --disable-static \ + --with-openldap=yes \ + --with-static-ldap=no \ + --enable-gtk-doc=yes \ + --disable-uoa \ + --enable-vala-bindings + +%make + +%install +%makeinstall_std + +# give the libraries some executable bits +find %{buildroot} -name '*.so.*' -exec chmod +x {} \; + +%find_lang %{name}-%{dir_version} + From 3822cb358398d9f79966b51a0aa7d64757919faa Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 3 Oct 2016 13:36:18 +1000 Subject: [PATCH 03/21] New version 3.22.0 (fix version in spec) --- evolution-data-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 87fda8e..3cfd969 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -41,7 +41,7 @@ Name: evolution-data-server Summary: Evolution Data Server -Version: 3.16.4 +Version: 3.22.0 Release: 1 License: LGPLv2+ Group: System/Libraries From 42a482901b4ce50d25e1c483ee42cc81cc97b30a Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 3 Oct 2016 13:40:20 +1000 Subject: [PATCH 04/21] Split libedataserverui library from libedataserver package --- evolution-data-server.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 3cfd969..6cf68e5 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -32,6 +32,8 @@ %define libedatacal %mklibname edata-cal %{edatacalmajor} %define devedatacal %mklibname edata-cal -d +%define edataserveruimajor 1 +%define libedataserverui %mklibname edataserverui %{edataserveruimajor} %define edataservermajor 20 %define libedataserver %mklibname edataserver %{edataservermajor} %define devedataserver %mklibname edataserver -d @@ -219,7 +221,20 @@ and calendar in the gnome desktop. %files -n %{libedataserver} %{_libdir}/libedataserver-%{api}.so.%{edataservermajor}* -%{_libdir}/libedataserverui-%{api}.so.* + +#---------------------------------------------------------------------------- + +%package -n %{libedataserverui} +Summary: Shared libraries for using Evolution Data Server +Group: System/Libraries +Conflicts: %{_lib}edataserver20 < 3.22.0 + +%description -n %{libedataserverui} +Evolution Data Server provides a central location for your addressbook +and calendar in the gnome desktop. + +%files -n %{libedataserverui} +%{_libdir}/libedataserverui-%{api}.so.%{edataserveruimajor}* #---------------------------------------------------------------------------- @@ -346,6 +361,7 @@ and calendar in the gnome desktop. Summary: Libraries and include files for using Evolution Data Server Group: Development/GNOME and GTK+ Requires: %{libedataserver} = %{EVRD} +Requires: %{libedataserverui} = %{EVRD} Provides: %{name}-devel = %{EVRD} %description -n %{devedataserver} From dc740dab7e7b9c0828db50a560c0deea39e41b2b Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 3 Oct 2016 13:51:38 +1000 Subject: [PATCH 05/21] Disable google-auth for now --- evolution-data-server.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 6cf68e5..d6ba6c9 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -406,6 +406,7 @@ GObject Introspection interface description for %{name}. --with-krb5-libs=%{_libdir} \ --with-libdb=%{_prefix} \ --disable-static \ + --disable-google-auth \ --with-openldap=yes \ --with-static-ldap=no \ --enable-gtk-doc=yes \ From aab5aa908a624de43d67f0eba93d7341514226fc Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 3 Oct 2016 14:05:18 +1000 Subject: [PATCH 06/21] Adjust locales --- evolution-data-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index d6ba6c9..3b1c0d5 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -2,7 +2,7 @@ %define api 1.2 %define base_version 3.0 -%define dir_version 3.16 +%define dir_version 3.22 %define camelmajor 52 %define libcamel %mklibname camel %{camelmajor} From 2c4c69fda44f70a77f0edaa4915aff241b9ed1b8 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 3 Oct 2016 14:26:26 +1000 Subject: [PATCH 07/21] Properly name library packages (fix majors, add api etc) --- evolution-data-server.rpmlintrc | 1 - evolution-data-server.spec | 35 +++++++++++++++++++-------------- 2 files changed, 20 insertions(+), 16 deletions(-) delete mode 100644 evolution-data-server.rpmlintrc diff --git a/evolution-data-server.rpmlintrc b/evolution-data-server.rpmlintrc deleted file mode 100644 index 59999e5..0000000 --- a/evolution-data-server.rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter("E: incoherent-version-in-name") diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 3b1c0d5..3764da5 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -4,38 +4,38 @@ %define base_version 3.0 %define dir_version 3.22 -%define camelmajor 52 -%define libcamel %mklibname camel %{camelmajor} +%define camelmajor 59 +%define libcamel %mklibname camel %{api} %{camelmajor} %define devcamel %mklibname camel -d %define ebackendmajor 10 -%define libebackend %mklibname ebackend %{ebackendmajor} +%define libebackend %mklibname ebackend %{api} %{ebackendmajor} %define devebackend %mklibname ebackend -d %define ebookmajor 16 -%define libebook %mklibname ebook %{ebookmajor} +%define libebook %mklibname ebook %{api} %{ebookmajor} %define devebook %mklibname ebook -d -%define ebookcontactsmajor 1 -%define libebookcontacts %mklibname ebook-contacts %{ebookcontactsmajor} +%define ebookcontactsmajor 2 +%define libebookcontacts %mklibname ebook-contacts %{api} %{ebookcontactsmajor} %define devebookcontacts %mklibname ebook-contacts -d -%define ecalmajor 18 -%define libecal %mklibname ecal %{ecalmajor} +%define ecalmajor 19 +%define libecal %mklibname ecal %{api} %{ecalmajor} %define devecal %mklibname ecal -d %define edatabookmajor 25 -%define libedatabook %mklibname edata-book %{edatabookmajor} +%define libedatabook %mklibname edata-book %{api} %{edatabookmajor} %define devedatabook %mklibname edata-book -d -%define edatacalmajor 27 -%define libedatacal %mklibname edata-cal %{edatacalmajor} +%define edatacalmajor 28 +%define libedatacal %mklibname edata-cal %{api} %{edatacalmajor} %define devedatacal %mklibname edata-cal -d %define edataserveruimajor 1 -%define libedataserverui %mklibname edataserverui %{edataserveruimajor} -%define edataservermajor 20 -%define libedataserver %mklibname edataserver %{edataservermajor} +%define libedataserverui %mklibname edataserverui %{api} %{edataserveruimajor} +%define edataservermajor 22 +%define libedataserver %mklibname edataserver %{api} %{edataservermajor} %define devedataserver %mklibname edataserver -d %define girmajor 1.2 @@ -49,7 +49,6 @@ License: LGPLv2+ Group: System/Libraries Url: http://www.gnome.org/projects/evolution/ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz -Source10: %{name}.rpmlintrc BuildRequires: bison BuildRequires: gettext BuildRequires: gnome-common @@ -136,6 +135,8 @@ and calendar in the gnome desktop. %package -n %{libebackend} Summary: Shared libraries for using Evolution Data Server Group: System/Libraries +Conflicts: %{_lib}ebackend10 < 3.22.0 +Obsoletes: %{_lib}ebackend10 < 3.22.0 %description -n %{libebackend} Evolution Data Server provides a central location for your addressbook @@ -149,6 +150,8 @@ and calendar in the gnome desktop. %package -n %{libebook} Summary: Shared libraries for using Evolution Data Server Group: System/Libraries +Conflicts: %{_lib}ebook16 < 3.22.0 +Obsoletes: %{_lib}ebook16 < 3.22.0 %description -n %{libebook} Evolution Data Server provides a central location for your addressbook @@ -188,6 +191,8 @@ and calendar in the gnome desktop. %package -n %{libedatabook} Summary: Shared libraries for using Evolution Data Server Group: System/Libraries +Conflicts: %{_lib}edata-book25 < 3.22.0 +Obsoletes: %{_lib}edata-book25 < 3.22.0 %description -n %{libedatabook} Evolution Data Server provides a central location for your addressbook From e09f5ced7468a4dd3c949a03c0a1513314a622b3 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 3 Oct 2016 14:30:58 +1000 Subject: [PATCH 08/21] Add new files --- evolution-data-server.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 3764da5..3170077 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -93,6 +93,7 @@ and calendar in the gnome desktop. %doc COPYING NEWS %doc %{_datadir}/gtk-doc/html/eds/* %{_libexecdir}/%{name} +%{_libexecdir}/camel-gpg-photo-saver %{_libexecdir}/camel-index-control-%{api} %{_libexecdir}/evolution-addressbook-factory %{_libexecdir}/evolution-calendar-factory @@ -116,6 +117,10 @@ and calendar in the gnome desktop. %{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.addressbook.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.calendar.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.gschema.xml +%{_userunitdir}/evolution-addressbook-factory.service +%{_userunitdir}/evolution-calendar-factory.service +%{_userunitdir}/evolution-source-registry.service +%{_userunitdir}/evolution-user-prompter.service #---------------------------------------------------------------------------- @@ -257,6 +262,9 @@ and calendar in the gnome desktop. %{_includedir}/%{name}/camel %{_libdir}/pkgconfig/camel-%{api}.pc %{_libdir}/libcamel-%{api}.so +%{_datadir}/gir-1.0/Camel-%{girmajor}.gir +%{_datadir}/vala/vapi/camel-%{api}.deps +%{_datadir}/vala/vapi/camel-%{api}.vapi #---------------------------------------------------------------------------- @@ -290,8 +298,8 @@ and calendar in the gnome desktop. %{_libdir}/pkgconfig/libebook-%{api}.pc %{_libdir}/libebook-%{api}.so %{_datadir}/gir-1.0/EBook-%{girmajor}.gir -%{_datadir}/vala/vapi/libebook-1.2.deps -%{_datadir}/vala/vapi/libebook-1.2.vapi +%{_datadir}/vala/vapi/libebook-%{api}.deps +%{_datadir}/vala/vapi/libebook-%{api}.vapi #---------------------------------------------------------------------------- @@ -309,8 +317,8 @@ and calendar in the gnome desktop. %{_libdir}/pkgconfig/libebook-contacts-%{api}.pc %{_libdir}/libebook-contacts-%{api}.so %{_datadir}/gir-1.0/EBookContacts-%{girmajor}.gir -%{_datadir}/vala/vapi/libebook-contacts-1.2.deps -%{_datadir}/vala/vapi/libebook-contacts-1.2.vapi +%{_datadir}/vala/vapi/libebook-contacts-%{api}.deps +%{_datadir}/vala/vapi/libebook-contacts-%{api}.vapi #---------------------------------------------------------------------------- @@ -382,8 +390,8 @@ and calendar in the gnome desktop. %{_libdir}/libedataserver-%{api}.so %{_libdir}/libedataserverui-%{api}.so %{_datadir}/gir-1.0/EDataServer-%{girmajor}.gir -%{_datadir}/vala/vapi/libedataserver-1.2.deps -%{_datadir}/vala/vapi/libedataserver-1.2.vapi +%{_datadir}/vala/vapi/libedataserver-%{api}.deps +%{_datadir}/vala/vapi/libedataserver-%{api}.vapi #---------------------------------------------------------------------------- From c0c2193b74fe38bae7b903cf7e81dc4b494de6a3 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 14 Oct 2016 21:07:12 +0400 Subject: [PATCH 09/21] MassBuild#1169: Increase release tag --- evolution-data-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 3170077..f2e5d3e 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -44,7 +44,7 @@ Name: evolution-data-server Summary: Evolution Data Server Version: 3.22.0 -Release: 1 +Release: 2 License: LGPLv2+ Group: System/Libraries Url: http://www.gnome.org/projects/evolution/ From 7be0f2fe58c4b8534bf441ab506e3694d9ac17c9 Mon Sep 17 00:00:00 2001 From: tremod Date: Sun, 30 Oct 2016 13:21:28 +0200 Subject: [PATCH 10/21] Update to 3.22.1 --- .abf.yml | 2 +- evolution-data-server.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.abf.yml b/.abf.yml index 5729612..d2fa282 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - evolution-data-server-3.22.0.tar.xz: 9c13174cd38a651b2c150be64b4e5423481b4e8a + evolution-data-server-3.22.1.tar.xz: 75201ba328604237b93c6f7c11331876e9628cdf diff --git a/evolution-data-server.spec b/evolution-data-server.spec index f2e5d3e..f2e2d0a 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -43,8 +43,8 @@ Name: evolution-data-server Summary: Evolution Data Server -Version: 3.22.0 -Release: 2 +Version: 3.22.1 +Release: 1 License: LGPLv2+ Group: System/Libraries Url: http://www.gnome.org/projects/evolution/ From b55102dceb74c5e886f22062fd676ce5a21514ea Mon Sep 17 00:00:00 2001 From: tremod Date: Mon, 7 Nov 2016 21:04:08 +0200 Subject: [PATCH 11/21] Update to 3.22.2 --- .abf.yml | 2 +- evolution-data-server.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.abf.yml b/.abf.yml index d2fa282..8195d16 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - evolution-data-server-3.22.1.tar.xz: 75201ba328604237b93c6f7c11331876e9628cdf + evolution-data-server-3.22.2.tar.xz: 632af36a37436710bb4b2c4e6e49fe1822a53691 diff --git a/evolution-data-server.spec b/evolution-data-server.spec index f2e2d0a..0a5e127 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -43,7 +43,7 @@ Name: evolution-data-server Summary: Evolution Data Server -Version: 3.22.1 +Version: 3.22.2 Release: 1 License: LGPLv2+ Group: System/Libraries From 3406e1472308dd7db22ac56db9537a3594d50d8a Mon Sep 17 00:00:00 2001 From: tremod Date: Mon, 12 Dec 2016 23:56:22 +0200 Subject: [PATCH 12/21] Update to 3.22.3 --- .abf.yml | 2 +- evolution-data-server.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.abf.yml b/.abf.yml index 8195d16..a2f3f90 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - evolution-data-server-3.22.2.tar.xz: 632af36a37436710bb4b2c4e6e49fe1822a53691 + evolution-data-server-3.22.3.tar.xz: 7accf35f1ababb9537554b1b09fc3cc8f2788f4e diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 0a5e127..6a2497d 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -43,7 +43,7 @@ Name: evolution-data-server Summary: Evolution Data Server -Version: 3.22.2 +Version: 3.22.3 Release: 1 License: LGPLv2+ Group: System/Libraries From 6fd24410090995974721a22a23c9903e0219b5a7 Mon Sep 17 00:00:00 2001 From: tremod Date: Mon, 16 Jan 2017 21:13:18 +0200 Subject: [PATCH 13/21] Update to 3.22.4 --- .abf.yml | 2 +- evolution-data-server.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.abf.yml b/.abf.yml index a2f3f90..9dde031 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - evolution-data-server-3.22.3.tar.xz: 7accf35f1ababb9537554b1b09fc3cc8f2788f4e + evolution-data-server-3.22.4.tar.xz: 39a58bde0e3b68d418f0e72ad03887cbc54218bc diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 6a2497d..33e8574 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -43,7 +43,7 @@ Name: evolution-data-server Summary: Evolution Data Server -Version: 3.22.3 +Version: 3.22.4 Release: 1 License: LGPLv2+ Group: System/Libraries From 87561cc0fd07f300c878377847c3e6dd389357a8 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sat, 4 Feb 2017 18:27:00 +0300 Subject: [PATCH 14/21] MassBuild#1230: Increase release tag --- evolution-data-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 33e8574..3fe7cf2 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -44,7 +44,7 @@ Name: evolution-data-server Summary: Evolution Data Server Version: 3.22.4 -Release: 1 +Release: 2 License: LGPLv2+ Group: System/Libraries Url: http://www.gnome.org/projects/evolution/ From d8d25aec34e10e2a46e34273b3b873c75d11b2b6 Mon Sep 17 00:00:00 2001 From: tremod Date: Fri, 24 Feb 2017 22:28:24 +0200 Subject: [PATCH 15/21] Update to 3.22.5 --- .abf.yml | 2 +- evolution-data-server.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.abf.yml b/.abf.yml index 9dde031..4b487ec 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - evolution-data-server-3.22.4.tar.xz: 39a58bde0e3b68d418f0e72ad03887cbc54218bc + evolution-data-server-3.22.5.tar.xz: bd26eee1676ef6a4f285ae7f0fc2b338ad5a8055 diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 3fe7cf2..e26b31e 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -43,8 +43,8 @@ Name: evolution-data-server Summary: Evolution Data Server -Version: 3.22.4 -Release: 2 +Version: 3.22.5 +Release: 1 License: LGPLv2+ Group: System/Libraries Url: http://www.gnome.org/projects/evolution/ From 361f332ef4665d31d87da881dd44f75b1bf47039 Mon Sep 17 00:00:00 2001 From: tremod Date: Sat, 2 Sep 2017 14:39:15 +0200 Subject: [PATCH 16/21] Update to 3.24.5 --- .abf.yml | 2 +- evolution-data-server.spec | 42 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.abf.yml b/.abf.yml index 4b487ec..94f8d34 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - evolution-data-server-3.22.5.tar.xz: bd26eee1676ef6a4f285ae7f0fc2b338ad5a8055 + evolution-data-server-3.24.5.tar.xz: 0a66c8f595b766a9ce193e32ec045d535ebf56f6 diff --git a/evolution-data-server.spec b/evolution-data-server.spec index e26b31e..853dacb 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -2,9 +2,9 @@ %define api 1.2 %define base_version 3.0 -%define dir_version 3.22 +%define dir_version 3.24 -%define camelmajor 59 +%define camelmajor 60 %define libcamel %mklibname camel %{api} %{camelmajor} %define devcamel %mklibname camel -d @@ -12,7 +12,7 @@ %define libebackend %mklibname ebackend %{api} %{ebackendmajor} %define devebackend %mklibname ebackend -d -%define ebookmajor 16 +%define ebookmajor 19 %define libebook %mklibname ebook %{api} %{ebookmajor} %define devebook %mklibname ebook -d @@ -43,7 +43,7 @@ Name: evolution-data-server Summary: Evolution Data Server -Version: 3.22.5 +Version: 3.24.5 Release: 1 License: LGPLv2+ Group: System/Libraries @@ -58,6 +58,7 @@ BuildRequires: intltool BuildRequires: vala-tools BuildRequires: db-devel BuildRequires: openldap-devel +BuildRequires: cmake BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gcr-base-3) BuildRequires: pkgconfig(gio-2.0) @@ -74,9 +75,11 @@ BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(nspr) BuildRequires: pkgconfig(nss) +BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(oauth) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(vapigen) +BuildRequires: pkgconfig(webkit2gtk-4.0) # workaround for libedbus-private library %ifarch x86_64 @@ -91,7 +94,6 @@ and calendar in the gnome desktop. %files -f %{name}-%{dir_version}.lang %doc COPYING NEWS -%doc %{_datadir}/gtk-doc/html/eds/* %{_libexecdir}/%{name} %{_libexecdir}/camel-gpg-photo-saver %{_libexecdir}/camel-index-control-%{api} @@ -258,7 +260,6 @@ Evolution Data Server provides a central location for your addressbook and calendar in the gnome desktop. %files -n %{devcamel} -%doc %{_datadir}/gtk-doc/html/camel/* %{_includedir}/%{name}/camel %{_libdir}/pkgconfig/camel-%{api}.pc %{_libdir}/libcamel-%{api}.so @@ -390,9 +391,11 @@ and calendar in the gnome desktop. %{_libdir}/libedataserver-%{api}.so %{_libdir}/libedataserverui-%{api}.so %{_datadir}/gir-1.0/EDataServer-%{girmajor}.gir +%{_datadir}/gir-1.0/EDataServerUI-%{girmajor}.gir %{_datadir}/vala/vapi/libedataserver-%{api}.deps %{_datadir}/vala/vapi/libedataserver-%{api}.vapi - +%{_datadir}/vala/vapi/libedataserverui-%{api}.deps +%{_datadir}/vala/vapi/libedataserverui-%{api}.vapi #---------------------------------------------------------------------------- %package -n %{girname} @@ -403,7 +406,9 @@ Group: System/Libraries GObject Introspection interface description for %{name}. %files -n %{girname} +%{_libdir}/girepository-1.0/Camel-%{girmajor}.typelib %{_libdir}/girepository-1.0/EDataServer-%{girmajor}.typelib +%{_libdir}/girepository-1.0/EDataServerUI-%{girmajor}.typelib %{_libdir}/girepository-1.0/EBook-%{girmajor}.typelib %{_libdir}/girepository-1.0/EBookContacts-%{girmajor}.typelib @@ -411,25 +416,20 @@ GObject Introspection interface description for %{name}. %prep %setup -q -%apply_patches %build -%configure2_5x \ - --with-krb5=%{_prefix} \ - --with-krb5-libs=%{_libdir} \ - --with-libdb=%{_prefix} \ - --disable-static \ - --disable-google-auth \ - --with-openldap=yes \ - --with-static-ldap=no \ - --enable-gtk-doc=yes \ - --disable-uoa \ - --enable-vala-bindings - +%cmake \ + -DENABLE_UOA=OFF \ + -DENABLE_VALA_BINDINGS=ON \ + -DENABLE_INTROSPECTION=ON \ + -DLIBEXEC_INSTALL_DIR=%{_libexecdir} \ + -DSHARE_INSTALL_PREFIX=%{_datadir} \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR=%{_libdir} %make %install -%makeinstall_std +%makeinstall_std -C build # give the libraries some executable bits find %{buildroot} -name '*.so.*' -exec chmod +x {} \; From 75dcb8a0016ee8962614abe95f9dd0f4b9c723d4 Mon Sep 17 00:00:00 2001 From: tremod Date: Sat, 9 Sep 2017 18:33:36 +0200 Subject: [PATCH 17/21] Update to 3.24.6 --- .abf.yml | 2 +- evolution-data-server.spec | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.abf.yml b/.abf.yml index 94f8d34..e162e43 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - evolution-data-server-3.24.5.tar.xz: 0a66c8f595b766a9ce193e32ec045d535ebf56f6 + evolution-data-server-3.24.6.tar.xz: 649d3ca9ca60909f3481d7aa12c90961476c0ac0 diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 853dacb..b903d85 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -43,7 +43,7 @@ Name: evolution-data-server Summary: Evolution Data Server -Version: 3.24.5 +Version: 3.24.6 Release: 1 License: LGPLv2+ Group: System/Libraries @@ -425,7 +425,8 @@ GObject Introspection interface description for %{name}. -DLIBEXEC_INSTALL_DIR=%{_libexecdir} \ -DSHARE_INSTALL_PREFIX=%{_datadir} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DLIB_INSTALL_DIR=%{_libdir} + -DLIB_INSTALL_DIR=%{_libdir} \ + -DCMAKE_SKIP_RPATH:BOOL=OFF %make %install From d1ea6095d8548b88cd5210ff80f1fdf815e957c2 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 6 Mar 2018 13:05:12 +1000 Subject: [PATCH 18/21] New version 3.26.6 --- .abf.yml | 2 +- evolution-data-server.spec | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.abf.yml b/.abf.yml index e162e43..9670982 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - evolution-data-server-3.24.6.tar.xz: 649d3ca9ca60909f3481d7aa12c90961476c0ac0 + evolution-data-server-3.26.6.tar.xz: 7274f74b66520eb8b08a91d72d581647c1672105 diff --git a/evolution-data-server.spec b/evolution-data-server.spec index b903d85..1d99e2c 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -2,7 +2,6 @@ %define api 1.2 %define base_version 3.0 -%define dir_version 3.24 %define camelmajor 60 %define libcamel %mklibname camel %{api} %{camelmajor} @@ -43,13 +42,14 @@ Name: evolution-data-server Summary: Evolution Data Server -Version: 3.24.6 +Version: 3.26.6 Release: 1 License: LGPLv2+ Group: System/Libraries Url: http://www.gnome.org/projects/evolution/ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz BuildRequires: bison +BuildRequires: cmake BuildRequires: gettext BuildRequires: gnome-common BuildRequires: gperf @@ -58,7 +58,6 @@ BuildRequires: intltool BuildRequires: vala-tools BuildRequires: db-devel BuildRequires: openldap-devel -BuildRequires: cmake BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gcr-base-3) BuildRequires: pkgconfig(gio-2.0) @@ -92,7 +91,7 @@ Provides: devel(libedbus-private) Evolution Data Server provides a central location for your addressbook and calendar in the gnome desktop. -%files -f %{name}-%{dir_version}.lang +%files -f %{name}.lang %doc COPYING NEWS %{_libexecdir}/%{name} %{_libexecdir}/camel-gpg-photo-saver @@ -435,5 +434,5 @@ GObject Introspection interface description for %{name}. # give the libraries some executable bits find %{buildroot} -name '*.so.*' -exec chmod +x {} \; -%find_lang %{name}-%{dir_version} +%find_lang %{name} From 91aba151decd983c8766303538c9b4d91a965040 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Wed, 18 Jul 2018 23:07:44 +1000 Subject: [PATCH 19/21] New version 3.28.3 --- .abf.yml | 2 +- evolution-data-server.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.abf.yml b/.abf.yml index 9670982..9f4d005 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - evolution-data-server-3.26.6.tar.xz: 7274f74b66520eb8b08a91d72d581647c1672105 + evolution-data-server-3.28.3.tar.xz: 9e4456e26a34d9d52281dc7d0b71f1bf111aea87 diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 1d99e2c..acdc2b2 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -42,7 +42,7 @@ Name: evolution-data-server Summary: Evolution Data Server -Version: 3.26.6 +Version: 3.28.3 Release: 1 License: LGPLv2+ Group: System/Libraries From ce41022971bba149fbaf0b56d0a231b21e5042c8 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Thu, 19 Jul 2018 13:16:51 +1000 Subject: [PATCH 20/21] Bump majors for libcamel, libedataserver and libedataserverui --- evolution-data-server.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index acdc2b2..2aa79c1 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -3,7 +3,7 @@ %define api 1.2 %define base_version 3.0 -%define camelmajor 60 +%define camelmajor 61 %define libcamel %mklibname camel %{api} %{camelmajor} %define devcamel %mklibname camel -d @@ -31,9 +31,9 @@ %define libedatacal %mklibname edata-cal %{api} %{edatacalmajor} %define devedatacal %mklibname edata-cal -d -%define edataserveruimajor 1 +%define edataserveruimajor 2 %define libedataserverui %mklibname edataserverui %{api} %{edataserveruimajor} -%define edataservermajor 22 +%define edataservermajor 23 %define libedataserver %mklibname edataserver %{api} %{edataservermajor} %define devedataserver %mklibname edataserver -d From 53e79d6611ac181fc5847ad61cfcc89b720e9d14 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Thu, 24 Jan 2019 11:56:04 +0300 Subject: [PATCH 21/21] Rebuild with krb5-1.16.2 and openldap-2.4.46 --- evolution-data-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 2aa79c1..a9fe297 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -43,7 +43,7 @@ Name: evolution-data-server Summary: Evolution Data Server Version: 3.28.3 -Release: 1 +Release: 2 License: LGPLv2+ Group: System/Libraries Url: http://www.gnome.org/projects/evolution/