-%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/mozldap
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/mozldap
-
-# Copy the binary libraries we want
-for file in libssldap50.so libprldap50.so libldap50.so
-do
- %{__install} -m 755 mozilla/dist/lib/$file $RPM_BUILD_ROOT/%{_libdir}
-done
-
-# Copy the binaries we want
-for file in ldapsearch ldapmodify ldapdelete ldapcmp ldapcompare
-do
- %{__install} -m 755 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
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozldap
-cp -r mozilla/directory/c-sdk/ldap/examples $RPM_BUILD_ROOT%{_datadir}/mozldap
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir}
-%{__install} -m 644 mozilla/directory/c-sdk/ldap/examples/xmplflt.conf $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir}
-%{__install} -m 644 mozilla/directory/c-sdk/ldap/libraries/libldap/ldaptemplates.conf $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir}
-%{__install} -m 644 mozilla/directory/c-sdk/ldap/libraries/libldap/ldapfilter.conf $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir}
-%{__install} -m 644 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
+install -d $RPM_BUILD_ROOT{{%{_includedir},%{_libdir}}/mozldap,%{_bindir},%{_sysconfdir}/%{name}}
+
+cd mozilla
+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 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%{_examplesdir}/%{name}-%{version}
+cd directory/c-sdk/ldap
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cd -
+
+install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
+sed directory/c-sdk/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,%%MOZLDAP_VERSION%%,%{version},g
+" > $RPM_BUILD_ROOT%{_pkgconfigdir}/mozldap.pc
+
+cd $RPM_BUILD_ROOT%{_libdir}
+for file in lib*.so; do
+ mv $file $file.%{version}
+ ln -s $file.%{version} $file