SPECS: mozldap.spec - use svrcore-devel from separate spec, release 2

qboosh qboosh at pld-linux.org
Tue Jun 27 10:46:00 CEST 2006 

Author: qboosh                       Date: Tue Jun 27 08:46:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use svrcore-devel from separate spec, release 2

---- Files affected:
SPECS:
   mozldap.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/mozldap.spec
diff -u SPECS/mozldap.spec:1.13 SPECS/mozldap.spec:1.14
--- SPECS/mozldap.spec:1.13	Sat Jun  3 17:40:55 2006
+++ SPECS/mozldap.spec	Tue Jun 27 10:45:55 2006
@@ -3,16 +3,16 @@
 %define	nspr_evr	1:%{nspr_version}
 %define	nss_version	3.11
 %define	nss_evr		1:%{nss_version}
-%define	svrcore_version	4.0.1
+%define	svrcore_version	4.0.2
 %define	mozldap_version	5.17
 Summary:	Mozilla LDAP C SDK
 Summary(pl):	Biblioteki Mozilla LDAP C SDK
 Name:		mozldap
-Version:	%{mozldap_version}
-Release:	1
+Version:	5.17
+Release:	2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		Libraries
-Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v%{mozldap_version}/src/ldapcsdk-5.1.7.tar.gz
+Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v%{version}/src/ldapcsdk-5.1.7.tar.gz
 # Source0-md5:	66ddb43e984c0df67e21afb4dc6977b1
 URL:		http://www.mozilla.org/directory/csdk.html
 BuildRequires:	gawk
@@ -21,7 +21,7 @@
 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}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,7 +44,7 @@
 Summary:	Development files and examples for Mozilla LDAP C SDK
 Summary(pl):	Pliki programistyczne i przykłady dla bibliotek Mozilla LDAP C SDK
 Group:		Development/Libraries
-Requires:	%{name} = %{mozldap_version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	nspr-devel >= %{nspr_evr}
 Requires:	nss-devel >= %{nss_evr}
 
@@ -60,7 +60,7 @@
 Summary:	Static Mozilla LDAP C SDK libraries
 Summary(pl):	Statyczne biblioteki Mozilla LDAP C SDK
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{mozldap_version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static Mozilla LDAP C SDK libraries.
@@ -72,7 +72,7 @@
 Summary:	Tools for the Mozilla LDAP C SDK
 Summary(pl):	Narzędzia dla bibliotek Mozilla LDAP C SDK
 Group:		Applications/System
-Requires:	%{name} = %{mozldap_version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description tools
 The mozldap-tools package provides the ldapsearch, ldapmodify, and
@@ -82,40 +82,10 @@
 Ten pakiet dostarcza narzędzia ldapsearch, ldapmodify i ldapdelete
 wykorzystujące biblioteki Mozilla LDAP C SDK.
 
-%package -n svrcore-devel
-Summary:	svrcore - development files for secure PIN handling using NSS crypto
-Summary(pl):	svrcore - pliki programistyczne do bezpiecznej obsługi PIN-ów przy użyciu NSS
-Version:	%{svrcore_version}
-Group:		Development/Libraries
-Requires:	nspr-devel >= %{nspr_evr}
-Requires:	nss-devel >= %{nss_evr}
-
-%description -n svrcore-devel
-svrcore provides applications with several ways to handle secure PIN
-storage e.g. in an application that must be restarted, but needs the
-PIN to unlock the private key and other crypto material, without user
-intervention. svrcore uses the facilities provided by NSS.
-
-%description -n svrcore-devel -l pl
-svrcore udostępnia aplikacjom kilka sposobów obsługi bezpiecznego
-przechowywania PIN-ów, np. w aplikacji, która musi być zrestartowana,
-ale wymaga PIN-u do odblokowania klucza prywatnego i innych danych
-kryptograficznych bez interwencji użytkownika. svrcore wykorzystuje
-funkcje udostępniane przez bibliotekę NSS.
-
 %prep
 %setup -q -n mozilla
 
 %build
-# build local svrcore
-%{__make} -C security/coreconf \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}"
-%{__make} -C security/svrcore \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -I. -I/usr/include/nspr -I/usr/include/nss"
-# end svrcore
-
 cd directory/c-sdk
 %configure \
 %ifarch %{x8664} ia64 ppc64 s390x
@@ -130,7 +100,7 @@
 	--with-nss-inc=%{_includedir}/nss \
 	--with-nss-lib=%{_libdir} \
 	--with-svrcore \
-	--with-svrcore-inc=$PWD/../../security/svrcore
+	--with-svrcore-inc=%{_includedir}/svrcore
 
 %ifarch %{x8664} ppc64 ia64 s390x
 USE_64=1
@@ -167,29 +137,14 @@
 	s,%%includedir%%,%{_includedir}/mozldap,g
 	s,%%NSPR_VERSION%%,%{nspr_version},g
 	s,%%NSS_VERSION%%,%{nss_version},g
-	s,%%MOZLDAP_VERSION%%,%{mozldap_version},g
+	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.%{mozldap_version}
-	ln -s $file.%{mozldap_version} $file
+	mv $file $file.%{version}
+	ln -s $file.%{version} $file
 done
-cd -
-
-# svrcore
-install -d $RPM_BUILD_ROOT%{_includedir}/svrcore
-install dist/public/svrcore/*.h $RPM_BUILD_ROOT%{_includedir}/svrcore
-install dist/*.OBJ/lib/libsvrcore.a $RPM_BUILD_ROOT%{_libdir}
-sed security/svrcore/svrcore.pc.in -e "
-	s,%%libdir%%,%{_libdir},g
-	s,%%prefix%%,%{_prefix},g
-	s,%%exec_prefix%%,%{_prefix},g
-	s,%%includedir%%,%{_includedir}/svrcore,g
-	s,%%NSPR_VERSION%%,%{nspr_version},g
-	s,%%NSS_VERSION%%,%{nss_version},g
-	s,%%SVRCORE_VERSION%%,%{svrcore_version},g
-" > $RPM_BUILD_ROOT%{_pkgconfigdir}/svrcore.pc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -221,19 +176,15 @@
 %dir %{_libdir}/mozldap
 %attr(755,root,root) %{_libdir}/mozldap/ldap*
 
-%files -n svrcore-devel
-%defattr(644,root,root,755)
-%doc security/svrcore/README
-%{_libdir}/libsvrcore.a
-%{_includedir}/svrcore
-%{_pkgconfigdir}/svrcore.pc
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/06/27 08:45:55  qboosh
+- use svrcore-devel from separate spec, release 2
+
 Revision 1.13  2006/06/03 15:40:55  qboosh
 - noautoreqdep to avoid catching mozilla* deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozldap.spec?r1=1.13&r2=1.14&f=u

More information about the pld-cvs-commit mailing list