OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   24-Oct-2004 21:41:37
  Branch: HEAD                             Handle: 2004102420413700

  Modified files:
    openpkg-src/openldap    openldap.spec

  Log:
    comitt the missing pieces for the installation of the pkgconfig file

  Summary:
    Revision    Changes     Path
    1.122       +17 -1      openpkg-src/openldap/openldap.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  ============================================================================
  $ cvs diff -u -r1.121 -r1.122 openldap.spec
  --- openpkg-src/openldap/openldap.spec        24 Oct 2004 16:10:39 -0000      1.121
  +++ openpkg-src/openldap/openldap.spec        24 Oct 2004 19:41:37 -0000      1.122
  @@ -46,6 +46,7 @@
   Source0:      
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
   Source1:      rc.openldap
   Source2:      fsl.openldap
  +Source3:      openldap.pc
   Patch0:       openldap.patch
   
   #   build information
  @@ -189,15 +190,30 @@
           %{SOURCE rc.openldap} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   install OSSP fsl configuration
  -    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
  +    %{l_shtool} mkdir -f -p -m 755 \
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 %{l_value -s -a} \
           %{SOURCE fsl.openldap} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
  +    #   install pkg-config configuration
  +    %{l_shtool} mkdir -f -p -m 755 \
  +        $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
  +    libs="-lldap -llber"
  +%if "%{with_sasl}" == "yes"
  +    libs="$libs -lsasl2"
  +%endif
  +    %{l_shtool} install -c -m 644 %{l_value -s -a} \
  +        -e 's;@version@;%{version};' \
  +        -e "s;@libs@;$libs;" \
  +        %{SOURCE openldap.pc} \
  +        $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
  +
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  +        '%not %dir %{l_prefix}/lib/pkgconfig' \
           '%config %{l_prefix}/etc/fsl/fsl.openldap' \
           '%config %{l_prefix}/etc/openldap/*.conf'
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to