New version 3.22.0

Spec cleanup
This commit is contained in:
Andrey Bondrov 2016-10-03 13:33:48 +10:00
parent 0c0cbc2169
commit c0d274503a
2 changed files with 265 additions and 251 deletions

View file

@ -1,2 +1,2 @@
sources:
evolution-data-server-3.16.4.tar.xz: 95c851903a62de9b5213ca5cc176238bb4b96b8c
evolution-data-server-3.22.0.tar.xz: 9c13174cd38a651b2c150be64b4e5423481b4e8a

View file

@ -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}