* evolution-data-server.spec: Disable pilot-conduits on solaris,
use firefox nss/nspr lib instead of mozilla's.
* evolution.spec: Use firefox nss/nspr lib instead of mozilla's.
* Solaris/SUNWevolution-data-server.spec: Add firefox dependence,
add firefox lib to LDFLAGS, add firefox include to CFLAGS.
* Solaris/SUNWevolution.spec: Disable gnome_pilot_link.
* Solaris/patches/evolution-data-server-03-libexec.diff: Fix bug #6334159.
--- a/ChangeLog Fri Oct 21 03:12:40 2005 +0000
+++ b/ChangeLog Fri Oct 21 03:51:00 2005 +0000
@@ -1,3 +1,15 @@
+2005-10-21 Halton Huo <[email protected]>
+
+ * evolution-data-server.spec: Disable pilot-conduits on solaris,
+ use firefox nss/nspr lib instead of mozilla's.
+ * evolution.spec: Use firefox nss/nspr lib instead of mozilla's.
+
+2005-10-21 Dave Lin <[email protected]>
+
+ * firefox.spec: Update version from 1.5b1 to 1.5b2 and add patch 307041
+ from bugzilla, Change configure option per Leo Sha from developer team,
+ Add nss header file in development package
+
2005-10-20 Damien Carbery <[email protected]>
* pyspi.spec: Remove 'make' call from %install. Already in '%build'.
--- a/Solaris/ChangeLog Fri Oct 21 03:12:40 2005 +0000
+++ b/Solaris/ChangeLog Fri Oct 21 03:51:00 2005 +0000
@@ -1,3 +1,10 @@
+2005-10-21 Halton Huo <[email protected]>
+
+ * SUNWevolution-data-server.spec: Add firefox dependence,
+ add firefox lib to LDFLAGS, add firefox include to CFLAGS.
+ * SUNWevolution.spec: Disable gnome_pilot_link.
+ * patches/evolution-data-server-03-libexec.diff: Fix bug #6334159.
+
2005-10-20 Damien Carbery <[email protected]>
* SUNWPython-extra.spec: Correct copyright date, to 2005.
@@ -127,6 +134,13 @@
* extra-specs/libogg.spec: fix url
* extra-specs/libvorbis.spec: fix url
+2005-10-12 Halton Huo <[email protected]>
+
+ * patches/evolution-01-solaris-ldap.diff,
+ patches/evolution-data-server-01-ldap-ssl.diff,
+ patches/evolution-exchange-01-ldap.diff:
+ Updated for version bumped.
+
2005-10-11 Halton Huo <[email protected]>
* patches/evolution-02-solaris-sed.diff: Avoid generate error cause
--- a/Solaris/SUNWevolution-data-server.spec Fri Oct 21 03:12:40 2005 +0000
+++ b/Solaris/SUNWevolution-data-server.spec Fri Oct 21 03:51:00 2005 +0000
@@ -9,6 +9,7 @@
#
%include Solaris.inc
+%define firefox_prefix /usr/sfw
%use eds = evolution-data-server.spec
Name: SUNWevolution-data-server
@@ -19,13 +20,16 @@
%include default-depend.inc
Patch1: evolution-data-server-01-ldap-ssl.diff
Patch2: evolution-data-server-02-ldap-ssl-addfiles.diff
+Patch3: evolution-data-server-03-libexec.diff
Requires: SUNWevolution-data-server-share
Requires: SUNWgnome-libs
+Requires: SUNWfirefox
BuildRequires: SUNWgnome-libs-devel
BuildRequires: SUNWgnome-component-devel
BuildRequires: SUNWgnome-config-devel
BuildRequires: SUNWgnome-vfs-devel
BuildRequires: SUNWevolution-libs-devel
+BuildRequires: SUNWfirefox-devel
%package devel
Summary: Sun One Backend Library for Evolution - developer files
@@ -51,11 +55,12 @@
cd %{_builddir}/%name-%version/evolution-data-server-%{eds.version}
%patch1 -p0
%patch2 -p0
+%patch3 -p0
cd ..
%build
-export LDFLAGS="%_ldflags -L%{_libdir} -R%{_libdir}"
-export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags -L%{firefox_prefix}/lib/firefox -R%{firefox_prefix}/lib/firefox -L%{_libdir} -R%{_libdir}"
+export CFLAGS="%optflags -I%{firefox_prefix}/include/firefox"
export MSGFMT="/usr/bin/msgfmt"
export PKG_CONFIG_PATH="%{_pkg_config_path}"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
@@ -100,6 +105,10 @@
%{_datadir}/locale
%changelog
+* Fri Oct 21 2005 - [email protected]
+- evolution-data-server-03-libexec.diff: Fix bug #6334159.
+- Add firefox dependence, add firefox lib to LDFLAGS, add firefox include to CFLAGS.
+
* Mon Oct 10 2005 - [email protected]
- Move upstreamed patch evolution-data-server-03-solaris-kerberos.diff.
--- a/Solaris/SUNWevolution.spec Fri Oct 21 03:12:40 2005 +0000
+++ b/Solaris/SUNWevolution.spec Fri Oct 21 03:51:00 2005 +0000
@@ -11,7 +11,7 @@
%include Solaris.inc
%define firefox_prefix /usr/sfw
# Uncomment to include gnome-pilot-link, when it is acceptable quality.
-%define with_pilot_link 1
+#%define with_pilot_link 1
%define major_version 2.4
%use evolution = evolution.spec
@@ -28,18 +28,22 @@
Source4: evolution-addressbook-import.1
Patch1: evolution-01-solaris-ldap.diff
Patch2: evolution-02-solaris-sed.diff
-BuildRequires: SUNWgnome-javahelp-convert
Requires: SUNWevolution-share
Requires: SUNWevolution-root
Requires: SUNWevolution-libs
-%{?with_pilot_link:Requires: SUNWgnome-pilot-link}
Requires: SUNWfirefox
Requires: SUNWidnl
+%{?with_pilot_link:Requires: SUNWpltlk}
+%{?with_pilot_link:Requires: SUNWgnome-pilot}
BuildRequires: SUNWfirefox-devel
+BuildRequires: SUNWgnome-javahelp-convert
BuildRequires: SUNWidnd
BuildRequires: SUNWdtbas
BuildRequires: SUNWevolution-data-server
-%{?with_pilot_link:BuildRequires: SUNWgnome-pilot-link-devel}
+%{?with_pilot_link:BuildRequires: SUNWpltlk}
+%{?with_pilot_link:BuildRequires: SUNWsfwhea}
+%{?with_pilot_link:BuildRequires: SUNWgnome-pilot}
+%{?with_pilot_link:BuildRequires: SUNWgnome-pilot-devel}
%package share
Summary: Evolution Email and Calendar - platform independent, /usr/share
@@ -81,7 +85,7 @@
%build
export LDFLAGS="%_ldflags -L%{firefox_prefix}/lib/firefox -R%{firefox_prefix}/lib/firefox -L%{_libdir} -R%{_libdir}"
-export CFLAGS="-I%{_includedir} -I/usr/sfw/include %optflags"
+export CFLAGS="-I%{_includedir} -I%{firefox_prefix}/include/firefox %optflags"
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
@@ -123,10 +127,11 @@
%{_libdir}/bonobo/servers
%{_libdir}/evolution/%{major_version}/*.so*
%{_libdir}/evolution/%{major_version}/components/*.so
-%{_libdir}/evolution/%{major_version}/conduits/*.so
+%{?with_pilot_link:%{_libdir}/evolution/%{major_version}/conduits/*.so}
%{_libdir}/evolution/%{major_version}/plugins/*.so
%{_libdir}/evolution/%{major_version}/plugins/*.eplug
%{_libdir}/evolution/%{major_version}/plugins/*.xml
+%{?with_pilot_link:%{_libdir}/gnome-pilot/conduits/lib*.so*}
%{_libexecdir}/evolution-%{major_version}
%{_libexecdir}/evolution/%{major_version}/csv2vcard
%{_libexecdir}/evolution/%{major_version}/evolution-addressbook-clean
@@ -176,6 +181,9 @@
%defattr (0755, root, sys)
%changelog
+* Fri Oct 21 2005 - [email protected]
+- Disable gnome_pilot_link.
+
* Mon Oct 10 2005 - [email protected]
- Change build require from mozilla to firefox.
- Move upstreamed patch evolution-02-solaris-kerberos.diff.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/patches/evolution-data-server-03-libexec.diff Fri Oct 21 03:51:00 2005 +0000
@@ -0,0 +1,76 @@
+? evolution-data-server-libexec-2.4.diff
+Index: configure.in
+===================================================================
+RCS file: /cvs/gnome/evolution-data-server/configure.in,v
+retrieving revision 1.134.2.2
+diff -u -r1.134.2.2 configure.in
+--- configure.in 3 Oct 2005 12:02:52 -0000 1.134.2.2
++++ configure.in 14 Oct 2005 01:47:48 -0000
+@@ -1230,7 +1230,7 @@
+ AC_SUBST(INTERFACE_VERSION)
+ AC_DEFINE_UNQUOTED(INTERFACE_VERSION, "$INTERFACE_VERSION", [IDL interface version (Major.Minor)])
+
+-EVO_SUBST_SERVER_RULE='%.server.in: %.server.in.in ; sed -e "s|\@BINDIR\@|$(bindir)|" -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@COMPONENTDIR\@|$(componentdir)|" -e "s|\@IMPORTERSDIR\@|$(importersdir)|" -e "s|\@EXEEXT\@|$(EXEEXT)|" -e "s|\@VERSION\@|$(BASE_VERSION)|" -e "s|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|" $< > $@'
++EVO_SUBST_SERVER_RULE='%.server.in: %.server.in.in ; sed -e "s|\@BINDIR\@|$(bindir)|" -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@COMPONENTDIR\@|$(componentdir)|" -e "s|\@IMPORTERSDIR\@|$(importersdir)|" -e "s|\@EXEEXT\@|$(EXEEXT)|" -e "s|\@VERSION\@|$(BASE_VERSION)|" -e "s|\@API_VERSION\@|$(API_VERSION)|" -e "s|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|" $< > $@'
+ EVO_NAME_SERVER_RULE='%_$(API_VERSION).server: %.server ; mv $< $@'
+ AC_SUBST(EVO_SUBST_SERVER_RULE)
+ AC_SUBST(EVO_NAME_SERVER_RULE)
+Index: src/GNOME_Evolution_DataServer.server.in.in
+===================================================================
+RCS file: /cvs/gnome/evolution-data-server/src/GNOME_Evolution_DataServer.server.in.in,v
+retrieving revision 1.4
+diff -u -r1.4 GNOME_Evolution_DataServer.server.in.in
+--- src/GNOME_Evolution_DataServer.server.in.in 28 Jul 2005 19:01:56 -0000 1.4
++++ src/GNOME_Evolution_DataServer.server.in.in 14 Oct 2005 01:47:51 -0000
+@@ -2,7 +2,7 @@
+
+ <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_BookFactory:@VERSION@"
+ type="exe"
+- location="@LIBEXECDIR@/evolution-data-server-@VERSION@@EXEEXT@">
++ location="@LIBEXECDIR@/evolution-data-server-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@">
+
+ <oaf_attribute name="repo_ids" type="stringv">
+ <item value="IDL:GNOME/Evolution/DataServer/BookFactory:@VERSION@"/>
+@@ -15,7 +15,7 @@
+
+ <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_CalFactory:@VERSION@"
+ type="exe"
+- location="@LIBEXECDIR@/evolution-data-server-@VERSION@@EXEEXT@">
++ location="@LIBEXECDIR@/evolution-data-server-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@">
+
+ <oaf_attribute name="repo_ids" type="stringv">
+ <item value="IDL:GNOME/Evolution/DataServer/CalFactory:@VERSION@"/>
+@@ -28,7 +28,7 @@
+
+ <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_InterfaceCheck"
+ type="exe"
+- location="@LIBEXECDIR@/evolution-data-server-@VERSION@@EXEEXT@">
++ location="@LIBEXECDIR@/evolution-data-server-@API_VERSION@/evolution-data-server@VERSION@@EXEEXT@">
+
+ <oaf_attribute name="repo_ids" type="stringv">
+ <item value="IDL:GNOME/Evolution/ServerInterfaceCheck:1.0"/>
+@@ -40,7 +40,7 @@
+
+ <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_Logging"
+ type="exe"
+- location="@LIBEXECDIR@/evolution-data-server-@VERSION@@EXEEXT@">
++ location="@LIBEXECDIR@/evolution-data-server-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@">
+
+ <oaf_attribute name="repo_ids" type="stringv">
+ <item value="IDL:GNOME/Evolution/ServerLogging:1.0"/>
+Index: src/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/evolution-data-server/src/Makefile.am,v
+retrieving revision 1.20
+diff -u -r1.20 Makefile.am
+--- src/Makefile.am 13 Aug 2005 02:34:55 -0000 1.20
++++ src/Makefile.am 14 Oct 2005 01:47:51 -0000
+@@ -58,7 +58,7 @@
+
+ install-evolution-data-servers:
+ $(mkinstalldirs) $(DESTDIR)$(libexecdir)
+- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-data-server $(DESTDIR)$(libexecdir)/evolution-data-server-$(BASE_VERSION)
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-data-server $(DESTDIR)$(libexecdir)/evolution-data-server-$(API_VERSION)/evolution-data-server-$(BASE_VERSION)
+
+ SERVER_IN_FILE=GNOME_Evolution_DataServer.server.in.in
+
--- a/evolution-data-server.spec Fri Oct 21 03:12:40 2005 +0000
+++ b/evolution-data-server.spec Fri Oct 21 03:51:00 2005 +0000
@@ -75,9 +75,11 @@
%ifos linux
%define ldap_option --with-openldap=%{_prefix}
%define krb5_option --with-krb5=%{_prefix}
+%define firefox_prefix /usr
%else
%define ldap_option --with-sunldap=%{_prefix}
%define krb5_option --with-krb5=no
+%define firefox_prefix /usr/sfw
%endif
export LDFLAGS="$LDFLAGS -R%{_libdir}/mozilla"
@@ -96,13 +98,13 @@
--enable-nss=yes \
--enable-smime=yes \
--enable-nntp=yes \
- --with-nss-includes=%{_includedir}/mozilla/nss \
- --with-nss-libs=%{_libdir}/mozilla \
- --with-nspr-includes=%{_includedir}/mozilla/nspr \
- --with-nspr-libs=%{_libdir}/mozilla \
- %ldap_option \
+ --with-nss-includes=%{firefox_prefix}/include/firefox/nss \
+ --with-nss-libs=%{firefox_prefix}/lib/firefox \
+ --with-nspr-includes=%{firefox_prefix}/include/firefox/nspr \
+ --with-nspr-libs=%{firefox_prefix}/lib/firefox \
+ %ldap_option \
--with-krb4=%{_prefix} \
- %krb5_option
+ %krb5_option
make
@@ -145,6 +147,9 @@
%{_datadir}/idl/*
%changelog
+* Fri Oct 21 2005 - [email protected]
+- Use firefox nss/nspr lib instead of mozilla's.
+
* Wed Oct 12 2005 - [email protected]
- change --with-ldap to --with-sunldap.
--- a/evolution.spec Fri Oct 21 03:12:40 2005 +0000
+++ b/evolution.spec Fri Oct 21 03:51:00 2005 +0000
@@ -24,7 +24,6 @@
Prereq: GConf
%define major_version 2.4
-%define krb5_prefix /usr/local
%define GConf_version 2.5.0
%define gtkhtml_version 3.2
@@ -86,19 +85,22 @@
%prep
%setup -q
-#%patch1 -p0
%build
%ifos linux
%define ldap_option --with-openldap=%{_prefix}
%define krb5_option --with-krb5=%{_prefix}
+%define pilot_option --enable-pilot-conduits=yes
+%define firefox_prefix /usr
%else
%define ldap_option --with-sunldap=%{_prefix}
%define krb5_option --with-krb5=no
+%define pilot_option --enable-pilot-conduits=no
+%define firefox_prefix /usr/sfw
%endif
-export LDFLAGS="$LDFLAGS -R%{_libdir}/mozilla"
+export LDFLAGS="$LDFLAGS -R%{firefox_prefix}/lib/firefox"
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
aclocal $ACLOCAL_FLAGS
@@ -115,12 +117,12 @@
--enable-nss=yes \
--enable-smime=yes \
--enable-nntp=yes \
- --enable-pilot-conduits=yes \
+ %pilot_option \
%ldap_option \
- --with-nss-includes=%{_includedir}/mozilla/nss \
- --with-nss-libs=%{_libdir}/mozilla \
- --with-nspr-includes=%{_includedir}/mozilla/nspr \
- --with-nspr-libs=%{_libdir}/mozilla \
+ --with-nss-includes=%{firefox_prefix}/include/firefox/nss \
+ --with-nss-libs=%{firefox_prefix}/lib/firefox \
+ --with-nspr-includes=%{firefox_prefix}/include/firefox/nspr \
+ --with-nspr-libs=%{firefox_prefix}/lib/firefox \
--with-krb4=%{_prefix} \
%krb5_option
@@ -131,7 +133,7 @@
make -i install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
rm $RPM_BUILD_ROOT%{_libdir}/evolution/%{major_version}/components/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/evolution/%{major_version}/conduits/*.la
+#rm $RPM_BUILD_ROOT%{_libdir}/evolution/%{major_version}/conduits/*.la
rm $RPM_BUILD_ROOT%{_libdir}/evolution/%{major_version}/*.la
rm $RPM_BUILD_ROOT%{_libdir}/evolution/%{major_version}/plugins/*.la
@@ -190,6 +192,10 @@
%{_datadir}/gnome-pilot/*
%changelog
+* Fri Oct 21 2005 - [email protected]
+- Disable pilot-conduits on solaris for does not work now.
+- Use firefox nss/nspr lib instead of mozilla's.
+
* Wed Oct 12 2005 - [email protected]
- change --with-ldap to --with-sunldap.