X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mozldap.spec;h=76f9ab4cd255e8392d806c32a02982e477954afd;hb=c5440db4c50ff011fdecab7514e64e622c17a187;hp=218ea2ab61377cd141168e08301deb93c4124218;hpb=3f150b5e3a5c1f426d4b1ea11d22c15fea0ae343;p=packages%2Fmozldap.git

diff --git a/mozldap.spec b/mozldap.spec
index 218ea2a..76f9ab4 100644
--- a/mozldap.spec
+++ b/mozldap.spec
@@ -6,14 +6,15 @@
 Summary:	Mozilla LDAP C SDK
 Summary(pl.UTF-8):	Biblioteki Mozilla LDAP C SDK
 Name:		mozldap
-Version:	6.0.3
-Release:	1
+Version:	6.0.5
+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%{version}/src/mozldap-%{version}.tar.gz
-# Source0-md5:	78243a9a819928e8149fd1abd4a56744
+Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v%{version}/src/%{name}-%{version}.tar.gz
+# Source0-md5:	9719bd5b9efc13f810c85a47fb8c6412
 Patch0:		%{name}-link.patch
-URL:		http://www.mozilla.org/directory/csdk.html
+Patch1:		%{name}-ac.patch
+URL:		http://wiki.mozilla.org/LDAP_C_SDK
 BuildRequires:	autoconf >= 2.13
 BuildRequires:	cyrus-sasl-devel >= 2.0
 BuildRequires:	gawk
@@ -27,7 +28,7 @@ Requires:	nspr >= %{nspr_evr}
 Requires:	nss >= %{nss_evr}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_noautoreqdep	libldap60.so libprldap60.so libssldap60.so
+%define		_noautoreqdep	libldap60.so libprldap60.so libssldap60.so libldif60.so
 
 %description
 The Mozilla LDAP C SDK is a set of libraries that allow applications
@@ -87,6 +88,7 @@ wykorzystujące biblioteki Mozilla LDAP C SDK.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd mozilla/directory/c-sdk
@@ -113,19 +115,20 @@ export USE_64
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}/mozldap
+install -d $RPM_BUILD_ROOT{{%{_includedir},%{_libdir}}/mozldap,%{_bindir},%{_sysconfdir}/%{name}}
 
 cd mozilla
-install dist/lib/lib*ldap*.so $RPM_BUILD_ROOT%{_libdir}
-install dist/bin/ldap* $RPM_BUILD_ROOT%{_libdir}/mozldap
+install dist/lib/lib*.so $RPM_BUILD_ROOT%{_libdir}
+install dist/lib/lib*.a $RPM_BUILD_ROOT%{_libdir}
 install dist/public/ldap/*.h $RPM_BUILD_ROOT%{_includedir}/mozldap
-install directory/c-sdk/ldap/libraries/lib*/lib*60.a $RPM_BUILD_ROOT%{_libdir}
+install dist/bin/ldap* $RPM_BUILD_ROOT%{_bindir}
+# what really uses these and proper install dir?
+install dist/etc/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
-install -d $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 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}
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/Makefile
 cd -
 
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
@@ -140,7 +143,7 @@ sed directory/c-sdk/mozldap.pc.in -e "
 " > $RPM_BUILD_ROOT%{_pkgconfigdir}/mozldap.pc
 
 cd $RPM_BUILD_ROOT%{_libdir}
-for file in libssldap60.so libprldap60.so libldap60.so; do
+for file in lib*.so; do
 	mv $file $file.%{version}
 	ln -s $file.%{version} $file
 done
@@ -154,14 +157,19 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libldap60.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libldap60.so
 %attr(755,root,root) %{_libdir}/libprldap60.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libprldap60.so
 %attr(755,root,root) %{_libdir}/libssldap60.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libssldap60.so
+%attr(755,root,root) %{_libdir}/libldif60.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libldif60.so
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/mozldap
 %{_pkgconfigdir}/mozldap.pc
-%{_datadir}/mozldap
+%{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
@@ -172,5 +180,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tools
 %defattr(644,root,root,755)
-%dir %{_libdir}/mozldap
-%attr(755,root,root) %{_libdir}/mozldap/ldap*
+%dir %{_sysconfdir}/%{name}
+%{_sysconfdir}/%{name}/ldapfilter.conf
+%{_sysconfdir}/%{name}/ldapfriendly
+%{_sysconfdir}/%{name}/ldapsearchprefs.conf
+%{_sysconfdir}/%{name}/ldaptemplates.conf
+# NOTE: these probably collide with openldap
+%attr(755,root,root) %{_bindir}/ldapcmp
+%attr(755,root,root) %{_bindir}/ldapcompare
+%attr(755,root,root) %{_bindir}/ldapdelete
+%attr(755,root,root) %{_bindir}/ldapmodify
+%attr(755,root,root) %{_bindir}/ldappasswd
+%attr(755,root,root) %{_bindir}/ldapsearch