Attachment 149952 Details for Bug 231921 – cvs diff (build_*mozldap*, mozldap6.spec)

[patch] cvs diff (build_*mozldap*, mozldap6.spec)

mozldap6.diffs (text/plain), 4.15 KB, created by Noriko Hosoi on 2007-03-13 17:22:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-03-13 17:22:54 UTC

Size: 4.15 KB

patch

obsolete

>Index: build_RHATmozldap_pkg
>===================================================================
>--- build_RHATmozldap_pkg	(revision 689)
>+++ build_RHATmozldap_pkg	(working copy)
>@@ -101,7 +101,7 @@
> LINUX_PACKAGE=mozldap6
> SOURCE_BASE_NAME=mozldap # without the 6
> VERSION=6.0.2
>-RELEASE=5
>+RELEASE=6
> PKG_HOME=`pwd`
> SPEC_FILENAME=${LINUX_PACKAGE}-${VERSION}.spec
> MOZLDAP_SPEC_FILENAME=${LINUX_PACKAGE}.spec
>Index: build_RHATmozldapx_pkg
>===================================================================
>--- build_RHATmozldapx_pkg	(revision 689)
>+++ build_RHATmozldapx_pkg	(working copy)
>@@ -104,7 +104,7 @@
> LINUX_PACKAGE=mozldap6
> SOURCE_BASE_NAME=mozldap # without the 6
> VERSION=6.0.2
>-RELEASE=5
>+RELEASE=6
> PKG_HOME=`pwd`
> SPEC_FILENAME=${LINUX_PACKAGE}-${VERSION}.spec
> MOZLDAP_SPEC_FILENAME=${LINUX_PACKAGE}.spec
>Index: build_mozldap_rpm
>===================================================================
>--- build_mozldap_rpm	(revision 689)
>+++ build_mozldap_rpm	(working copy)
>@@ -101,7 +101,7 @@
> MOZ_PACKAGE=mozldap
> SUN_PACKAGE=RHAT$PACKAGE
> VERSION=6.0.2
>-RELEASE=5
>+RELEASE=6
> MOZLDAP_TAG=LDAPCSDK_6_0_2_RTM
> PRJ=${MOZ_PACKAGE}-${VERSION}
> RPM_HOME=`pwd`
>Index: mozldap6.spec
>===================================================================
>--- mozldap6.spec	(revision 689)
>+++ mozldap6.spec	(working copy)
>@@ -21,7 +21,7 @@
> %define sasl_name	   RHATsasl-lib
> %define sasl_devel_name	   RHATsasl-devel
> %define mylibdir           %{_libdir}
>-%define mybindir           %{_bindir}
>+%define mybindir           %{mylibdir}/%{base_name}
> %define mozldap_name_req   RHAT%{base_name}
> %endif
> %ifarch sparcv9
>@@ -35,7 +35,7 @@
> %define sasl_name	   RHATsaslx-lib
> %define sasl_devel_name	   RHATsaslx-devel
> %define mylibdir           %{_libdir}/sparcv9
>-%define mybindir           %{_bindir}/sparcv9
>+%define mybindir           %{mylibdir}/%{base_name}
> %define mozldap_name_req   RHAT%{base_name64}
> %endif
> # these names are used for pkg-config
>@@ -58,7 +58,7 @@
> %endif
> Name:             %{mozldap_name_req}
> Version:          %{major}.%{minor}.%{submin}
>-Release:          5
>+Release:          6
> License:          MPL/GPL/LGPL
> URL:              http://www.mozilla.org/directory/csdk.html
> Group:            System Environment/Libraries
>@@ -286,19 +286,19 @@
> %ifarch sparcv9
> %attr(00755,root,bin) %dir %{mylibdir}
> %endif
>-%attr(00755,root,bin) %dir %{mylibdir}/%{base_name}
>-%attr(00755,root,bin) %{mylibdir}/%{base_name}/ldapsearch
>-%attr(00755,root,bin) %{mylibdir}/%{base_name}/ldapmodify
>-%attr(00755,root,bin) %{mylibdir}/%{base_name}/ldapdelete
>-%attr(00755,root,bin) %{mylibdir}/%{base_name}/ldapcmp
>-%attr(00755,root,bin) %{mylibdir}/%{base_name}/ldapcompare
>-%attr(00755,root,bin) %{mylibdir}/%{base_name}/ldappasswd
>-%attr(00755,root,bin) %{mylibdir}/%{base_name}/ldapsearch-bin
>-%attr(00755,root,bin) %{mylibdir}/%{base_name}/ldapmodify-bin
>-%attr(00755,root,bin) %{mylibdir}/%{base_name}/ldapdelete-bin
>-%attr(00755,root,bin) %{mylibdir}/%{base_name}/ldapcmp-bin
>-%attr(00755,root,bin) %{mylibdir}/%{base_name}/ldapcompare-bin
>-%attr(00755,root,bin) %{mylibdir}/%{base_name}/ldappasswd-bin
>+%attr(00755,root,bin) %dir %{mybindir}
>+%attr(00755,root,bin) %{mybindir}/ldapsearch
>+%attr(00755,root,bin) %{mybindir}/ldapmodify
>+%attr(00755,root,bin) %{mybindir}/ldapdelete
>+%attr(00755,root,bin) %{mybindir}/ldapcmp
>+%attr(00755,root,bin) %{mybindir}/ldapcompare
>+%attr(00755,root,bin) %{mybindir}/ldappasswd
>+%attr(00755,root,bin) %{mybindir}/ldapsearch-bin
>+%attr(00755,root,bin) %{mybindir}/ldapmodify-bin
>+%attr(00755,root,bin) %{mybindir}/ldapdelete-bin
>+%attr(00755,root,bin) %{mybindir}/ldapcmp-bin
>+%attr(00755,root,bin) %{mybindir}/ldapcompare-bin
>+%attr(00755,root,bin) %{mybindir}/ldappasswd-bin
> 
> %files devel
> %attr(00755,root,sys)   %dir %{_prefix}
>@@ -319,6 +319,10 @@
> %attr(00644,root,other) %{_datadir}/%{base_name}/examples/*
> 
> %changelog
>+* Tue Mar 13 2007 Noriko Hosoi <nhosoi@redhat.com> 6.0.2-6
>+- Solaris: Setting %{mylibdir}/%{base_name} to mybindir
>+- Solaris: Using the variable mybindir for the LDAP tool location.
>+
> * Tue Jan 22 2007 Rich Megginson <rmeggins@redhat.com> 6.0.2-5
> - Solaris: Removed version checking in Requires and BuildRequires
> - Solaris: Use RHATmozldap6[x] for Name

Actions: View | Diff

Attachments on bug 231921: 149885 | 149952 | 149953