git.annexia.org
/
fedora-mingw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial version of Xerces-c.
[fedora-mingw.git]
/
nspr
/
mingw32-nspr.spec
diff --git
a/nspr/mingw32-nspr.spec
b/nspr/mingw32-nspr.spec
index
24c7a7c
..
027836e
100644
(file)
--- a/
nspr/mingw32-nspr.spec
+++ b/
nspr/mingw32-nspr.spec
@@
-6,7
+6,7
@@
Name: mingw32-nspr
Version: 4.7.2
Name: mingw32-nspr
Version: 4.7.2
-Release:
3
%{?dist}
+Release:
6
%{?dist}
Summary: MinGW Windows port of the Netscape Portable Runtime (NSPR)
License: MPLv1.1 or GPLv2+ or LGPLv2+
Summary: MinGW Windows port of the Netscape Portable Runtime (NSPR)
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@
-22,9
+22,6
@@
Source2: nspr-config-vars.in
Patch1: nspr-config-pc.patch
Patch1: nspr-config-pc.patch
-# MinGW-specific build patch.
-Patch1000: mingw32-nspr-4.7.2-build.patch
-
BuildRequires: mingw32-filesystem >= 33
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: mingw32-filesystem >= 33
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
@@
-48,18
+45,12
@@
cp ./mozilla/nsprpub/config/nspr-config.in \
cp %{SOURCE2} ./mozilla/nsprpub/config/
cp %{SOURCE2} ./mozilla/nsprpub/config/
-pushd mozilla/nsprpub
-%patch1000 -p0
-popd
-
%build
pushd mozilla/nsprpub
# Configure for Windows cross-compiling.
%{_mingw32_configure} \
%build
pushd mozilla/nsprpub
# Configure for Windows cross-compiling.
%{_mingw32_configure} \
- --prefix=%{_mingw32_prefix} \
- --libdir=%{_mingw32_libdir} \
--includedir=%{_mingw32_includedir}/nspr4 \
--enable-optimize="%{_mingw32_cflags}" \
--disable-debug \
--includedir=%{_mingw32_includedir}/nspr4 \
--enable-optimize="%{_mingw32_cflags}" \
--disable-debug \
@@
-90,8
+81,8
@@
mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
install dist/bin/*.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
install dist/bin/*.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
-install dist/lib/*.
dll.
a $RPM_BUILD_ROOT%{_mingw32_libdir}
-cp -r dist/include/nspr $RPM_BUILD_ROOT%{_mingw32_includedir}/
+install dist/lib/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+cp -r
L
dist/include/nspr $RPM_BUILD_ROOT%{_mingw32_includedir}/
# Write an nspr pkgconfig file.
# Write an nspr pkgconfig file.
@@
-124,13
+115,23
@@
rm -rf $RPM_BUILD_ROOT
%{_mingw32_bindir}/libnspr4.dll
%{_mingw32_bindir}/libplc4.dll
%{_mingw32_bindir}/libplds4.dll
%{_mingw32_bindir}/libnspr4.dll
%{_mingw32_bindir}/libplc4.dll
%{_mingw32_bindir}/libplds4.dll
-%{_mingw32_libdir}/libnspr4.dll.a
-%{_mingw32_libdir}/libplc4.dll.a
+%{_mingw32_libdir}/libnspr4.a
+%{_mingw32_libdir}/libplc4.a
+%{_mingw32_libdir}/libnspr4_s.a
+%{_mingw32_libdir}/libplc4_s.a
+%{_mingw32_libdir}/libplds4.a
+%{_mingw32_libdir}/libplds4_s.a
%{_mingw32_libdir}/pkgconfig/nspr.pc
%{_mingw32_includedir}/nspr
%changelog
%{_mingw32_libdir}/pkgconfig/nspr.pc
%{_mingw32_includedir}/nspr
%changelog
+* Wed Feb 18 2009 Richard W.M. Jones <rjones@redhat.com> - 4.7.2-6
+- Fix build inside mock.
+
+* Tue Feb 17 2009 Richard W.M. Jones <rjones@redhat.com> - 4.7.2-4
+- 'cp -L' to install header files, not symlinks to header files.
+
* Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 4.7.2-3
- Requires pkgconfig.
* Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 4.7.2-3
- Requires pkgconfig.