rpms/nspr/devel nspr.pc.in,1.2,1.3 nspr.spec,1.6,1.7

[fedora-cvs-commits redhat com]

Author: caillon

Update of /cvs/dist/rpms/nspr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4540

Modified Files:
	nspr.pc.in nspr.spec 
Log Message:
* Fri Jul 15 2005 Christopher Aillon <caillon redhat com> 4.6-4
- Use the NSPR version numbering scheme reported by NSPR,
  which unfortunately is not exactly the same as the real
  version (4.6 != 4.6.0 according to RPM and pkgconfig).



Index: nspr.pc.in
===================================================================
RCS file: /cvs/dist/rpms/nspr/devel/nspr.pc.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nspr.pc.in	15 Jul 2005 18:25:46 -0000	1.2
+++ nspr.pc.in	16 Jul 2005 03:32:47 -0000	1.3
@@ -5,6 +5,6 @@
 
 Name: NSPR
 Description: The Netscape Portable Runtime
-Version: %MOZILLA_VERSION%
+Version: %NSPR_VERSION%
 Libs: %FULL_NSPR_LIBS%
 Cflags: %FULL_NSPR_CFLAGS%


Index: nspr.spec
===================================================================
RCS file: /cvs/dist/rpms/nspr/devel/nspr.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nspr.spec	15 Jul 2005 18:25:46 -0000	1.6
+++ nspr.spec	16 Jul 2005 03:32:47 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:	Netscape Portable Runtime
 Name:		nspr
 Version:	4.6
-Release:	3
+Release:	4
 License:	MPL/GPL/LGPL
 URL:		http://www.mozilla.org/projects/nspr/
 Group:		System Environment/Libraries
@@ -58,12 +58,13 @@
 
 NSPR_LIBS=`./config/nspr-config --libs`
 NSPR_CFLAGS=`./config/nspr-config --cflags`
+NSPR_VERSION=`./config/nspr-config --version`
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
                      -e "s,%%prefix%%,%{_prefix},g" \
                      -e "s,%%exec_prefix%%,%{_prefix},g" \
                      -e "s,%%includedir%%,%{_includedir}/nspr4,g" \
-                     -e "s,%%MOZILLA_VERSION%%,%{version},g" \
+                     -e "s,%%NSPR_VERSION%%,$NSPR_VERSION,g" \
                      -e "s,%%FULL_NSPR_LIBS%%,$NSPR_LIBS,g" \
                      -e "s,%%FULL_NSPR_CFLAGS%%,$NSPR_CFLAGS,g" > \
                      $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nspr.pc
@@ -79,7 +80,7 @@
    $RPM_BUILD_ROOT/%{_includedir}/nspr4/md
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig >/dev/null 2>/dev/null
@@ -107,6 +108,11 @@
 %{_libdir}/libplds4.a
 
 %changelog
+* Fri Jul 15 2005 Christopher Aillon <caillon redhat com> 4.6-4
+- Use the NSPR version numbering scheme reported by NSPR,
+  which unfortunately is not exactly the same as the real
+  version (4.6 != 4.6.0 according to RPM and pkgconfig).
+
 * Fri Jul 15 2005 Christopher Aillon <caillon redhat com> 4.6-3
 - Correct the CFLAGS reported by pkgconfig