Author: glen Date: Sat Apr 29 21:38:55 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- mozldap.pc.in moved to proper place
---- Files affected:
SPECS:
mozldap.spec (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SPECS/mozldap.spec
diff -u SPECS/mozldap.spec:1.3 SPECS/mozldap.spec:1.4
--- SPECS/mozldap.spec:1.3 Sat Apr 29 23:36:42 2006
+++ SPECS/mozldap.spec Sat Apr 29 23:38:50 2006
@@ -90,19 +90,6 @@
cd mozilla/directory/c-sdk
%{__make} BUILDCLU=1 HAVE_SVRCORE=1 BUILD_OPT=1
-
-# Set up our package file
-install -d $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-%{__cat} mozldap.pc.in | sed -e "s,%%libdir%%,%{_libdir},g" \
- -e
"s,%%prefix%%,%{_prefix},g" \
- -e
"s,%%exec_prefix%%,%{_prefix},g" \
- -e
"s,%%includedir%%,%{_includedir}/mozldap,g" \
- -e
"s,%%NSPR_VERSION%%,%{nspr_version},g" \
- -e
"s,%%NSS_VERSION%%,%{nss_version},g" \
- -e
"s,%%SVRCORE_VERSION%%,%{svrcore_version},g" \
- -e
"s,%%MOZLDAP_VERSION%%,%{version},g" > \
-
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/mozldap.pc
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_includedir}/mozldap
@@ -141,6 +128,20 @@
ln -s $file.%{major} $file
done
+# Set up our package file
+install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
+sed mozldap.pc.in -e "
+ s,%%libdir%%,%{_libdir},g
+ s,%%prefix%%,%{_prefix},g
+ s,%%exec_prefix%%,%{_prefix},g
+ s,%%includedir%%,%{_includedir}/mozldap,g
+ s,%%NSPR_VERSION%%,%{nspr_version},g
+ s,%%NSS_VERSION%%,%{nss_version},g
+ s,%%SVRCORE_VERSION%%,%{svrcore_version},g
+ s,%%MOZLDAP_VERSION%%,%{version},g
+" > $RPM_BUILD_ROOT%{_pkgconfigdir}/mozldap.pc
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -180,6 +181,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2006/04/29 21:38:50 glen
+- mozldap.pc.in moved to proper place
+
Revision 1.3 2006/04/29 21:36:42 glen
- cosmetics, cleanups
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mozldap.spec?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
