Browse Source

nspr: update to 4.9.2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6793 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 11 years ago
parent
commit
af5de331e9
1 changed files with 4 additions and 20 deletions
  1. 4 20
      n/nspr/nspr-vl.spec

+ 4 - 20
n/nspr/nspr-vl.spec

@@ -3,14 +3,12 @@
 Summary:	Netscape Portable Runtime
 Summary(ja):    Netscape ポータブルランタイム
 Name:		nspr
-Version:	4.9
+Version:	4.9.2
 Release:	1%{?_dist_release}
 License:	MPLv1.1/GPLv2+/LGPLv2+
 URL:		http://www.mozilla.org/projects/nspr/
 Group:		System Environment/Libraries
 Source0:	%{name}-%{version}.tar.bz2
-Source1:	nspr.pc.in
-Source2:	nspr-config-vars.in
 
 Patch1:         nspr-config-pc.patch
 
@@ -67,8 +65,6 @@ memory management (malloc and free) and shared library linking.
 cp ./mozilla/nsprpub/config/nspr-config.in ./mozilla/nsprpub/config/nspr-config-pc.in
 %patch1 -p0
 
-cp %{SOURCE2} ./mozilla/nsprpub/config/
-
 %build
 
 ./mozilla/nsprpub/configure \
@@ -95,21 +91,6 @@ NSPR_CFLAGS=`./config/nspr-config --cflags`
 NSPR_VERSION=`./config/nspr-config --version`
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
-cat ./config/nspr-config-vars > \
-                     $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nspr.pc
-
-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,%%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
-
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
-%{__cp} ./config/nspr-config-pc $RPM_BUILD_ROOT/%{_bindir}/nspr-config
-
 # Get rid of the things we don't want installed (per upstream)
 %{__rm} -rf \
    $RPM_BUILD_ROOT/%{_bindir}/compile-et.pl \
@@ -149,6 +130,9 @@ cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
 
 
 %changelog
+* Mon Sep 03 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 4.9.2
+- new upstream release
+
 * Sun Mar 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.9-1
 - new upstram release
 - update Patch1 (nspr-config-pc.patch)