SPECS: mozldap.spec - use different macro as nspr/nss versions are...

[glen]

Author: glen                         Date: Sat Apr 29 21:40:59 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use different macro as nspr/nss versions are also used in pkgconfig file

---- Files affected:
SPECS:
   mozldap.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/mozldap.spec
diff -u SPECS/mozldap.spec:1.4 SPECS/mozldap.spec:1.5
--- SPECS/mozldap.spec:1.4	Sat Apr 29 23:38:50 2006
+++ SPECS/mozldap.spec	Sat Apr 29 23:40:54 2006
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
-%define	nspr_version	1:4.6
-%define	nss_version	1:3.11
+%define	nspr_version	4.6
+%define	nspr_evr 1:%{nspr_version}
+%define	nss_version	3.11
+%define	nss_evr 1:%{nss_version}
 %define	svrcore_version	4.0.1
 %define	major		5
 %define	minor		17
@@ -15,12 +17,12 @@
 # Source0-md5	453341111111111
 URL:		http://www.mozilla.org/directory/csdk.html
 BuildRequires:	gawk
-BuildRequires:	nspr-devel >= %{nspr_version}
-BuildRequires:	nss-devel >= %{nss_version}
+BuildRequires:	nspr-devel >= %{nspr_evr}
+BuildRequires:	nss-devel >= %{nss_evr}
 BuildRequires:	pkgconfig
 BuildRequires:	svrcore-devel >= %{svrcore_version}
-Requires:	nspr >= %{nspr_version}
-Requires:	nss >= %{nss_version}
+Requires:	nspr >= %{nspr_evr}
+Requires:	nss >= %{nss_evr}
 Provides:	mozldap
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,8 +35,8 @@
 %package tools
 Summary:	Tools for the Mozilla LDAP C SDK
 Group:		System
-BuildRequires:	nspr-devel >= %{nspr_version}
-BuildRequires:	nss-devel >= %{nss_version}
+BuildRequires:	nspr-devel >= %{nspr_evr}
+BuildRequires:	nss-devel >= %{nss_evr}
 BuildRequires:	svrcore-devel >= %{svrcore_version}
 Requires:	mozldap = %{version}-%{release}
 Provides:	mozldap-tools
@@ -46,8 +48,8 @@
 %package devel
 Summary:	Development libraries and examples for Mozilla LDAP C SDK
 Group:		Development/Libraries
-BuildRequires:	nspr-devel >= %{nspr_version}
-BuildRequires:	nss-devel >= %{nss_version}
+BuildRequires:	nspr-devel >= %{nspr_evr}
+BuildRequires:	nss-devel >= %{nss_evr}
 Requires:	mozldap = %{version}-%{release}
 Provides:	mozldap-devel
 
@@ -181,6 +183,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/04/29 21:40:54  glen
+- use different macro as nspr/nss versions are also used in pkgconfig file
+
 Revision 1.4  2006/04/29 21:38:50  glen
 - mozldap.pc.in moved to proper place
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozldap.spec?r1=1.4&r2=1.5&f=u