LOG New version 3.4.3 (sync with Cooker), fix unversioned Obsoletes

This commit is contained in:
Andrey Bondrov 2012-08-10 23:39:10 +11:00
parent 92ce11cb3c
commit d845ee1234
2 changed files with 273 additions and 163 deletions

View file

@ -1,2 +1,2 @@
sources:
"evolution-data-server-2.32.3.tar.bz2": cbf32c3438c4f1650b35b87007a337ebc1c56cec
"evolution-data-server-3.4.3.tar.xz": 40fc66ca36977a5a35fcebfb9997c3a5fe86ef18

View file

@ -1,81 +1,83 @@
%define nspr_major 4
%define nss_major 3
%define api 1.2
%define base_version 3.0
%define dir_version 3.4
%define _requires_exceptions nspr%{nspr_major}\\|plc%{nspr_major}\\|plds%{nspr_major}\\|nss%{nss_major}\\|smime%{nss_major}\\|softokn%{nss_major}\\|ssl%{nss_major}\\|nssutil%{nss_major}
%define version 2.32.3
%define libsoup_version_required 2.3.0
%define api_version 1.2
%define base_version 2.32
%define lib_major 6
%define lib_name %mklibname %{name} %{lib_major}
%define firefox_version 1.0.1
%define oldmajor 6
%define oldlibname %mklibname %name %oldmajor
%define oldmajor 6
%define oldlibname %mklibname %{name} %{oldmajor}
%define oldmajor2006 4
%define oldlibname2006 %mklibname %name %oldmajor2006
%define oldlibname2006 %mklibname %{name} %{oldmajor2006}
%define camelmajor 19
%define camel_libname %mklibname camel %camelmajor
%define camelmajor 33
%define camel_libname %mklibname camel %{camelmajor}
%define camel_devel %mklibname camel -d
%define ebookmajor 10
%define ebook_libname %mklibname ebook %ebookmajor
%define ebackendmajor 2
%define ebackend_libname %mklibname ebackend %{ebackendmajor}
%define ebackend_devel %mklibname ebackend -d
%define ecalmajor 8
%define ecal_libname %mklibname ecal %ecalmajor
%define ebookmajor 13
%define ebook_libname %mklibname ebook %{ebookmajor}
%define ebook_devel %mklibname ebook -d
%define edatabookmajor 8
%define edatabook_libname %mklibname edata-book %edatabookmajor
%define ecalmajor 11
%define ecal_libname %mklibname ecal %{ecalmajor}
%define ecal_devel %mklibname ecal -d
%define edatacalmajor 10
%define edatacal_libname %mklibname edata-cal %edatacalmajor
%define edatabookmajor 13
%define edatabook_libname %mklibname edata-book %{edatabookmajor}
%define edatabook_devel %mklibname edata-book -d
%define edataservermajor 14
%define edataserver_libname %mklibname edataserver %edataservermajor
%define edataserver_libnamedev %mklibname -d edataserver
%define edatacalmajor 15
%define edatacal_libname %mklibname edata-cal %{edatacalmajor}
%define edatacal_devel %mklibname edata-cal -d
%define edataserveruimajor 11
%define edataserverui_libname %mklibname edataserverui %edataserveruimajor
%define edataservermajor 16
%define edataserver_libname %mklibname edataserver %{edataservermajor}
%define edataserver_devel %mklibname -d edataserver
%define egroupwisemajor 13
%define egroupwise_libname %mklibname egroupwise %egroupwisemajor
%define edataserveruimajor 1
%define edataserverui_libname %mklibname edataserverui %{edataserveruimajor}
%define edataserverui_devel %mklibname edataserverui -d
%define ebackendmajor 0
%define ebackend_libname %mklibname ebackend %ebackendmajor
%define girmajor 1.2
%define girname %mklibname %{name}-gir %{girmajor}
Name: evolution-data-server
Summary: Evolution Data Server
Version: %version
Release: %mkrel 4
Version: 3.4.3
Release: 2
License: LGPLv2+
Group: System/Libraries
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.bz2
URL: http://www.gnome.org/projects/evolution/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.xz
BuildRequires: bison flex
BuildRequires: gperf
BuildRequires: gtk-doc docbook-dtd412-xml
BuildRequires: krb5-devel
BuildRequires: libgweather-devel >= 2.25.4
BuildRequires: libsoup-devel >= %{libsoup_version_required}
BuildRequires: nss-devel >= %{firefox_version}
BuildRequires: nspr-devel >= %{firefox_version}
BuildRequires: gtk+2-devel >= 2.20.0
BuildRequires: libgdata-devel >= 0.6.3
BuildRequires: openldap-devel
BuildRequires: sqlite3-devel >= 3.5
BuildRequires: libical-devel
BuildRequires: libxml2-devel
BuildRequires: libGConf2-devel GConf2
BuildRequires: libgnome-keyring-devel
BuildRequires: intltool
BuildRequires: db-devel
Obsoletes: %oldlibname
BuildRequires: bison
BuildRequires: db-devel
BuildRequires: gettext
BuildRequires: gnome-common
BuildRequires: gperf
BuildRequires: gtk-doc
BuildRequires: intltool
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.7.0
BuildRequires: pkgconfig(goa-1.0) >= 3.1.1
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gnome-keyring-1) >= 2.20.1
BuildRequires: pkgconfig(nspr)
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(gweather-3.0) >= 2.90.0
BuildRequires: pkgconfig(sqlite3) >= 3.5
BuildRequires: pkgconfig(libical) >= 0.43
BuildRequires: pkgconfig(oauth) >= 0.9.4
Obsoletes: %{oldlibname} < 3.4
%description
Evolution Data Server provides a central location for your addressbook
@ -84,17 +86,23 @@ and calendar in the gnome desktop.
%package -n %{camel_libname}
Summary: Shared libraries for using Evolution Data Server
Group: System/Libraries
Requires: %{name} >= %{version}-%{release}
Obsoletes: %oldlibname2006
Obsoletes: %{oldlibname2006} < 3.4
%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
%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
Requires: %{name} >= %{version}-%{release}
%description -n %{ebook_libname}
Evolution Data Server provides a central location for your addressbook
@ -103,7 +111,6 @@ and calendar in the gnome desktop.
%package -n %{ecal_libname}
Summary: Shared libraries for using Evolution Data Server
Group: System/Libraries
Requires: %{name} >= %{version}-%{release}
%description -n %{ecal_libname}
Evolution Data Server provides a central location for your addressbook
@ -112,8 +119,7 @@ and calendar in the gnome desktop.
%package -n %{edatabook_libname}
Summary: Shared libraries for using Evolution Data Server
Group: System/Libraries
Requires: %{name} >= %{version}-%{release}
Obsoletes: %oldlibname2006
Obsoletes: %{oldlibname2006} < 3.4
%description -n %{edatabook_libname}
Evolution Data Server provides a central location for your addressbook
@ -122,8 +128,7 @@ and calendar in the gnome desktop.
%package -n %{edatacal_libname}
Summary: Shared libraries for using Evolution Data Server
Group: System/Libraries
Requires: %{name} >= %{version}-%{release}
Obsoletes: %oldlibname2006
Obsoletes: %{oldlibname2006} < 3.4
%description -n %{edatacal_libname}
Evolution Data Server provides a central location for your addressbook
@ -132,8 +137,7 @@ and calendar in the gnome desktop.
%package -n %{edataserver_libname}
Summary: Shared libraries for using Evolution Data Server
Group: System/Libraries
Requires: %{name} >= %{version}-%{release}
Obsoletes: %oldlibname2006
Obsoletes: %{oldlibname2006} < 3.4
%description -n %{edataserver_libname}
Evolution Data Server provides a central location for your addressbook
@ -142,145 +146,251 @@ and calendar in the gnome desktop.
%package -n %{edataserverui_libname}
Summary: Shared libraries for using Evolution Data Server
Group: System/Libraries
Requires: %{name} >= %{version}-%{release}
Obsoletes: %{_lib}edataserverui4
%description -n %{edataserverui_libname}
Evolution Data Server provides a central location for your addressbook
and calendar in the gnome desktop.
%package -n %{egroupwise_libname}
Summary: Shared libraries for using Evolution Data Server
Group: System/Libraries
Requires: %{name} >= %{version}-%{release}
%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 %{egroupwise_libname}
%description -n %{camel_devel}
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
Requires: %{name} >= %{version}-%{release}
%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_libname}
%description -n %{ebackend_devel}
Evolution Data Server provides a central location for your addressbook
and calendar in the gnome desktop.
%package -n %{edataserver_libnamedev}
%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 %{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: %{name} = %{version}
Requires: %camel_libname = %version
Requires: %ebook_libname = %version
Requires: %ecal_libname = %version
Requires: %edatabook_libname = %version
Requires: %edatacal_libname = %version
Requires: %edataserver_libname = %version
Requires: %edataserverui_libname = %version
Requires: %egroupwise_libname = %version
Requires: %ebackend_libname = %version
Provides: lib%{name}-devel = %{version}-%{release}
Requires: %{edataserver_libname} = %{version}-%{release}
Provides: %{name}-devel = %{version}-%{release}
Provides: libedataserver-devel = %version-%release
Requires: nss-devel >= %{firefox_version}
Requires: nspr-devel >= %{firefox_version}
#gw libtool dep:
Requires: libgdata-devel
Obsoletes: %mklibname -d edataserver 9
Obsoletes: %{mklibname -d edataserver 9} < 3.4
%description -n %{edataserver_libnamedev}
%description -n %{edataserver_devel}
Evolution Data Server provides a central location for your addressbook
and calendar in the gnome desktop.
%package -n %{edataserverui_devel}
Summary: Libraries and include files for using Evolution Data Server - edatserverui
Group: Development/GNOME and GTK+
Requires: %{edataserverui_libname} = %{version}-%{release}
%description -n %{edataserverui_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
%build
%configure2_5x --with-krb5=%{_prefix} --with-krb5-libs=%{_libdir} \
--with-libdb=%{_prefix} \
--with-libdb=%{_prefix} --disable-static \
--with-openldap=yes --with-static-ldap=no --enable-gtk-doc=yes
#--enable-gnome-keyring=yes
%make
%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
%makeinstall_std
# give the libraries some executable bits
find %{buildroot} -name '*.so.*' -exec chmod +x {} \;
%{find_lang} %{name}-%{base_version}
%find_lang %{name}-%{dir_version}
%if "%{_lib}" == "lib64"
perl -pi -e "s|-L/usr/lib\b|-L%{_libdir}|g" %{buildroot}%{_libdir}/*.la
%endif
%clean
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
%files -f %{name}-%{base_version}.lang
%defattr(-, root, root)
%files -f %{name}-%{dir_version}.lang
%doc COPYING NEWS
%{_libexecdir}/%{name}-%{api_version}
%{_libexecdir}/camel-index-control-%{api_version}
%_libexecdir/e-addressbook-factory
%_libexecdir/e-calendar-factory
%attr(2755,root,mail) %{_libexecdir}/camel-lock-helper-%{api_version}
%{_datadir}/%{name}-%{base_version}
%_datadir/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
%_datadir/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
%{_libexecdir}/%{name}
%{_libexecdir}/camel-index-control-%{api}
%{_libexecdir}/evolution-addressbook-factory
%{_libexecdir}/evolution-calendar-factory
%attr(2755,root,mail) %{_libexecdir}/camel-lock-helper-%{api}
%{_datadir}/%{name}-%{dir_version}
%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
%{_datadir}/pixmaps/%{name}
#GSettings
%{_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
%files -n %{camel_libname}
%defattr(-, root, root)
%{_libdir}/libcamel-%{api_version}.so.%{camelmajor}*
%{_libdir}/libcamel-provider-%{api_version}.so.%{camelmajor}*
%files -n %{ebook_libname}
%defattr(-, root, root)
%{_libdir}/libebook-%{api_version}.so.%{ebookmajor}*
%files -n %{ecal_libname}
%defattr(-, root, root)
%{_libdir}/libecal-%{api_version}.so.%{ecalmajor}*
%files -n %{edatabook_libname}
%defattr(-, root, root)
%{_libdir}/libedata-book-%{api_version}.so.%{edatabookmajor}*
%files -n %{edatacal_libname}
%defattr(-, root, root)
%{_libdir}/libedata-cal-%{api_version}.so.%{edatacalmajor}*
%files -n %{edataserver_libname}
%defattr(-, root, root)
%{_libdir}/libedataserver-%{api_version}.so.%{edataservermajor}*
%files -n %{edataserverui_libname}
%defattr(-, root, root)
%{_libdir}/libedataserverui-%{api_version}.so.%{edataserveruimajor}*
%files -n %{egroupwise_libname}
%defattr(-, root, root)
%{_libdir}/libegroupwise-%{api_version}.so.%{egroupwisemajor}*
%{_libdir}/libcamel-%{api}.so.%{camelmajor}*
%files -n %{ebackend_libname}
%defattr(-, root, root)
%{_libdir}/libebackend-%{api_version}.so.%{ebackendmajor}*
%{_libdir}/libebackend-%{api}.so.%{ebackendmajor}*
%files -n %{ebook_libname}
%{_libdir}/libebook-%{api}.so.%{ebookmajor}*
%files -n %{ecal_libname}
%{_libdir}/libecal-%{api}.so.%{ecalmajor}*
%files -n %{edatabook_libname}
%{_libdir}/libedata-book-%{api}.so.%{edatabookmajor}*
%files -n %{edatacal_libname}
%{_libdir}/libedata-cal-%{api}.so.%{edatacalmajor}*
%files -n %{edataserver_libname}
%{_libdir}/libedataserver-%{api}.so.%{edataservermajor}*
%files -n %{edataserverui_libname}
%{_libdir}/libedataserverui-%{base_version}.so.%{edataserveruimajor}*
%files -n %{girname}
%{_libdir}/girepository-1.0/EDataServer-%{girmajor}.typelib
%{_libdir}/girepository-1.0/ECalendar-%{girmajor}.typelib
%{_libdir}/girepository-1.0/EBook-%{girmajor}.typelib
%files -n %{camel_devel}
%doc %{_datadir}/gtk-doc/html/camel/*
%{_includedir}/%{name}-%{dir_version}/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}
%doc %{_datadir}/gtk-doc/html/libebackend/*
%{_includedir}/%{name}-%{dir_version}/libebackend
%{_libdir}/pkgconfig/libebackend-%{api}.pc
%{_libdir}/libebackend-%{api}.so
%files -n %{ebook_devel}
%doc %{_datadir}/gtk-doc/html/libebook/*
%{_includedir}/%{name}-%{dir_version}/libebook/
%{_libdir}/pkgconfig/libebook-%{api}.pc
%{_libdir}/libebook-%{api}.so
%files -n %{ecal_devel}
%doc %{_datadir}/gtk-doc/html/libecal/*
%{_includedir}/%{name}-%{dir_version}/libecal/
%{_libdir}/pkgconfig/libecal-%{api}.pc
%{_libdir}/libecal-%{api}.so
%{_datadir}/gir-1.0/ECalendar-%{girmajor}.gir
%files -n %{edatabook_devel}
%doc %{_datadir}/gtk-doc/html/libedata-book/*
%{_includedir}/%{name}-%{dir_version}/libedata-book/
%{_libdir}/pkgconfig/libedata-book-%{api}.pc
%{_libdir}/libedata-book-%{api}.so
%{_datadir}/gir-1.0/EBook-%{girmajor}.gir
%files -n %{edatacal_devel}
%doc %{_datadir}/gtk-doc/html/libedata-cal/*
%{_includedir}/%{name}-%{dir_version}/libedata-cal/
%{_libdir}/pkgconfig/libedata-cal-%{api}.pc
%{_libdir}/libedata-cal-%{api}.so
%files -n %{edataserver_devel}
%doc %{_datadir}/gtk-doc/html/libedataserver/*
%{_includedir}/%{name}-%{dir_version}/libedataserver/
%{_libdir}/pkgconfig/libedataserver-%{api}.pc
%{_libdir}/pkgconfig/evolution-data-server-%{api}.pc
%{_libdir}/libedataserver-%{api}.so
%{_datadir}/gir-1.0/EDataServer-%{girmajor}.gir
%files -n %{edataserverui_devel}
%doc %{_datadir}/gtk-doc/html/libedataserverui/*
%{_includedir}/%{name}-%{dir_version}/libedataserverui/
#{_libdir}/pkgconfig/libedataserverui-%{api}.pc
%{_libdir}/pkgconfig/libedataserverui-*.pc
#{_libdir}/libedataserverui-%{api}.so
%{_libdir}/libedataserverui-*.so
%files -n %{edataserver_libnamedev}
%defattr(-, root, root)
%doc %{_datadir}/gtk-doc/html/*
%{_includedir}/%{name}-%{base_version}
%{_libdir}/pkgconfig/*
%{_libdir}/*.so
%attr(644,root,root) %{_libdir}/*.la
%changelog
* Mon Jun 20 2011 Oden Eriksson <oeriksson@mandriva.com> 2.32.3-2mdv2011.0
* Tue Jun 19 2012 Matthew Dawkins <mattydaw@mandriva.org> 3.4.3-1
+ Revision: 806153
- update to new version 3.4.3
* Wed May 16 2012 Matthew Dawkins <mattydaw@mandriva.org> 3.4.2-1
+ Revision: 799174
- new version 3.4.2
- cleaned up spec
* Thu Apr 26 2012 Guilherme Moro <guilherme@mandriva.com> 3.4.1-0
+ Revision: 793645
- Updated to version 3.4.1
* Sun Nov 27 2011 Matthew Dawkins <mattydaw@mandriva.org> 3.2.2-1
+ Revision: 733688
- fixed BR
- fixed files lists
- added missing BR
- new version 3.2.2
- syncd spec to mga (but greatly extended)
- each devel pkg split out
- gir pkg split out
- egroupwise pkg removed
- dep loop removed
- defattr removed
- clean section removed
- BRs converted to pkgconfig provides
- mkrel & BuildRoot removed
* Mon Oct 24 2011 Götz Waschk <waschk@mandriva.org> 2.32.3-3
+ Revision: 705835
- rebuild for new libpng
* Mon Jun 20 2011 Oden Eriksson <oeriksson@mandriva.com> 2.32.3-2
+ Revision: 686310
- avoid pulling 32 bit libraries on 64 bit arch
@ -676,7 +786,7 @@ perl -pi -e "s|-L/usr/lib\b|-L%{_libdir}|g" %{buildroot}%{_libdir}/*.la
+ Revision: 137399
- patch to fix bug #36319
+ Olivier Blin <oblin@mandriva.com>
+ Olivier Blin <blino@mandriva.org>
- restore BuildRoot
* Fri Dec 21 2007 Götz Waschk <waschk@mandriva.org> 2.21.4-2mdv2008.1