- merged from DEVEL

[packages/evolution-data-server.git] / evolution-data-server.spec

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 8bd15370ba12b9cf9e2716ff7cbff5fa8024d315..74aecbcb566278b2b9d9a0db25221c5a40317434 100644 (file)
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -6,17 +6,17 @@
 %bcond_without kerberos5       # build without kerberos5 support
 %bcond_without ldap            # build without ldap support
 #
-%define                basever         1.4
+%define                basever         1.6
 %define                apiver          1.2
 Summary:       Evolution data server
 Summary(pl):   Serwer danych Evolution
 Name:          evolution-data-server
-Version:       1.4.1
+Version:       1.6.0
 Release:       1
 License:       GPL
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.4/%{name}-%{version}.tar.bz2
-# Source0-md5: af8f53c4ea524df861a6f2eb1ea75ad9
+Source0:       http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 1d775148a4f88559cb375924b9f7b79f
 Patch0:                %{name}-system_db.patch
 Patch1:                %{name}-GG-IM.patch
 Patch2:                %{name}-workaround-cal-backend-leak.patch
@@ -28,7 +28,7 @@ BuildRequires:        automake
 BuildRequires: bison
 BuildRequires: db-devel
 BuildRequires: gnome-common >= 2.8.0
-BuildRequires: howl-devel >= 0.9.10
+%{?with_kerberos5:BuildRequires:       heimdal-devel >= 0.7}
 BuildRequires: intltool
 BuildRequires: libglade2-devel >= 1:2.5.1
 BuildRequires: libgnomeui-devel >= 2.11.2-2
@@ -37,10 +37,9 @@ BuildRequires:       libstdc++-devel
 BuildRequires: libtool
 BuildRequires: nspr-devel
 BuildRequires: nss-devel
+%{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
-%{?with_kerberos5:BuildRequires:       heimdal-devel >= 0.7}
-%{?with_ldap:BuildRequires:    openldap-devel >= 2.0.0}
 Requires(post,postun): scrollkeeper
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -83,6 +82,7 @@ Summary:      Evolution data server development files
 Summary(pl):   Pliki programistyczne serwera danych evolution
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
+%{?with_kerberos5:Requires:    heimdal-devel >= 0.7}
 # for all but libegroupwise
 Requires:      GConf2-devel >= 2.10.0
 Requires:      ORBit2-devel >= 1:2.12.1
@@ -114,7 +114,7 @@ Evolution data server static libraries.
 Statyczne biblioteki serwera danych Evolution.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -152,7 +152,7 @@ cd ../..
        --with-nss-libs=%{_libdir}
 %{__make} \
        HTML_DIR=%{_gtkdocdir} \
-       GTKHTML_DATADIR=%{_datadir}/idl 
+       GTKHTML_DATADIR=%{_datadir}/idl
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -224,7 +224,6 @@ fi
 %dir %{_libdir}/%{name}-%{apiver}/extensions
 %attr(755,root,root) %{_libdir}/%{name}-%{apiver}/extensions/*.so
 %{_libdir}/bonobo/servers/*
-%{_datadir}/idl/*
 
 %if %{with ldap}
 %{_datadir}/%{name}-%{basever}/*.schema
@@ -243,6 +242,7 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.so.*.*
+%{_datadir}/idl/%{name}-%{apiver}
 
 %files devel
 %defattr(644,root,root,755)