- Update from 1.0.3 to 1.1.4.1
- Updated eds_major from 1.0 to 1.2; fixed translation search path.
- Removed 64-bit patch for calendar backend hash table; upstream now stores
pointers to ECalBackendFactory, rather than GType
- Removed calendar optimisation patch for part of part of bug #141283 as
this is now in the upstream tarball
- Added /usr/lib/evolution-data-server-%{eds_major} to cover the
extensions, plus the camel code now in e-d-s, rather than evolution
- Added /usr/share/pixmaps/evolution-data-server-%{eds_major} to cover the
category pixmaps
- Camel code from evolution is now in evolution-data-server:
- Added camel-index-control and camel-lock-helper to packaged files
- Added mozilla dependency code from the evolution package
- Ditto for LDAP
- Ditto for krb5
- Ditto for NNTP support handling
- Ditto for --enable-file-locking and --enable-dot-locking
- Added requirements on libbonobo, libgnomeui, gnome-vfs2, GConf2,
libglade2
- Updated libsoup requirement from 2.2.1 to 2.2.2
- Enabled gtk-doc
This commit is contained in:
dmalcolm
parent
5e5665470f
commit
e15f631465
@ -1 +1 @@
|
||||
evolution-data-server-1.0.3.tar.bz2
|
||||
evolution-data-server-1.1.4.1.tar.bz2
|
||||
|
||||
11
evolution-1.4.4-ldap-x86_64-hack.patch
Normal file
11
evolution-1.4.4-ldap-x86_64-hack.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- evolution-1.4.4/configure.ldaphack 2003-08-05 02:06:26.000000000 -0400
|
||||
+++ evolution-1.4.4/configure 2003-08-05 02:06:45.000000000 -0400
|
||||
@@ -12135,7 +12135,7 @@
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
|
||||
+LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
@ -1,30 +1,72 @@
|
||||
%define soup_version 2.2.1
|
||||
%define orbit2_version 2.9.8
|
||||
%define use_mozilla_nss 1
|
||||
%define ldap_support 1
|
||||
%define krb5_support 1
|
||||
%define nntp_support 1
|
||||
|
||||
%define eds_major 1.0
|
||||
%define soup_version 2.2.2
|
||||
%define orbit2_version 2.9.8
|
||||
%define libbonobo_version 2.4.2
|
||||
|
||||
%define eds_major 1.2
|
||||
|
||||
%if %{use_mozilla_nss}
|
||||
%define mozilla_version 1.7.5
|
||||
%endif
|
||||
|
||||
Summary: Backend data server for evolution
|
||||
Name: evolution-data-server
|
||||
Version: 1.0.3
|
||||
Release: 2
|
||||
Version: 1.1.4.1
|
||||
Release: 1
|
||||
License: GPL
|
||||
Group: System Environment/Libraries
|
||||
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
|
||||
#Patch1: evolution-data-server-1.0.2-fix-64-bit-build.patch
|
||||
#Patch2: fix_contact_leaks.patch
|
||||
Patch3: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch
|
||||
Patch4: evolution-data-server-1.0.2-fix-calendar-factory-GType.patch
|
||||
#Patch4: evolution-data-server-1.0.2-fix-calendar-factory-GType.patch
|
||||
|
||||
# Patch for part of bug #141283 not in upstream tarball (in Ximian bugzilla as 70267)
|
||||
Patch6: evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch
|
||||
#Patch6: evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch
|
||||
|
||||
Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-root
|
||||
Requires: libsoup >= %{soup_version}
|
||||
Requires: ORBit2 >= %{orbit2_version}
|
||||
BuildRequires: glib2-devel, gnome-vfs2-devel, GConf2-devel, openldap-devel
|
||||
Requires: libbonobo >= %{libbonobo_version}
|
||||
Requires: libgnomeui
|
||||
Requires: gnome-vfs2
|
||||
Requires: GConf2
|
||||
Requires: libglade2
|
||||
%if %{use_mozilla_nss}
|
||||
Requires: mozilla-nss >= 37:%{mozilla_version}
|
||||
Requires: mozilla-nspr >= 37:%{mozilla_version}
|
||||
%endif
|
||||
|
||||
BuildRequires: glib2-devel, gnome-vfs2-devel, GConf2-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: libsoup-devel >= %{soup_version}
|
||||
BuildRequires: ORBit2-devel >= %{orbit2_version}
|
||||
BuildRequires: libbonobo-devel >= %{libbonobo_version}
|
||||
BuildRequires: libgnomeui-devel
|
||||
BuildRequires: libglade2-devel
|
||||
%if %{use_mozilla_nss}
|
||||
BuildRequires: mozilla-nspr-devel >= 37:%{mozilla_version}
|
||||
BuildRequires: mozilla-nss-devel >= 37:%{mozilla_version}
|
||||
%else
|
||||
BuildRequires: openssl-devel
|
||||
%endif
|
||||
|
||||
%if %{ldap_support}
|
||||
BuildRequires: openldap-devel >= 2.0.11
|
||||
%endif
|
||||
|
||||
%if %{krb5_support}
|
||||
BuildRequires: krb5-devel
|
||||
# tweak for krb5 1.2 vs 1.3
|
||||
%define krb5dir /usr/kerberos
|
||||
#define krb5dir `pwd`/krb5-fakeprefix
|
||||
%endif
|
||||
|
||||
%description
|
||||
The evolution-data-server package provides a unified backend for programs that work with contacts, tasks, and calendar information.
|
||||
@ -47,15 +89,63 @@ evolution-data-server.
|
||||
#%patch1 -p1 -b .fix-64-bit-build
|
||||
#%patch2 -p1 -b .fix_contact_leaks
|
||||
%patch3 -p1 -b .workaround-cal-backend-leak
|
||||
%patch4 -p1 -b .fix-calendar-factory-GType
|
||||
#%patch4 -p1 -b .fix-calendar-factory-GType
|
||||
|
||||
|
||||
%patch6 -p0 -b .calendar-optimisation-XB70267
|
||||
#%patch6 -p0 -b .calendar-optimisation-XB70267
|
||||
|
||||
%patch98 -p1 -b .ldaphack
|
||||
|
||||
mkdir -p krb5-fakeprefix/include
|
||||
mkdir -p krb5-fakeprefix/lib
|
||||
mkdir -p krb5-fakeprefix/%{_lib}
|
||||
|
||||
%build
|
||||
%if %{ldap_support}
|
||||
%define ldap_flags --with-openldap=yes
|
||||
%else
|
||||
%define ldap_flags --without-openldap
|
||||
%endif
|
||||
|
||||
%if %{krb5_support}
|
||||
%define krb5_flags --with-krb5=%{krb5dir}
|
||||
%else
|
||||
%define krb5_flags --without-krb5
|
||||
%endif
|
||||
|
||||
%if %{nntp_support}
|
||||
%define nntp_flags --enable-nntp=yes
|
||||
%else
|
||||
%define nntp_flags --enable-nntp=no
|
||||
%endif
|
||||
|
||||
%if %{use_mozilla_nss}
|
||||
%define ssl_flags --with-nspr-includes=/usr/include/mozilla-%{mozilla_version}/nspr --with-nspr-libs=%{_libdir} --with-nss-includes=/usr/include/mozilla-%{mozilla_version}/nss --with-nss-libs=%{_libdir}
|
||||
%else
|
||||
%define ssl_flags --enable-openssl=yes
|
||||
%endif
|
||||
|
||||
%if %{use_mozilla_nss}
|
||||
if [ ! -f /usr/include/mozilla-%{mozilla_version}/nspr/nspr.h ]; then
|
||||
echo "Unable to find suitable version of mozilla nss to use!"
|
||||
exit 1
|
||||
fi
|
||||
%endif
|
||||
|
||||
CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
|
||||
CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}/et"; export CFLAGS
|
||||
%if ! %{use_mozilla_nss}
|
||||
if pkg-config openssl ; then
|
||||
CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
|
||||
LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
|
||||
fi
|
||||
%endif
|
||||
|
||||
%configure \
|
||||
--enable-gtk-doc \
|
||||
--enable-file-locking=fcntl --enable-dot-locking=no \
|
||||
%ldap_flags %krb5_flags %nntp_flags %ssl_flags
|
||||
export tagname=CC
|
||||
CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
|
||||
%configure --with-openldap=yes
|
||||
make LIBTOOL=/usr/bin/libtool
|
||||
|
||||
%install
|
||||
@ -67,7 +157,7 @@ make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
|
||||
find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec rm {} \;
|
||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
|
||||
|
||||
%find_lang %{name}-1.0
|
||||
%find_lang %{name}-%{eds_major}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -76,14 +166,18 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files -f %{name}-1.0.lang
|
||||
%files -f %{name}-%{eds_major}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc README COPYING ChangeLog NEWS AUTHORS
|
||||
%{_libdir}/bonobo/servers/*
|
||||
%{_libdir}/*.so.*
|
||||
%{_libexecdir}/evolution-data-server-%{eds_major}
|
||||
%{_libexecdir}/camel-index-control-%{eds_major}
|
||||
%{_libexecdir}/camel-lock-helper-%{eds_major}
|
||||
%{_datadir}/evolution-data-server-%{eds_major}
|
||||
%{_datadir}/idl/evolution-data-server-%{eds_major}
|
||||
%{_datadir}/pixmaps/evolution-data-server-%{eds_major}
|
||||
%{_libdir}/evolution-data-server-%{eds_major}
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
@ -94,6 +188,24 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 26 2005 David Malcolm <dmalcolm@redhat.com> - 1.1.4.1-1
|
||||
- Update from 1.0.3 to 1.1.4.1
|
||||
- Updated eds_major from 1.0 to 1.2; fixed translation search path.
|
||||
- Removed 64-bit patch for calendar backend hash table; upstream now stores pointers to ECalBackendFactory, rather than GType
|
||||
- Removed calendar optimisation patch for part of part of bug #141283 as this is now in the upstream tarball
|
||||
- Added /usr/lib/evolution-data-server-%{eds_major} to cover the extensions, plus the camel code now in e-d-s, rather than evolution
|
||||
- Added /usr/share/pixmaps/evolution-data-server-%{eds_major} to cover the category pixmaps
|
||||
- Camel code from evolution is now in evolution-data-server:
|
||||
- Added camel-index-control and camel-lock-helper to packaged files
|
||||
- Added mozilla dependency code from the evolution package
|
||||
- Ditto for LDAP
|
||||
- Ditto for krb5
|
||||
- Ditto for NNTP support handling
|
||||
- Ditto for --enable-file-locking and --enable-dot-locking
|
||||
- Added requirements on libbonobo, libgnomeui, gnome-vfs2, GConf2, libglade2
|
||||
- Updated libsoup requirement from 2.2.1 to 2.2.2
|
||||
- Enabled gtk-doc
|
||||
|
||||
* Wed Dec 15 2004 David Malcolm <dmalcolm@redhat.com> - 1.0.3-2
|
||||
- fixed packaging of translation files to reflect upstream change to GETTEXT_PACKAGE being evolution-data-server-1.0 rather than -1.5
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user