diff --git a/.cvsignore b/.cvsignore index 3db87a8..f705176 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ db-3.1.17.tar.gz -evolution-1.0.2.tar.gz -nss-3.3.1.tar.gz +evolution-1.0.3.tar.gz diff --git a/evolution.spec b/evolution.spec index 861f616..fee22aa 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,31 +1,28 @@ -%define gal_version 0.19 -%define gtkhtml_version 1.0.1 +ExcludeArch: ia64 + +%define gal_version 0.19.1 +%define gtkhtml_version 1.0.2 %define ldap_support 1 -%define pilot_support 0 +%define pilot_support 1 +# note that nntp and krb5 support are both non-functional in evo 1.0.x; defines +# are only here for future convenience %define nntp_support 0 %define krb5_support 0 -# if you're building libnss as part of the build process instead of -# linking against shared libnss; can go away once our packages -# ship with shared libnss by default -%define static_nss 1 - %define dbdir db-3.1.17 -%define nssdir nss-3.3.1 %define buildtopdir $RPM_BUILD_DIR/%{name}-%{version} Name: evolution -Version: 1.0.2 -Release: 0.7x +Version: 1.0.3 +Release: 0.1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ Source0: %{name}-%{version}.tar.gz Source1: db-3.1.17.tar.gz -Source2: ftp.mozilla.org/pub/security/nss/releases/NSS_3_3_1_RTM/src/nss-3.3.1.tar.gz Patch0: evolution-1.0.1-dborder.patch -Patch1: evolution-1.0.1-staticlibnss.patch +Patch1: evolution-1.0.2-redhatifysummary.patch Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -34,6 +31,8 @@ Requires: scrollkeeper >= 0.1.4 Requires: bonobo >= 1.0.14 Requires: GConf >= 1.0.7 Requires: oaf >= 0.6.7 +Requires: mozilla-nss +Requires: mozilla-nspr BuildRequires: gtkhtml-devel >= %{gtkhtml_version} BuildRequires: gal-devel >= %{gal_version} @@ -47,10 +46,11 @@ BuildRequires: GConf-devel >= 0.6 BuildRequires: ORBit-devel >= 0.5.10 BuildRequires: gnome-print-devel >= 0.25 BuildRequires: libxml-devel >= 1.8.16 -BuildRequires: intltool >= 0.11 +BuildRequires: intltool >= 0.17 BuildRequires: gtk+-devel >= 1.2.9 -BuildRequires: mozilla-devel +BuildRequires: mozilla-nspr-devel +BuildRequires: mozilla-nss-devel %if %{ldap_support} BuildRequires: openldap >= 2.0.11 @@ -70,23 +70,10 @@ communications tool. The tools which make up Evolution will be tightly integrated with one another and act as a seamless personal information-management tool. -%package devel -Summary: Development libraries and headers for Evolution -Group: Development/Libraries -Requires: %{name} = %{version} - -%description devel -The evolution-devel package provides the static libraries and header -files necessary to build and link programs against the libraries included -with Evolution. - %prep -%setup -q -a 1 -a 2 +%setup -q -a 1 %patch0 -p0 -b .dborder - -%if %{static_nss} -%patch1 -p0 -b .staticnss -%endif +%patch1 -p0 -b .rhatify %build @@ -95,23 +82,6 @@ cd %{buildtopdir}/%{dbdir}/build_unix CFLAGS="$RPM_OPT_FLAGS" ../dist/configure --prefix=%{_prefix} --enable-static make -%if %{static_nss} -# build our libnss -cd %{buildtopdir}/%{nssdir}/mozilla/security/nss -make nss_build_all - -# now make a tree with libs and includes so we can point evo to it -# move all the libs and headers there -mkdir %{buildtopdir}/%{nssdir}/include || : -mkdir %{buildtopdir}/%{nssdir}/lib || : -find ./lib -name '*.h' -exec ln {} %{buildtopdir}/%{nssdir}/include \; -find ./lib -name '*.a' -exec ln {} %{buildtopdir}/%{nssdir}/lib \; -# need libdbm too -find %{buildtopdir}/%{nssdir}/mozilla/security/dbm -name '*.a' -exec ln {} %{buildtopdir}/%{nssdir}/lib \; -# make libssl.a be libssl3.a so we can link against it instead of openssl -ln %{buildtopdir}/%{nssdir}/lib/libssl.a %{buildtopdir}/%{nssdir}/lib/libssl3.a -%endif - ## back to evolution cd %{buildtopdir} @@ -140,13 +110,9 @@ cd %{buildtopdir} %define nntp_flags --enable-nntp=no %endif -%if %{static_nss} -%define nss_flags --with-nss-libs=%{buildtopdir}/%{nssdir}/lib --with-nss-includes=%{buildtopdir}/%{nssdir}/include -%else -%define nss_flags --with-nss-libs=/usr/lib --with-nss-includes=/usr/include/moznss -%endif +%define nss_flags --with-nss-libs=/usr/lib --with-nss-includes=/usr/include/nss -%configure --with-nspr-includes=/usr/include/mozilla/nspr \ +%configure --with-nspr-includes=/usr/include/nspr \ --with-nspr-libs=/usr/lib --enable-gtk-doc=no \ --with-db3-includes=%{buildtopdir}/%{dbdir}/build_unix \ --with-db3-libs=%{buildtopdir}/%{dbdir}/build_unix \ @@ -193,23 +159,30 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gnome-pilot/conduits/* %endif -%files devel -%defattr(-,root,root) -%{_includedir}/camel -%{_includedir}/ename -%{_includedir}/evolution -%{_libdir}/*.a -%{_libdir}/*.so - -%if %{pilot_support} -%{_libdir}/gnome-pilot/conduits/*.a -%endif - - %changelog -* Thu Jan 31 2002 Jeremy Katz 1.0.2-0.7x +* Sun Mar 24 2002 Jeremy Katz 1.0.3-0.1 +- rev to new 1.0.3 tarball + +* Wed Mar 20 2002 Jeremy Katz 1.0.3-0 +- update to evolution 1.0.3 +- change summary view to show a recent errata list by default + +* Thu Mar 14 2002 Jeremy Katz +- put correct path to nspr includes on configure command line + +* Mon Mar 11 2002 Jeremy Katz 1.0.2-3 +- mozilla 0.9.9 has nspr and nss subpackages, hooray! rip out the static + libnss linkage and just link against what is provided dynamically +- kill the -devel subpackage since it's of questionable use +- explicitly require mozilla-nss and mozilla-nspr packages to make it easier + to resolve the requirements + +* Thu Feb 21 2002 Jeremy Katz 1.0.2-2 +- rebuild in new environment +- temporarily exclude on ia64 again + +* Thu Jan 31 2002 Jeremy Katz 1.0.2-1 - update to 1.0.2 -- build for gnomehide without gnome-pilot support * Mon Jan 28 2002 Jeremy Katz 1.0.1-4 - build on ia64 now that mozilla exists for ia64 diff --git a/sources b/sources index 19bd96a..e87b93e 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz -05ca33abfabeaa14b8fd61c682fddad3 evolution-1.0.2.tar.gz -79c765ae0c54a0f327b85687ce823129 nss-3.3.1.tar.gz +28ffb3911f46a591466a78f5c805c0aa evolution-1.0.3.tar.gz