rpms/evolution/FC-3 evolution.spec,1.44,1.45

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/evolution/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv8813

Modified Files:
	evolution.spec 
Log Message:
* Wed Mar 23 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.4-2
- 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 (now 1.7.6)




Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-3/evolution.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- evolution.spec	24 Feb 2005 19:22:29 -0000	1.44
+++ evolution.spec	23 Mar 2005 19:22:33 -0000	1.45
@@ -1,10 +1,6 @@
 # no ppc64 mozilla
 ExcludeArch: ppc64
 
-# no s390/s390x mozilla right now:
-ExcludeArch: s390
-ExcludeArch: s390x
-
 %define gal_version 2:2.2.5
 %define gtkhtml_version 3.3.2
 %define soup_version 2.2.1
@@ -16,15 +12,8 @@
 %define gnome_icon_theme_version 1.3.6
 
 %if %{use_mozilla_nss}
-%define mozilla_version 1.7.3
-
-# FIXME!!!  s390/s390x don't have mozilla 1.7 yet
-%ifarch s390 s390x
-%define mozilla_version 1.6
-%endif
-
+%define mozilla_build_version 1.7.6
 %endif
-# end of use_mozilla_nss conditional section
 
 %define ldap_support 1
 %define krb5_support 1
@@ -38,7 +27,7 @@
 
 Name: evolution
 Version: 2.0.4
-Release: 1
+Release: 2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -73,11 +62,6 @@
 Requires: scrollkeeper >= 0.1.4
 Requires: ORBit2 >= 2.7.5
 
-%if %{use_mozilla_nss}
-Requires: mozilla-nss >= 37:%{mozilla_version}
-Requires: mozilla-nspr >= 37:%{mozilla_version}
-%endif
-
 Requires: libsoup >= %{soup_version}
 Requires: libgal2 >= %{gal_version}
 Requires: evolution-data-server >= %{eds_version}
@@ -108,8 +92,8 @@
 BuildRequires: gnutls-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
@@ -203,13 +187,13 @@
 %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
@@ -323,6 +307,18 @@
 %{_libdir}/evolution/%{evo_major}/*/*.a
 
 %changelog
+* Wed Mar 23 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.4-2
+- 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 (now 1.7.6)
+
 * Thu Feb 24 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.4-1
 - Bugfix update from stable 2.0.2 to stable 2.0.4
 - Updated dependency on libsoup from 2.2.0 to 2.2.1