- Removed explicit run-time spec-file requirement on mozilla. The Mozilla
NSS API/ABI stabilised by version 1.7.3 The libraries are always
    located in the libdir However, the headers are in
    /usr/include/mozilla-%{mozilla_build_version} and so they move each
    time the mozilla version changes. So we no longer have an explicit
    mozilla run-time requirement in the specfile; a requirement on the
    appropriate NSS and NSPR .so files is automagically generated on build.
    We have an explicit, exact build-time version, so that we can find the
    headers (without invoking an RPM query from the spec file; to do so is
    considered bad practice)
- Introduced mozilla_build_version, to replace mozilla_version
- Set mozilla_build_version to 1.7.6 to reflect current state of tree
			
			
This commit is contained in:
		
							parent
							
								
									830276226b
								
							
						
					
					
						commit
						86b1ee96a1
					
				| @ -20,14 +20,20 @@ ExcludeArch: ppc64 | ||||
| %define use_gtk_doc 1 | ||||
| %endif | ||||
| 
 | ||||
| ########################################################## | ||||
| # The Mozilla NSS API/ABI stabilised by version 1.7.3 | ||||
| # The libraries are always located in the libdir, and a dependency on them will be autogenerated. | ||||
| # However, the headers are in /usr/include/mozilla-%{mozilla_build_version} and so they move each time the mozilla version changes. | ||||
| # We use this macro to locate the headers: | ||||
| %if %{use_mozilla_nss} | ||||
| %define mozilla_version 1.7.5 | ||||
| %define mozilla_build_version 1.7.6 | ||||
| %endif | ||||
| ########################################################## | ||||
| 
 | ||||
| Summary: Backend data server for evolution | ||||
| Name: evolution-data-server | ||||
| Version: 1.2.0 | ||||
| Release: 2 | ||||
| Release: 3 | ||||
| License: GPL | ||||
| Group: System Environment/Libraries | ||||
| Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 | ||||
| @ -50,11 +56,6 @@ 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} | ||||
| @ -63,8 +64,8 @@ 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} | ||||
| BuildRequires: mozilla-nspr-devel >= 37:%{mozilla_build_version} | ||||
| BuildRequires: mozilla-nss-devel >= 37:%{mozilla_build_version} | ||||
| %else | ||||
| BuildRequires: openssl-devel | ||||
| %endif | ||||
| @ -137,13 +138,13 @@ mkdir -p krb5-fakeprefix/%{_lib} | ||||
| %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} | ||||
| %define ssl_flags --with-nspr-includes=/usr/include/mozilla-%{mozilla_build_version}/nspr --with-nspr-libs=%{_libdir} --with-nss-includes=/usr/include/mozilla-%{mozilla_build_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 | ||||
| if [ ! -f /usr/include/mozilla-%{mozilla_build_version}/nspr/nspr.h ]; then | ||||
|   echo "Unable to find suitable version of mozilla nss to use!" | ||||
|   exit 1 | ||||
| fi | ||||
| @ -211,6 +212,19 @@ rm -rf $RPM_BUILD_ROOT | ||||
| 
 | ||||
| 
 | ||||
| %changelog | ||||
| * Thu Mar 10 2005 David Malcolm <dmalcolm@redhat.com> - 1.2.0-3 | ||||
| - Removed explicit run-time spec-file requirement on mozilla. | ||||
|   The Mozilla NSS API/ABI stabilised by version 1.7.3 | ||||
|   The libraries are always located in the libdir | ||||
|   However, the headers are in /usr/include/mozilla-%{mozilla_build_version} | ||||
|   and so they move each time the mozilla version changes. | ||||
|   So we no longer have an explicit mozilla run-time requirement in the specfile;  | ||||
|   a requirement on the appropriate NSS and NSPR .so files is automagically generated on build. | ||||
|   We have an explicit, exact build-time version, so that we can find the headers (without | ||||
|   invoking an RPM query from the spec file; to do so is considered bad practice) | ||||
| - Introduced mozilla_build_version, to replace mozilla_version | ||||
| - Set mozilla_build_version to 1.7.6 to reflect current state of tree | ||||
| 
 | ||||
| * Tue Mar  8 2005 David Malcolm <dmalcolm@redhat.com> - 1.2.0-2 | ||||
| - Added a patch to deal with glibc defining a macro called "read" | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user