rpms/nspr/devel nspr.spec,1.25,1.26

Kai Engert (kengert) fedora-extras-commits at redhat.com
Tue Jan 8 05:00:09 UTC 2008


Author: kengert

Update of /cvs/extras/rpms/nspr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13697

Modified Files:
	nspr.spec 
Log Message:
* Mon Jan 07 2008 Kai Engert <kengert at redhat.com> - 4.6.99-2
- move .so files to /lib



Index: nspr.spec
===================================================================
RCS file: /cvs/extras/rpms/nspr/devel/nspr.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nspr.spec	7 Nov 2007 00:29:59 -0000	1.25
+++ nspr.spec	8 Jan 2008 04:59:33 -0000	1.26
@@ -1,7 +1,7 @@
 Summary:	Netscape Portable Runtime
 Name:		nspr
 Version:	4.6.99.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
 URL:		http://www.mozilla.org/projects/nspr/
 Group:		System Environment/Libraries
@@ -52,7 +52,7 @@
 
 ./mozilla/nsprpub/configure \
                  --prefix=%{_prefix} \
-                 --libdir=%{_libdir} \
+                 --libdir=/%{_lib} \
                  --includedir=%{_includedir}/nspr4 \
 %ifarch x86_64 ppc64 ia64 s390x
                  --enable-64bit \
@@ -77,7 +77,7 @@
 cat ./config/nspr-config-vars > \
                      $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nspr.pc
 
-cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
+cat %{SOURCE1} | sed -e "s,%%libdir%%,/%{_lib},g" \
                      -e "s,%%prefix%%,%{_prefix},g" \
                      -e "s,%%exec_prefix%%,%{_prefix},g" \
                      -e "s,%%includedir%%,%{_includedir}/nspr4,g" \
@@ -93,9 +93,9 @@
 %{__rm} -rf \
    $RPM_BUILD_ROOT/%{_bindir}/compile-et.pl \
    $RPM_BUILD_ROOT/%{_bindir}/prerr.properties \
-   $RPM_BUILD_ROOT/%{_libdir}/libnspr4.a \
-   $RPM_BUILD_ROOT/%{_libdir}/libplc4.a \
-   $RPM_BUILD_ROOT/%{_libdir}/libplds4.a \
+   $RPM_BUILD_ROOT/%{_lib}/libnspr4.a \
+   $RPM_BUILD_ROOT/%{_lib}/libplc4.a \
+   $RPM_BUILD_ROOT/%{_lib}/libplds4.a \
    $RPM_BUILD_ROOT/%{_datadir}/aclocal/nspr.m4 \
    $RPM_BUILD_ROOT/%{_includedir}/nspr4/md
 
@@ -110,9 +110,9 @@
 
 %files
 %defattr(-,root,root)
-%{_libdir}/libnspr4.so
-%{_libdir}/libplc4.so
-%{_libdir}/libplds4.so
+/%{_lib}/libnspr4.so
+/%{_lib}/libplc4.so
+/%{_lib}/libplds4.so
 
 %files devel
 %defattr(-, root, root)
@@ -121,6 +121,9 @@
 %{_bindir}/nspr-config
 
 %changelog
+* Mon Jan 07 2008 Kai Engert <kengert at redhat.com> - 4.6.99-2
+- move .so files to /lib
+
 * Wed Nov 07 2007 Kai Engert <kengert at redhat.com> - 4.6.99-1
 - NSPR 4.7 alpha
 




More information about the fedora-extras-commits mailing list