- updated to 2.22.0

Changed files:
    evolution-exchange.spec -> 1.36

diff --git a/evolution-exchange.spec b/evolution-exchange.spec
index b0a5b83be698e70363d33dfd4099c594ef8aa026..b66f61ed9420cbf2c470cc3ca9627748a86bd873 100644 (file)
--- a/evolution-exchange.spec
+++ b/evolution-exchange.spec
@@ -3,34 +3,36 @@
 Summary:       Microsoft Exchange support for Evolution
 Summary(pl.UTF-8):     Wsparcie dla Microsoft Exchange w Evolution
 Name:          evolution-exchange
 Summary:       Microsoft Exchange support for Evolution
 Summary(pl.UTF-8):     Wsparcie dla Microsoft Exchange w Evolution
 Name:          evolution-exchange

-Version:       2.12.3
-Release:       4
+Version:       2.22.0
+Release:       1

 License:       GPL v2
 Group:         X11/Applications
 License:       GPL v2
 Group:         X11/Applications

-Source0:       http://ftp.gnome.org/pub/GNOME/sources/evolution-exchange/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 1bdda76724a17fb7606abcdfdb6ec170
-BuildRequires: GConf2-devel >= 2.20.0
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/evolution-exchange/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5: fea02f97cc8fe62dca0d50ffdc19e416
+BuildRequires: GConf2-devel >= 2.22.0

 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake

-BuildRequires: evolution-data-server-devel >= 1.12.0
-BuildRequires: evolution-devel >= 2.12.0
-BuildRequires: gtk+2-devel >= 2:2.12.0
+BuildRequires: evolution-data-server-devel >= 2.22.0
+BuildRequires: evolution-devel >= 2.22.0
+BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.16.1
+BuildRequires: gnome-common >= 2.20.0
+BuildRequires: gtk+2-devel >= 2:2.12.8

 BuildRequires: gtk-doc >= 1.8
 BuildRequires: gtk-doc >= 1.8

-BuildRequires: krb5-devel

 BuildRequires: intltool >= 0.36.2
 BuildRequires: intltool >= 0.36.2

-BuildRequires: libbonobo-devel >= 2.20.0
-BuildRequires: libglade2-devel >= 2.6.2
-BuildRequires: libgnomeprint-devel >= 2.18.0
-BuildRequires: libgnomeui-devel >= 2.20.0
-BuildRequires: libsoup-devel >= 2.2.100
-BuildRequires: libxml2-devel >= 1:2.6.30
+BuildRequires: libbonobo-devel >= 2.22.0
+BuildRequires: libglade2-devel >= 1:2.6.2
+BuildRequires: libgnomeui-devel >= 2.22.0
+BuildRequires: libsoup-devel >= 2.4.0
+BuildRequires: libtool
+BuildRequires: libxml2-devel >= 1:2.6.31

 BuildRequires: openldap-devel >= 2.4.6
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: sed >= 4.0
 Requires(post,preun):  GConf2
 BuildRequires: openldap-devel >= 2.4.6
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: sed >= 4.0
 Requires(post,preun):  GConf2

-Requires:      evolution >= 2.12.0
-Requires:      gtk+2 >= 2:2.12.0
+Requires:      evolution >= 2.22.0
+Requires:      gtk+2 >= 2:2.12.8

 Obsoletes:     ximian-connector
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 Obsoletes:     ximian-connector
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7


@@ -58,18 +60,19 @@ Dokumentacja API wsparcia Microsoft Exchange w Evolution.
 %prep
 %setup -q
 
 %prep
 %setup -q
 

-sed -i -e s#sr\@Latn#sr\@latin# po/LINGUAS
-mv po/sr\@{Latn,latin}.po
+sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po

 
 %build
 %{__glib_gettextize}
 %{__intltoolize}
 
 %build
 %{__glib_gettextize}
 %{__intltoolize}

+%{__libtoolize}

 %{__aclocal}
 %{__autoconf}
 %{__aclocal}
 %{__autoconf}

+%{__autoheader}

 %{__automake}
 %configure \
        --with-openldap=/usr \
 %{__automake}
 %configure \
        --with-openldap=/usr \

-       --with-krb5=/usr \

        --disable-schemas-install \
        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir}
        --disable-schemas-install \
        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir}


@@ -83,28 +86,28 @@ rm -rf $RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/evolution-data-server-*/camel-providers/*.{la,a}
 
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/evolution-data-server-*/camel-providers/*.{la,a}
 

-%find_lang %{name}-2.12
+%find_lang %{name}-2.22

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post

-%gconf_schema_install apps_exchange_addressbook-2.12.schemas
+%gconf_schema_install apps_exchange_addressbook-2.22.schemas

 
 %preun
 
 %preun

-%gconf_schema_uninstall apps_exchange_addressbook-2.12.schemas
+%gconf_schema_uninstall apps_exchange_addressbook-2.22.schemas

 
 

-%files -f %{name}-2.12.lang
+%files -f %{name}-2.22.lang

 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README

-%{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-2.12.schemas
-%attr(755,root,root) %{_bindir}/exchange-connector-setup-*
-%attr(755,root,root) %{_libdir}/evolution-data-server-*/camel-providers/*.so
-%attr(755,root,root) %{_libdir}/evolution/*/evolution-exchange-storage
-%{_datadir}/%{name}
-%{_libdir}/bonobo/servers/*
-%{_libdir}/evolution-data-server-*/camel-providers/*.urls
+%{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-2.22.schemas
+%attr(755,root,root) %{_bindir}/exchange-connector-setup-2.22
+%attr(755,root,root) %{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.so
+%attr(755,root,root) %{_libdir}/evolution/2.22/evolution-exchange-storage
+%{_datadir}/evolution-exchange
+%{_libdir}/bonobo/servers/GNOME_Evolution_Exchange_Storage_2.22.server
+%{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.urls

 
 %files apidocs
 %defattr(644,root,root,755)
 
 %files apidocs
 %defattr(644,root,root,755)

-%{_gtkdocdir}/*
+%{_gtkdocdir}/evolution-exchange