OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-May-2008 23:55:44
Branch: HEAD Handle: 2008052422554400
Added files:
openpkg-src/nspr nspr.pc
Modified files:
openpkg-src/nspr nspr.spec
Log:
move libs to subdir (for NSS alignment) and add pkg-config file
Summary:
Revision Changes Path
1.1 +10 -0 openpkg-src/nspr/nspr.pc
1.41 +8 -2 openpkg-src/nspr/nspr.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nspr/nspr.pc
============================================================================
$ cvs diff -u -r0 -r1.1 nspr.pc
--- /dev/null 2008-05-24 23:55:36 +0200
+++ nspr.pc 2008-05-24 23:55:44 +0200
@@ -0,0 +1,10 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+Name: Mozilla NSPR
+Description: Mozilla Netscape Portable Runtime (NSPR)
+Version: @version@
+Libs: -L${libdir}/nspr -lplds4 -lplc4 -lnspr4
+Cflags: -I${includedir}/nspr -I${includedir}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nspr/nspr.spec
============================================================================
$ cvs diff -u -r1.40 -r1.41 nspr.spec
--- openpkg-src/nspr/nspr.spec 24 May 2008 18:40:38 -0000 1.40
+++ openpkg-src/nspr/nspr.spec 24 May 2008 21:55:44 -0000 1.41
@@ -36,6 +36,7 @@
# list of sources
Source0:
ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v%{version}/src/nspr-%{version}.tar.gz
+Source1: nspr.pc
Patch0: nspr.patch
# build information
@@ -80,7 +81,8 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/include/nspr/obsolete \
$RPM_BUILD_ROOT%{l_prefix}/include/nspr/private \
- $RPM_BUILD_ROOT%{l_prefix}/lib
+ $RPM_BUILD_ROOT%{l_prefix}/lib/nspr \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
%{l_shtool} install -c -m 644 \
mozilla/nsprpub/dist/include/nspr/*.h \
$RPM_BUILD_ROOT%{l_prefix}/include/nspr/
@@ -92,7 +94,11 @@
$RPM_BUILD_ROOT%{l_prefix}/include/nspr/private/
%{l_shtool} install -c -m 644 \
mozilla/nsprpub/dist/lib/*.a \
- $RPM_BUILD_ROOT%{l_prefix}/lib/
+ $RPM_BUILD_ROOT%{l_prefix}/lib/nspr/
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ -e 's;@version@;%{version};g' \
+ %{SOURCE nspr.pc} \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
