[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/dhcpd/ dhcpd.spec openpkg-web/ news.txt
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2003-10-31 8:56:09
[Download RAW message or body]

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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src openpkg-web          Date:   31-Oct-2003 09:56:09
  Branch: HEAD                             Handle: 2003103108560702

  Modified files:
    openpkg-src/dhcpd       dhcpd.spec
    openpkg-web             news.txt

  Log:
    cleanup packaging and remove -Werror which is too strict for platforms
    like Solaris 10

  Summary:
    Revision    Changes     Path
    1.53        +12 -1      openpkg-src/dhcpd/dhcpd.spec
    1.7239      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/dhcpd/dhcpd.spec
  ============================================================================
  $ cvs diff -u -r1.52 -r1.53 dhcpd.spec
  --- openpkg-src/dhcpd/dhcpd.spec	19 Oct 2003 09:59:38 -0000	1.52
  +++ openpkg-src/dhcpd/dhcpd.spec	31 Oct 2003 08:56:09 -0000	1.53
  @@ -33,7 +33,7 @@
   Group:        DNS
   License:      ISC/BSD
   Version:      3.0.1rc12
  -Release:      20031019
  +Release:      20031031
   
   #   package options
   %option       with_fsl  yes
  @@ -63,6 +63,7 @@
       %setup -q -n dhcp-%{version}
   
   %build
  +    #   configure program
       ( echo 'CC           = %{l_cc}'
         echo 'CFLAGS       = %{l_cflags -O}'
   %if "%{with_fsl}" == "yes"
  @@ -87,15 +88,21 @@
         echo 'INSTALL      = %{l_shtool} install -c'
         echo 'MANINSTALL   = %{l_shtool} install -c'
       ) >>site.conf
  +    %{l_shtool} subst \
  +        -e 's; -Werror; ;' \
  +        Makefile.conf
       ./configure
       %{l_shtool} subst \
           -e 's;^[^#]*\(#define[^_]*_PATH_DHCPD_PID[^"]*\).*;\1 "%{l_prefix}/var/dhcpd/dhcpd.pid";' \
           -e 's;^[^#]*\(#define[^_]*_PATH_DHCPD_DB[^"]*\).*;\1 "%{l_prefix}/var/dhcpd/dhcpd.leases";' \
           -e 's;^[^#]*\(#define[^_]*_PATH_DHCPD_CONF[^"]*\).*;\1 "%{l_prefix}/etc/dhcpd/dhcpd.conf";' \
           includes/site.h
  +
  +    #   build program
       %{l_make} %{l_mflags}
   
   %install
  +    #   install program
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
  @@ -104,9 +111,13 @@
           $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
           $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd
       %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
  +
  +    #   install default configuration
       %{l_shtool} install -c -m 644 \
           %{SOURCE dhcpd.conf} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/dhcpd/dhcpd.conf
  +
  +    #   post-adjust and strip down installation
       chmod a-x $RPM_BUILD_ROOT%{l_prefix}/man/man*/*
       rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/dhclient-script
       rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/dhclient-script.8
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7238 -r1.7239 news.txt
  --- openpkg-web/news.txt	31 Oct 2003 08:49:11 -0000	1.7238
  +++ openpkg-web/news.txt	31 Oct 2003 08:56:07 -0000	1.7239
  @@ -1,3 +1,4 @@
  +31-Oct-2003: Upgraded package: P<dhcpd-3.0.1rc12-20031031>
   31-Oct-2003: Upgraded package: P<gdb-6.0-20031031>
   31-Oct-2003: Upgraded package: P<mplayer-1.0pre2-20031031>
   31-Oct-2003: Upgraded package: P<gnutls-0.9.94-20031031>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org
[prev in list] [next in list] [prev in thread] [next in thread]