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 openpkg-web          Date:   11-Jun-2003 18:25:12
  Branch: HEAD                             Handle: 2003061117251001

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

  Log:
    mysql4 is now named mysql; simplify cppflags usage; avoid extra break
    on already very short lines

  Summary:
    Revision    Changes     Path
    1.2         +3  -4      openpkg-src/mysqlcc/mysqlcc.spec
    1.4824      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/mysqlcc/mysqlcc.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 mysqlcc.spec
  --- openpkg-src/mysqlcc/mysqlcc.spec  11 Jun 2003 16:02:29 -0000      1.1
  +++ openpkg-src/mysqlcc/mysqlcc.spec  11 Jun 2003 16:25:11 -0000      1.2
  @@ -41,7 +41,7 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, make, gcc, mysql4, qt
  +BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, make, gcc, mysql, qt
   PreReq:       OpenPKG, openpkg >= 20030103, X11
   AutoReq:      no
   AutoReqProv:  no
  @@ -66,7 +66,7 @@
       CXX="%{l_cxx}" \
       CFLAGS="%{l_cflags -O}" \
       CXXFLAGS="%{l_cxxflags -O}" \
  -    CPPFLAGS="%{l_cppflags} -I%{l_prefix}/include/qt" \
  +    CPPFLAGS="%{l_cppflags qt}" \
       LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
  @@ -80,8 +80,7 @@
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin
       %{l_shtool} install -c -s -m 755 \
  -        mysqlcc \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin/
  +        mysqlcc $RPM_BUILD_ROOT%{l_prefix}/bin/
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.4823 -r1.4824 news.txt
  --- openpkg-web/news.txt      11 Jun 2003 16:02:28 -0000      1.4823
  +++ openpkg-web/news.txt      11 Jun 2003 16:25:10 -0000      1.4824
  @@ -1,3 +1,4 @@
  +11-Jun-2003: Upgraded package: P<mysqlcc-0.9.2-20030611>
   11-Jun-2003: New package: P<mysqlcc-0.9.2-20030611>
   11-Jun-2003: Upgraded package: P<openpkg-tool-1.2.6-1.2.6>
   11-Jun-2003: Upgraded package: P<openpkg-tool-20030611-20030611>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to