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:   04-Feb-2004 09:37:11
  Branch: HEAD                             Handle: 2004020408370604

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

  Log:
    fix class checking macro l_check_class.

  Summary:
    Revision    Changes     Path
    1.119       +1  -0      openpkg-src/openpkg/HISTORY
    1.277       +1  -1      openpkg-src/openpkg/openpkg.spec
    1.53        +1  -1      openpkg-src/openpkg/rpmmacros
    1.8424      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/HISTORY
  ============================================================================
  $ cvs diff -u -r1.118 -r1.119 HISTORY
  --- openpkg-src/openpkg/HISTORY       3 Feb 2004 21:41:17 -0000       1.118
  +++ openpkg-src/openpkg/HISTORY       4 Feb 2004 08:37:09 -0000       1.119
  @@ -2,6 +2,7 @@
   2004
   ====
   
  +20040204 fix class checking macro l_check_class.
   20040203 actually use new Class: header and %track section
   20040130 add support to RPM for new "%track" section which will become the new 
vcheck(1) source
   20040130 add support to RPM for new "%test" section which will allow run-time 
testing
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/openpkg.spec
  ============================================================================
  $ cvs diff -u -r1.276 -r1.277 openpkg.spec
  --- openpkg-src/openpkg/openpkg.spec  3 Feb 2004 21:41:17 -0000       1.276
  +++ openpkg-src/openpkg/openpkg.spec  4 Feb 2004 08:37:09 -0000       1.277
  @@ -39,7 +39,7 @@
   #   o any cc(1)
   
   #   the package version/release
  -%define       V_openpkg  20040203
  +%define       V_openpkg  20040204
   
   #   the used software versions
   %define       V_rpm      4.2.1
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/rpmmacros
  ============================================================================
  $ cvs diff -u -r1.52 -r1.53 rpmmacros
  --- openpkg-src/openpkg/rpmmacros     30 Jan 2004 16:59:34 -0000      1.52
  +++ openpkg-src/openpkg/rpmmacros     4 Feb 2004 08:37:10 -0000       1.53
  @@ -319,7 +319,7 @@
   
   #   macros for checking build environment
   %l_check_nosource()      %(for url in . %{?_restricted}; do [ ".$url" = .. ] && 
continue; eval `echo "$url" | sed -e 's!^\\(.*\\)::/\\([^/][^/]*\\)$!;url=\\"\\1 --> 
\\"; file=\\"\\2\\"!' -e 's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=\\"\\1\\"; 
file=\\"\\2\\"!' -e 's:^\\([^;].*\\)$:;url="(from unknown location) "; file="\\1":' -e 
's:^;::'`; if [ ! -f "%{_specdir}/$file" ] && [ ! -f "%{_sourcedir}/$file" ]; then ( 
echo "Sorry, this OpenPKG package contains a DISTRIBUTION RESTRICTED source file."; 
echo "Before you can proceed building this package you have to MANUALLY fetch"; echo " 
   ${url}${file}"; echo "and provide it locally under the path"; echo "    
%{_sourcedir}/$file" ) | (if [ -f %{l_rpmtool} ]; then %{l_rpmtool} msg -b -t error; 
fi) 1>&2; echo "exit 1"; fi; done)
  -%l_check_class()         %(class=`echo "%{distribution}" | sed -e 's;^;X;' -e 
's;^X.*\\[\\(..*\\)\\].*$;\\1;' -e 's;^X.*;JUNK;'`; %{l_rpmtool} check-class "$class")
  +%l_check_class()         %(class=`echo "%{class}" | sed -e 's;^$;JUNK;'`; 
%{l_rpmtool} check-class "$class")
   %prep %%prep\
       %{l_check_nosource} \
       %{l_check_class} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.8423 -r1.8424 news.txt
  --- openpkg-web/news.txt      3 Feb 2004 21:41:15 -0000       1.8423
  +++ openpkg-web/news.txt      4 Feb 2004 08:37:06 -0000       1.8424
  @@ -1,3 +1,4 @@
  +04-Feb-2004: Upgraded package: P<openpkg-20040204-20040204>
   03-Feb-2004: Upgraded package: P<openpkg-20040203-20040203>
   03-Feb-2004: Upgraded package: P<nagios-1.2-20040203>
   03-Feb-2004: Upgraded package: P<apache2-2.0.48-20040203>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to