rpms/nspr/devel .cvsignore, 1.13, 1.14 nspr.spec, 1.29, 1.30 sources, 1.14, 1.15
Kai Engert (kengert)
fedora-extras-commits at redhat.com
Fri Feb 22 17:40:41 UTC 2008
- Previous message (by thread): rpms/setroubleshoot/F-8 setroubleshoot.spec,1.94,1.95
- Next message (by thread): rpms/libselinux/devel .cvsignore, 1.163, 1.164 libselinux-rhat.patch, 1.147, 1.148 libselinux.spec, 1.315, 1.316 sources, 1.165, 1.166
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kengert
Update of /cvs/extras/rpms/nspr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14225
Modified Files:
.cvsignore nspr.spec sources
Log Message:
* Fri Feb 22 2008 Kai Engert <kengert at redhat.com> - 4.7.0.99.1-1
- Update to NSPR 4.7.1 Beta 1
- Use /usr/lib{64} as devel libdir, create symbolic links.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nspr/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 9 Feb 2008 05:51:20 -0000 1.13
+++ .cvsignore 22 Feb 2008 17:40:08 -0000 1.14
@@ -1 +1 @@
-nspr-4.7.tar.gz
+nspr-4.7.0.99.1.tar.gz
Index: nspr.spec
===================================================================
RCS file: /cvs/extras/rpms/nspr/devel/nspr.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nspr.spec 9 Feb 2008 05:53:59 -0000 1.29
+++ nspr.spec 22 Feb 2008 17:40:08 -0000 1.30
@@ -1,6 +1,6 @@
Summary: Netscape Portable Runtime
Name: nspr
-Version: 4.7
+Version: 4.7.0.99.1
Release: 1%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/nspr/
@@ -52,7 +52,7 @@
./mozilla/nsprpub/configure \
--prefix=%{_prefix} \
- --libdir=/%{_lib} \
+ --libdir=%{_libdir} \
--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%%,/%{_lib},g" \
+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" \
@@ -87,18 +87,26 @@
$RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nspr.pc
%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
%{__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 \
$RPM_BUILD_ROOT/%{_bindir}/prerr.properties \
- $RPM_BUILD_ROOT/%{_lib}/libnspr4.a \
- $RPM_BUILD_ROOT/%{_lib}/libplc4.a \
- $RPM_BUILD_ROOT/%{_lib}/libplds4.a \
+ $RPM_BUILD_ROOT/%{_libdir}/libnspr4.a \
+ $RPM_BUILD_ROOT/%{_libdir}/libplc4.a \
+ $RPM_BUILD_ROOT/%{_libdir}/libplds4.a \
$RPM_BUILD_ROOT/%{_datadir}/aclocal/nspr.m4 \
$RPM_BUILD_ROOT/%{_includedir}/nspr4/md
+for file in libnspr4.so libplc4.so libplds4.so
+do
+ mv -f $RPM_BUILD_ROOT/%{_libdir}/$file $RPM_BUILD_ROOT/%{_lib}/$file
+ ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+done
+
+
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -116,11 +124,17 @@
%files devel
%defattr(-, root, root)
+%{_libdir}/libnspr4.so
+%{_libdir}/libplc4.so
+%{_libdir}/libplds4.so
%{_includedir}/nspr4
%{_libdir}/pkgconfig/nspr.pc
%{_bindir}/nspr-config
%changelog
+* Fri Feb 22 2008 Kai Engert <kengert at redhat.com> - 4.7.0.99.1-1
+- Update to NSPR 4.7.1 Beta 1
+- Use /usr/lib{64} as devel libdir, create symbolic links.
* Sat Feb 09 2008 Kai Engert <kengert at redhat.com> - 4.7-1
- Update to NSPR 4.7
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nspr/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 9 Feb 2008 05:51:20 -0000 1.14
+++ sources 22 Feb 2008 17:40:08 -0000 1.15
@@ -1 +1 @@
-f937c37f45b116130fef34b15afb6fac nspr-4.7.tar.gz
+d7e6b4cfad4908120194d9f2a86f58c9 nspr-4.7.0.99.1.tar.gz
- Previous message (by thread): rpms/setroubleshoot/F-8 setroubleshoot.spec,1.94,1.95
- Next message (by thread): rpms/libselinux/devel .cvsignore, 1.163, 1.164 libselinux-rhat.patch, 1.147, 1.148 libselinux.spec, 1.315, 1.316 sources, 1.165, 1.166
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list