Author: zbyniu Date: Sun Apr 30 00:48:26 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - MANY cleanups; I can't see svrcore in pld, build included - what is version? 5.17 5.1.7? - now builds, still require some work
---- Files affected: SPECS: mozldap.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/mozldap.spec diff -u SPECS/mozldap.spec:1.6 SPECS/mozldap.spec:1.7 --- SPECS/mozldap.spec:1.6 Sat Apr 29 23:43:12 2006 +++ SPECS/mozldap.spec Sun Apr 30 02:48:21 2006 @@ -13,17 +13,18 @@ Release: 0.1 License: MPL/GPL/LGPL Group: System -Source0: ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v%{major}.17/src/ldapcsdk-%{version}.tar.gz -# Source0-md5 453341111111111 +Source0: ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v%{major}.17/src/ldapcsdk-5.1.7.tar.gz +# Source0-md5: 66ddb43e984c0df67e21afb4dc6977b1 URL: http://www.mozilla.org/directory/csdk.html BuildRequires: gawk +BuildRequires: libstdc++-devel BuildRequires: nspr-devel >= %{nspr_evr} BuildRequires: nss-devel >= %{nss_evr} +BuildRequires: perl-base BuildRequires: pkgconfig -BuildRequires: svrcore-devel >= %{svrcore_version} +#BuildRequires: svrcore-devel >= %{svrcore_version} Requires: nspr >= %{nspr_evr} Requires: nss >= %{nss_evr} -Provides: mozldap BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -36,7 +37,6 @@ Summary: Tools for the Mozilla LDAP C SDK Group: System Requires: mozldap = %{version}-%{release} -Provides: mozldap-tools %description tools The mozldap-tools package provides the ldapsearch, ldapmodify, and @@ -46,86 +46,67 @@ Summary: Development libraries and examples for Mozilla LDAP C SDK Group: Development/Libraries Requires: mozldap = %{version}-%{release} -Provides: mozldap-devel %description devel Header and Library files for doing development with the Mozilla LDAP C SDK %prep -%setup -q +%setup -q -n mozilla %build %ifarch x86_64 ppc64 ia64 s390x arg64="--enable-64bit" %endif -%configure $arg64 \ - --with-nss \ - --with-system-svrcore \ - --enable-optimize \ - --disable-debug - -# Enable compiler optimizations and disable debugging code -BUILD_OPT=1 -export BUILD_OPT - -# Generate symbolic info for debuggers -XCFLAGS=%{rpmcflags} -export XCFLAGS - -PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 -PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 +# build local svrcore +cd security/coreconf +%{__make} +cd ../../security/svrcore +%{__make} \ + CFLAGS="%{rpmcflags} -I. -I/usr/include/nspr -I/usr/include/nss" +cd ../.. +# end svrcore -export PKG_CONFIG_ALLOW_SYSTEM_LIBS -export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS +cd directory/c-sdk +%configure $arg64 \ + --with-nspr \ + --with-nspr-inc=%{_includedir}/nspr \ + --with-nspr-lib=%{_libdir} \ + --with-nss \ + --with-nss-inc=%{_includedir}/nss \ + --with-nss-lib=%{_libdir} \ + --with-svrcore \ + --with-svrcore-inc=$PWD/../../security/svrcore \ + --enable-optimize \ + --disable-debug %ifarch x86_64 ppc64 ia64 s390x USE_64=1 export USE_64 %endif -cd mozilla/directory/c-sdk -%{__make} BUILDCLU=1 HAVE_SVRCORE=1 BUILD_OPT=1 +%{__make} \ + BUILDCLU=1 \ + HAVE_SVRCORE=1 \ + BUILD_OPT=1 \ + XCFLAGS="%{rpmcflags}" + %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_includedir}/mozldap -install -d $RPM_BUILD_ROOT%{_libdir} -install -d $RPM_BUILD_ROOT%{_libdir}/mozldap +install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}/mozldap -# Copy the binary libraries we want -for file in libssldap50.so libprldap50.so libldap50.so; do - install mozilla/dist/lib/$file $RPM_BUILD_ROOT%{_libdir} -done +install dist/lib/lib*ldap*.so* $RPM_BUILD_ROOT%{_libdir} +install dist/bin/ldap* $RPM_BUILD_ROOT%{_libdir}/mozldap +install dist/public/ldap/*.h $RPM_BUILD_ROOT%{_includedir}/mozldap -# Copy the binaries we want -for file in ldapsearch ldapmodify ldapdelete ldapcmp ldapcompare; do - install mozilla/dist/bin/$file $RPM_BUILD_ROOT%{_libdir}/mozldap -done - -# Copy the include files -for file in mozilla/dist/public/ldap/*.h; do - install -m 644 $file $RPM_BUILD_ROOT%{_includedir}/mozldap -done - -# Copy the developer files -install -d $RPM_BUILD_ROOT%{_datadir}/mozldap -cp -r mozilla/directory/c-sdk/ldap/examples $RPM_BUILD_ROOT%{_datadir}/mozldap install -d $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir} -install mozilla/directory/c-sdk/ldap/examples/xmplflt.conf $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir} -install mozilla/directory/c-sdk/ldap/libraries/libldap/ldaptemplates.conf $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir} -install mozilla/directory/c-sdk/ldap/libraries/libldap/ldapfilter.conf $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir} -install mozilla/directory/c-sdk/ldap/libraries/libldap/ldapsearchprefs.conf $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir} - -# Rename the libraries and create the symlinks -cd $RPM_BUILD_ROOT%{_libdir} -for file in libssldap50.so libprldap50.so libldap50.so; do - mv $file $file.%{major}.${minor} - ln -s $file.%{major}.%{minor} $file.%{major} - ln -s $file.%{major} $file -done +cd directory/c-sdk/ldap +cp -r examples $RPM_BUILD_ROOT%{_datadir}/mozldap +install examples/xmplflt.conf $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir} +install libraries/libldap/*.conf $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir} +cd .. -# Set up our package file install -d $RPM_BUILD_ROOT%{_pkgconfigdir} sed mozldap.pc.in -e " s,%%libdir%%,%{_libdir},g @@ -138,6 +119,12 @@ s,%%MOZLDAP_VERSION%%,%{version},g " > $RPM_BUILD_ROOT%{_pkgconfigdir}/mozldap.pc +cd $RPM_BUILD_ROOT%{_libdir} +for file in libssldap50.so libprldap50.so libldap50.so; do + mv $file $file.%{major}.%{minor} + ln -s $file.%{major}.%{minor} $file.%{major} + ln -s $file.%{major} $file +done %clean rm -rf $RPM_BUILD_ROOT @@ -147,29 +134,19 @@ %files %defattr(644,root,root,755) -%{_libdir}/libssldap50.so -%{_libdir}/libprldap50.so -%{_libdir}/libldap50.so -%attr(755,root,root) %{_libdir}/libssldap50.so.%{major} -%attr(755,root,root) %{_libdir}/libprldap50.so.%{major} -%attr(755,root,root) %{_libdir}/libldap50.so.%{major} -%attr(755,root,root) %{_libdir}/libssldap50.so.%{major}.%{minor} -%attr(755,root,root) %{_libdir}/libprldap50.so.%{major}.%{minor} -%attr(755,root,root) %{_libdir}/libldap50.so.%{major}.%{minor} +%attr(755,root,root) %{_libdir}/lib*.so.%{major}.%{minor} +%attr(755,root,root) %{_libdir}/lib*.so.%{major} %files tools %defattr(644,root,root,755) -%{_libdir}/mozldap/ldapsearch -%{_libdir}/mozldap/ldapmodify -%{_libdir}/mozldap/ldapdelete -%{_libdir}/mozldap/ldapcmp -%{_libdir}/mozldap/ldapcompare +%attr(755,root,root) %{_libdir}/mozldap/ldap* %files devel %defattr(644,root,root,755) %{_pkgconfigdir}/mozldap.pc %{_includedir}/mozldap %{_datadir}/mozldap +%{_libdir}/lib*.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -178,6 +155,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2006/04/30 00:48:21 zbyniu +- MANY cleanups; I can't see svrcore in pld, build included +- what is version? 5.17 5.1.7? +- now builds, still require some work + Revision 1.6 2006/04/29 21:43:12 glen - buildrequires should be only in main package ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozldap.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
