X-Git-Url: https://git.pld-linux.org/?p=packages%2Fevolution-data-server.git;a=blobdiff_plain;f=evolution-data-server.spec;h=e7838c800c31d01886b3c7c7de6b6eb66722467e;hp=923d63b43671306eff441b78f2efeb6e39c280dc;hb=42a2ef57874e53b0b67ef47a70ef43b83ee6f503;hpb=7698fe82f456c105358a6629b2026199756cd35a diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 923d63b..e7838c8 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -1,62 +1,68 @@ # # Conditional build: %bcond_without apidocs # do not build and package API docs -%bcond_without kerberos5 # build without kerberos5 support -%bcond_without ldap # build without ldap support +%bcond_without kerberos5 # build without Kerberos5 support +%bcond_without ldap # build without LDAP support %bcond_without static_libs # do not build static libs +%bcond_without uoa # single sign-on (aka Ubuntu Online Accounts) %bcond_without vala # do not build Vala API -# -%define basever 3.6 + +%define basever 3.18 %define apiver 1.2 -%define apiver2 3.0 -# Summary: Evolution data server Summary(pl.UTF-8): Serwer danych Evolution Name: evolution-data-server -Version: 3.6.3 +Version: 3.18.2 Release: 1 License: LGPL v2+ Group: X11/Libraries -Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.6/%{name}-%{version}.tar.xz -# Source0-md5: 61da6b2895c2a77cc766ed9535894fb3 +Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.18/%{name}-%{version}.tar.xz +# Source0-md5: bd6b559fc7fa4bf10f2f70d9afad8f83 URL: http://www.gnome.org/projects/evolution/ BuildRequires: autoconf >= 2.62 BuildRequires: automake >= 1:1.11 BuildRequires: docbook-dtd412-xml BuildRequires: gcr-devel >= 3.4.0 -BuildRequires: gettext-devel >= 0.18.1 -BuildRequires: glib2-devel >= 1:2.32.0 +BuildRequires: gcr-ui-devel >= 3.4.0 +BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: glib2-devel >= 1:2.40.0 BuildRequires: gnome-common >= 2.20.0 -BuildRequires: gnome-online-accounts-devel >= 3.5.0 +BuildRequires: gnome-online-accounts-devel >= 3.8.0 BuildRequires: gobject-introspection-devel >= 0.10.0 BuildRequires: gperf -BuildRequires: gtk+3-devel >= 3.2.0 +BuildRequires: gtk+3-devel >= 3.10.0 %{?with_apidocs:BuildRequires: gtk-doc >= 1.14} %{?with_kerberos5:BuildRequires: heimdal-devel} BuildRequires: intltool >= 0.40.0 -BuildRequires: libgdata-devel >= 0.10.0 -BuildRequires: libgnome-keyring-devel >= 2.26.0 -BuildRequires: libgweather-devel >= 3.5.0 +%{?with_uoa:BuildRequires: json-glib-devel} +%{?with_uoa:BuildRequires: libaccounts-glib-devel >= 1.4} +BuildRequires: libgdata-devel >= 0.15.1 +BuildRequires: libgweather-devel >= 3.8 BuildRequires: libical-devel >= 0.43 -BuildRequires: liboauth-devel >= 0.9.4 -BuildRequires: libsoup-devel >= 2.38.1 +BuildRequires: libicu-devel +BuildRequires: libsecret-devel >= 0.5 +%{?with_uoa:BuildRequires: libsignon-glib-devel >= 1.8} +BuildRequires: libsoup-devel >= 2.42.0 BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:2.2 BuildRequires: libxml2-devel >= 1:2.6.31 -BuildRequires: nspr-devel -BuildRequires: nss-devel -%{?with_ldap:BuildRequires: openldap-evolution-devel >= 2.4.6} -BuildRequires: openssl-devel +BuildRequires: nspr-devel >= 4 +BuildRequires: nss-devel >= 3 +%{?with_ldap:BuildRequires: openldap-devel >= 2.4.6} BuildRequires: pkgconfig +%{?with_uoa:BuildRequires: rest-devel >= 0.7} BuildRequires: rpmbuild(macros) >= 1.304 -BuildRequires: sed >= 4.0 -BuildRequires: sqlite3-devel >= 3.5 +BuildRequires: sqlite3-devel >= 3.7.17 BuildRequires: tar >= 1:1.22 -%{?with_vala:BuildRequires: vala >= 2:0.14.0} +%{?with_vala:BuildRequires: vala >= 2:0.22.0} BuildRequires: xz BuildRequires: zlib-devel -Requires(post,postun): glib2 >= 1:2.26.0 +Requires(post,postun): glib2 >= 1:2.40.0 Requires: %{name}-libs = %{version}-%{release} +Requires: gnome-online-accounts-libs >= 3.8.0 +Requires: gtk+3 >= 3.10.0 +Requires: libgdata >= 0.15.1 +Requires: libgweather >= 3.8 # sr@Latn vs. sr@latin Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -69,24 +75,64 @@ The Evolution data server for the calendar and addressbook. %description -l pl.UTF-8 Serwer danych Evolution dla kalendarza i książki adresowej. +%package ldap +Summary: LDAP support for Evolution data server +Summary(pl.UTF-8): Obsługa LDAP dla serwera danych Evolution +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%description ldap +LDAP support for Evolution data server (address book backend module). + +%description ldap -l pl.UTF-8 +Obsługa LDAP dla serwera danych Evolution (moduł dla książki +adresowej). + +%package uoa +Summary: Ubuntu Online Accounts support for Evolution data server +Summary(pl.UTF-8): Obsługa Ubuntu Online Accounts dla serwera danych Evolution +Group: Libraries +Requires: %{name} = %{version}-%{release} +Requires: libaccounts-glib >= 1.4 +Requires: libsignon-glib >= 1.8 +Requires: rest >= 0.7 + +%description uoa +Ubuntu Online Accounts (single sign-on) support for Evolution data +server. + +%description uoa -l pl.UTF-8 +Obsługa Ubuntu Online Accounts (pojedynczego logowania) dla serwera +danych Evolution. + %package -n openldap-schema-evolutionperson Summary: evolutionperson LDAP schema Summary(pl.UTF-8): Schemat LDAP evolutionperson Group: Networking/Daemons Requires(post,postun): sed >= 4.0 Requires: openldap-servers +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description -n openldap-schema-evolutionperson -This package contains evolutionperson.schema for openldap server. +This package contains evolutionperson.schema for OpenLDAP server. %description -n openldap-schema-evolutionperson -l pl.UTF-8 -Ten pakiet zawiera evolutionperson.schema dla serwera openldap. +Ten pakiet zawiera evolutionperson.schema dla serwera OpenLDAP. %package libs Summary: Evolution Data Server library Summary(pl.UTF-8): Biblioteka Evolution Data Server Group: X11/Libraries -Requires: libsoup >= 2.38.1 +Requires: gcr-libs >= 3.4.0 +Requires: gcr-ui >= 3.4.0 +Requires: glib2 >= 1:2.40.0 +Requires: libical >= 0.43 +Requires: libsecret >= 0.5 +Requires: libsoup >= 2.42.0 +Requires: libxml2 >= 1:2.6.31 +Requires: sqlite3 >= 3.7.17 %description libs This package contains Evolution Data Server library. @@ -99,16 +145,18 @@ Summary: Evolution data server development files Summary(pl.UTF-8): Pliki programistyczne serwera danych evolution Group: X11/Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: glib2-devel >= 1:2.32.0 -Requires: gtk+3-devel >= 3.2.0 +Requires: gcr-devel >= 3.4.0 +Requires: gcr-ui-devel >= 3.4.0 +Requires: glib2-devel >= 1:2.40.0 %{?with_kerberos5:Requires: heimdal-devel} -Requires: libgdata-devel >= 0.10.0 +Requires: libgdata-devel >= 0.15.1 Requires: libical-devel >= 0.43 -Requires: libsoup-devel >= 2.38.1 +Requires: libsecret-devel >= 0.5 +Requires: libsoup-devel >= 2.42.0 Requires: libxml2-devel >= 1:2.6.31 -Requires: nspr-devel -Requires: nss-devel -Requires: sqlite3-devel +Requires: nspr-devel >= 4 +Requires: nss-devel >= 3 +Requires: sqlite3-devel >= 3.7.17 %description devel This package contains the files necessary to develop applications @@ -135,6 +183,9 @@ Summary: Evolution data server API documentation Summary(pl.UTF-8): Dokumentacja API serwera danych Evolution Group: Documentation Requires: gtk-doc-common +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description apidocs Evolution data server API documentation. @@ -147,6 +198,7 @@ Summary: Evolution data server API for Vala language Summary(pl.UTF-8): API serwera danych Evolution dla języka Vala Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} +Requires: vala >= 2:0.22.0 %description -n vala-evolution-data-server Evolution data server API for Vala language. @@ -157,9 +209,6 @@ API serwera danych Evolution dla języka Vala. %prep %setup -q -# kill -L$withval/lib -%{__sed} -i -e 's/DB_LIBS="-L[^ "]* /DB_LIBS="/;s/ICONV_LIBS="[^ "]*/ICONV_LIBS="/' configure.ac - %build %{__gtkdocize} %{__intltoolize} @@ -169,28 +218,18 @@ API serwera danych Evolution dla języka Vala. %{__autoconf} %{__automake} -# Set LIBS so that configure will be able to link with static LDAP libraries, -# which depend on Cyrus SASL and OpenSSL. -if pkg-config openssl ; then - LIBS="-lsasl2 `pkg-config --libs openssl`" -else - LIBS="-lsasl2 -lssl -lcrypto" -fi -export LIBS - %configure \ + DB_LIBS="-ldb" \ + ac_cv_libiconv=no \ %{?with_kerberos5:--with-krb5=%{_prefix} --with-krb5-libs=%{_libdir}} \ %{!?with_kerberos5:--with-krb5=no} \ - %{?with_ldap:--with-openldap=%{_libdir}/evolution-openldap} \ - %{?with_ldap:--with-static-ldap=yes} \ - %{!?with_ldap:--with-openldap=no} \ + --with-openldap%{!?with_ldap:=no} \ --enable-smime \ --enable-ipv6 \ - --enable-nntp \ %{__enable_disable apidocs gtk-doc} \ %{__enable_disable static_libs static} \ %{__enable_disable vala vala-bindings} \ - --with-libdb=%{_libdir} \ + %{!?with_uoa:--disable-uoa} \ --with-html-dir=%{_gtkdocdir} \ --disable-silent-rules @@ -205,12 +244,13 @@ install -d $RPM_BUILD_ROOT%{schemadir} DESTDIR=$RPM_BUILD_ROOT \ HTML_DIR=%{_gtkdocdir} -install addressbook/backends/ldap/evolutionperson.schema $RPM_BUILD_ROOT%{schemadir} +cp -p addressbook/backends/ldap/evolutionperson.schema $RPM_BUILD_ROOT%{schemadir} -%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/{camel-providers,calendar-backends,addressbook-backends,registry-modules}/*.{la,a} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/{camel-providers,calendar-backends,addressbook-backends,credential-modules,registry-modules}/*.{la,a} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.{a,la} %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la -%find_lang %{name} --all-name +%find_lang %{name}-%{basever} %clean rm -rf $RPM_BUILD_ROOT @@ -234,49 +274,102 @@ if [ "$1" = "0" ]; then %service -q ldap restart fi -%files -f %{name}.lang +%files -f %{name}-%{basever}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS* README -%attr(755,root,root) %{_libdir}/camel-index-control-%{apiver} -%attr(755,root,root) %{_libdir}/camel-lock-helper-%{apiver} -%attr(755,root,root) %{_libdir}/evolution-addressbook-factory -%attr(755,root,root) %{_libdir}/evolution-calendar-factory -%attr(755,root,root) %{_libdir}/evolution-source-registry +%attr(755,root,root) %{_libexecdir}/camel-index-control-%{apiver} +%attr(755,root,root) %{_libexecdir}/camel-lock-helper-%{apiver} +%attr(755,root,root) %{_libexecdir}/evolution-addressbook-factory-subprocess +%attr(755,root,root) %{_libexecdir}/evolution-addressbook-factory +%attr(755,root,root) %{_libexecdir}/evolution-calendar-factory-subprocess +%attr(755,root,root) %{_libexecdir}/evolution-calendar-factory +%attr(755,root,root) %{_libexecdir}/evolution-scan-gconf-tree-xml +%attr(755,root,root) %{_libexecdir}/evolution-source-registry +%attr(755,root,root) %{_libexecdir}/evolution-user-prompter %dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/camel-providers -%attr(755,root,root) %{_libdir}/%{name}/camel-providers/*.so -%{_libdir}/%{name}/camel-providers/*.urls +%attr(755,root,root) %{_libdir}/%{name}/libedbus-private.so %dir %{_libdir}/%{name}/addressbook-backends -%attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/*.so +%attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/libebookbackendfile.so +%attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/libebookbackendgoogle.so +%attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/libebookbackendwebdav.so %dir %{_libdir}/%{name}/calendar-backends -%attr(755,root,root) %{_libdir}/%{name}/calendar-backends/*.so +%attr(755,root,root) %{_libdir}/%{name}/calendar-backends/libecalbackendcaldav.so +%attr(755,root,root) %{_libdir}/%{name}/calendar-backends/libecalbackendcontacts.so +%attr(755,root,root) %{_libdir}/%{name}/calendar-backends/libecalbackendfile.so +%attr(755,root,root) %{_libdir}/%{name}/calendar-backends/libecalbackendgtasks.so +%attr(755,root,root) %{_libdir}/%{name}/calendar-backends/libecalbackendhttp.so +%attr(755,root,root) %{_libdir}/%{name}/calendar-backends/libecalbackendweather.so +%dir %{_libdir}/%{name}/camel-providers +%attr(755,root,root) %{_libdir}/%{name}/camel-providers/libcamelimapx.so +%{_libdir}/%{name}/camel-providers/libcamelimapx.urls +%attr(755,root,root) %{_libdir}/%{name}/camel-providers/libcamellocal.so +%{_libdir}/%{name}/camel-providers/libcamellocal.urls +%attr(755,root,root) %{_libdir}/%{name}/camel-providers/libcamelnntp.so +%{_libdir}/%{name}/camel-providers/libcamelnntp.urls +%attr(755,root,root) %{_libdir}/%{name}/camel-providers/libcamelpop3.so +%{_libdir}/%{name}/camel-providers/libcamelpop3.urls +%attr(755,root,root) %{_libdir}/%{name}/camel-providers/libcamelsendmail.so +%{_libdir}/%{name}/camel-providers/libcamelsendmail.urls +%attr(755,root,root) %{_libdir}/%{name}/camel-providers/libcamelsmtp.so +%{_libdir}/%{name}/camel-providers/libcamelsmtp.urls +%dir %{_libdir}/%{name}/credential-modules +%attr(755,root,root) %{_libdir}/%{name}/credential-modules/module-credentials-goa.so %dir %{_libdir}/evolution-data-server/registry-modules -%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/*.so +%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-cache-reaper.so +%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-gnome-online-accounts.so +%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-google-backend.so +%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-outlook-backend.so +%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-owncloud-backend.so +%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-secret-monitor.so +%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-trust-prompt.so +%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-yahoo-backend.so %dir %{_libdir}/%{name}-%{basever} - -%if %{with ldap} -%{_datadir}/%{name}-%{basever}/*.schema -%endif +%dir %{_datadir}/%{name} +%{_pixmapsdir}/%{name} %{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service %{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service %{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Sources.service - -%dir %{_datadir}/%{name}-%{basever} -%dir %{_datadir}/%{name}-%{basever}/ro-sources -%dir %{_datadir}/%{name}-%{basever}/rw-sources -%{_datadir}/%{name}-%{basever}/ro-sources/*.source -%{_datadir}/%{name}-%{basever}/rw-sources/*.source -%{_pixmapsdir}/%{name} +%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.UserPrompter.service %{_datadir}/GConf/gsettings/evolution-data-server.convert -%{_datadir}/GConf/gsettings/libedataserver.convert %{_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 %{_datadir}/glib-2.0/schemas/org.gnome.Evolution.DefaultSources.gschema.xml %{_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 + +%if %{with ldap} +%files ldap +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/libebookbackendldap.so +%{_datadir}/%{name}/evolutionperson.schema +%endif + +%if %{with uoa} +%files uoa +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/evolution-data-server/credential-modules/module-credentials-uoa.so +%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-ubuntu-online-accounts.so +%{_desktopdir}/evolution-data-server-uoa.desktop +# XXX: which package should own these dirs? +%dir %{_datadir}/accounts +%dir %{_datadir}/accounts/applications +%{_datadir}/accounts/applications/evolution-data-server.application +%dir %{_datadir}/accounts/service_types +%{_datadir}/accounts/service_types/calendar.service-type +%{_datadir}/accounts/service_types/contacts.service-type +%{_datadir}/accounts/service_types/mail.service-type +%dir %{_datadir}/accounts/services +%{_datadir}/accounts/services/google-calendar.service +%{_datadir}/accounts/services/google-contacts.service +%{_datadir}/accounts/services/google-gmail.service +%{_datadir}/accounts/services/windows-live-mail.service +%{_datadir}/accounts/services/yahoo-calendar.service +%{_datadir}/accounts/services/yahoo-mail.service +%endif %files -n openldap-schema-evolutionperson %defattr(644,root,root,755) @@ -285,23 +378,25 @@ fi %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libcamel-%{apiver}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libcamel-%{apiver}.so.40 +%attr(755,root,root) %ghost %{_libdir}/libcamel-%{apiver}.so.54 %attr(755,root,root) %{_libdir}/libebackend-%{apiver}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libebackend-%{apiver}.so.5 +%attr(755,root,root) %ghost %{_libdir}/libebackend-%{apiver}.so.10 %attr(755,root,root) %{_libdir}/libebook-%{apiver}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libebook-%{apiver}.so.14 +%attr(755,root,root) %ghost %{_libdir}/libebook-%{apiver}.so.16 +%attr(755,root,root) %{_libdir}/libebook-contacts-%{apiver}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libebook-contacts-%{apiver}.so.2 %attr(755,root,root) %{_libdir}/libecal-%{apiver}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libecal-%{apiver}.so.15 +%attr(755,root,root) %ghost %{_libdir}/libecal-%{apiver}.so.19 %attr(755,root,root) %{_libdir}/libedata-book-%{apiver}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libedata-book-%{apiver}.so.15 +%attr(755,root,root) %ghost %{_libdir}/libedata-book-%{apiver}.so.25 %attr(755,root,root) %{_libdir}/libedata-cal-%{apiver}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libedata-cal-%{apiver}.so.18 +%attr(755,root,root) %ghost %{_libdir}/libedata-cal-%{apiver}.so.28 %attr(755,root,root) %{_libdir}/libedataserver-%{apiver}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libedataserver-%{apiver}.so.17 -%attr(755,root,root) %{_libdir}/libedataserverui-%{apiver2}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libedataserverui-%{apiver2}.so.4 +%attr(755,root,root) %ghost %{_libdir}/libedataserver-%{apiver}.so.21 +%attr(755,root,root) %{_libdir}/libedataserverui-%{apiver}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libedataserverui-%{apiver}.so.1 %{_libdir}/girepository-1.0/EBook-%{apiver}.typelib -%{_libdir}/girepository-1.0/ECalendar-%{apiver}.typelib +%{_libdir}/girepository-1.0/EBookContacts-%{apiver}.typelib %{_libdir}/girepository-1.0/EDataServer-%{apiver}.typelib %files devel @@ -309,23 +404,25 @@ fi %attr(755,root,root) %{_libdir}/libcamel-%{apiver}.so %attr(755,root,root) %{_libdir}/libebackend-%{apiver}.so %attr(755,root,root) %{_libdir}/libebook-%{apiver}.so +%attr(755,root,root) %{_libdir}/libebook-contacts-%{apiver}.so %attr(755,root,root) %{_libdir}/libecal-%{apiver}.so %attr(755,root,root) %{_libdir}/libedata-book-%{apiver}.so %attr(755,root,root) %{_libdir}/libedata-cal-%{apiver}.so %attr(755,root,root) %{_libdir}/libedataserver-%{apiver}.so -%attr(755,root,root) %{_libdir}/libedataserverui-%{apiver2}.so -%{_includedir}/evolution-data-server-%{basever} +%attr(755,root,root) %{_libdir}/libedataserverui-%{apiver}.so +%{_includedir}/evolution-data-server %{_pkgconfigdir}/camel-%{apiver}.pc %{_pkgconfigdir}/evolution-data-server-%{apiver}.pc %{_pkgconfigdir}/libebackend-%{apiver}.pc %{_pkgconfigdir}/libebook-%{apiver}.pc +%{_pkgconfigdir}/libebook-contacts-%{apiver}.pc %{_pkgconfigdir}/libecal-%{apiver}.pc %{_pkgconfigdir}/libedata-book-%{apiver}.pc %{_pkgconfigdir}/libedata-cal-%{apiver}.pc %{_pkgconfigdir}/libedataserver-%{apiver}.pc -%{_pkgconfigdir}/libedataserverui-%{apiver2}.pc +%{_pkgconfigdir}/libedataserverui-%{apiver}.pc %{_datadir}/gir-1.0/EBook-%{apiver}.gir -%{_datadir}/gir-1.0/ECalendar-%{apiver}.gir +%{_datadir}/gir-1.0/EBookContacts-%{apiver}.gir %{_datadir}/gir-1.0/EDataServer-%{apiver}.gir %if %{with static_libs} @@ -334,24 +431,19 @@ fi %{_libdir}/libcamel-%{apiver}.a %{_libdir}/libebackend-%{apiver}.a %{_libdir}/libebook-%{apiver}.a +%{_libdir}/libebook-contacts-%{apiver}.a %{_libdir}/libecal-%{apiver}.a %{_libdir}/libedata-book-%{apiver}.a %{_libdir}/libedata-cal-%{apiver}.a %{_libdir}/libedataserver-%{apiver}.a -%{_libdir}/libedataserverui-%{apiver2}.a +%{_libdir}/libedataserverui-%{apiver}.a %endif %if %{with apidocs} %files apidocs %defattr(644,root,root,755) %{_gtkdocdir}/camel -%{_gtkdocdir}/libebackend -%{_gtkdocdir}/libebook -%{_gtkdocdir}/libecal -%{_gtkdocdir}/libedata-book -%{_gtkdocdir}/libedata-cal -%{_gtkdocdir}/libedataserver -%{_gtkdocdir}/libedataserverui +%{_gtkdocdir}/eds %endif %if %{with vala} @@ -359,7 +451,8 @@ fi %defattr(644,root,root,755) %{_datadir}/vala/vapi/libebook-%{apiver}.deps %{_datadir}/vala/vapi/libebook-%{apiver}.vapi -%{_datadir}/vala/vapi/libecalendar-%{apiver}.deps -%{_datadir}/vala/vapi/libecalendar-%{apiver}.vapi +%{_datadir}/vala/vapi/libebook-contacts-%{apiver}.deps +%{_datadir}/vala/vapi/libebook-contacts-%{apiver}.vapi +%{_datadir}/vala/vapi/libedataserver-%{apiver}.deps %{_datadir}/vala/vapi/libedataserver-%{apiver}.vapi %endif