OpenPKG Specs / changeset

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/diffutils/diffutils.patch	Fri Aug 03 15:54:42 2012 +0200
     1.3 @@ -0,0 +1,77 @@
     1.4 +Index: lib/c-stack.c
     1.5 +--- lib/c-stack.c.orig	2011-08-28 13:55:52.000000000 +0200
     1.6 ++++ lib/c-stack.c	2012-05-12 10:06:32.000000000 +0200
     1.7 +@@ -35,6 +35,10 @@
     1.8 + 
     1.9 + #include <config.h>
    1.10 + 
    1.11 ++#if defined(__FreeBSD__)
    1.12 ++#include <sys/types.h>
    1.13 ++#endif
    1.14 ++
    1.15 + #ifndef __attribute__
    1.16 + # if __GNUC__ < 3
    1.17 + #  define __attribute__(x)
    1.18 +Index: man/diff3.1
    1.19 +--- man/diff3.1.orig	2011-09-02 17:19:12.000000000 +0200
    1.20 ++++ man/diff3.1	2012-05-12 10:06:32.000000000 +0200
    1.21 +@@ -39,6 +39,9 @@
    1.22 + \fB\-a\fR, \fB\-\-text\fR
    1.23 + treat all files as text
    1.24 + .TP
    1.25 ++\fB\-O\fR
    1.26 ++Always show content of OLDFILE in bracketing output of unmerged changes. (OpenPKG only)
    1.27 ++.TP
    1.28 + \fB\-\-strip\-trailing\-cr\fR
    1.29 + strip trailing carriage return on input
    1.30 + .TP
    1.31 +Index: src/diff3.c
    1.32 +--- src/diff3.c.orig	2011-07-03 22:42:54.000000000 +0200
    1.33 ++++ src/diff3.c	2012-05-12 10:06:32.000000000 +0200
    1.34 +@@ -158,6 +158,9 @@
    1.35 + /* If nonzero, show information for DIFF_2ND diffs.  */
    1.36 + static bool show_2nd;
    1.37 + 
    1.38 ++/* If nonzero, show information for DIFF_2ND on overlaps, too. */
    1.39 ++static bool show_2nd_on_overlap;
    1.40 ++
    1.41 + /* If nonzero, include `:wq' at the end of the script
    1.42 +    to write out the file being edited.   */
    1.43 + static bool finalwrite;
    1.44 +@@ -237,7 +240,7 @@
    1.45 +   textdomain (PACKAGE);
    1.46 +   c_stack_action (0);
    1.47 + 
    1.48 +-  while ((c = getopt_long (argc, argv, "aeimvx3AEL:TX", longopts, 0)) != -1)
    1.49 ++  while ((c = getopt_long (argc, argv, "aeimvx3AEL:TXO", longopts, 0)) != -1)
    1.50 +     {
    1.51 +       switch (c)
    1.52 + 	{
    1.53 +@@ -272,6 +275,9 @@
    1.54 + 	case 'e':
    1.55 + 	  incompat++;
    1.56 + 	  break;
    1.57 ++	case 'O':
    1.58 ++	  show_2nd_on_overlap = true;
    1.59 ++	  break;
    1.60 + 	case 'T':
    1.61 + 	  initial_tab = true;
    1.62 + 	  break;
    1.63 +@@ -1547,7 +1553,7 @@
    1.64 + 	  leading_dot = false;
    1.65 + 	  if (type == DIFF_ALL)
    1.66 + 	    {
    1.67 +-	      if (show_2nd)
    1.68 ++	      if (show_2nd || show_2nd_on_overlap)
    1.69 + 		{
    1.70 + 		  /* Append lines from FILE1.  */
    1.71 + 		  fprintf (outputfile, "||||||| %s\n", file1);
    1.72 +@@ -1686,7 +1692,7 @@
    1.73 + 			D_RELLEN (b, mapping[FILE0], i), outputfile);
    1.74 + 	    }
    1.75 + 
    1.76 +-	  if (show_2nd)
    1.77 ++	  if (show_2nd || show_2nd_on_overlap)
    1.78 + 	    {
    1.79 + 	      /* Put in lines from FILE1 with bracket.  */
    1.80 + 	      fprintf (outputfile, format_2nd, file1);

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/diffutils/diffutils.spec	Fri Aug 03 15:54:42 2012 +0200
     2.3 @@ -0,0 +1,79 @@
     2.4 +##
     2.5 +##  diffutils.spec -- OpenPKG RPM Package Specification
     2.6 +##  Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.7 +##
     2.8 +##  Permission to use, copy, modify, and distribute this software for
     2.9 +##  any purpose with or without fee is hereby granted, provided that
    2.10 +##  the above copyright notice and this permission notice appear in all
    2.11 +##  copies.
    2.12 +##
    2.13 +##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
    2.14 +##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
    2.15 +##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
    2.16 +##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
    2.17 +##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
    2.18 +##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
    2.19 +##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
    2.20 +##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
    2.21 +##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
    2.22 +##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
    2.23 +##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    2.24 +##  SUCH DAMAGE.
    2.25 +##
    2.26 +
    2.27 +#   package information
    2.28 +Name:         diffutils
    2.29 +Summary:      GNU Diff Utilities
    2.30 +URL:          http://www.gnu.org/software/diffutils/
    2.31 +Vendor:       Free Software Foundation
    2.32 +Packager:     OpenPKG Foundation e.V.
    2.33 +Distribution: OpenPKG Community
    2.34 +Class:        BASE
    2.35 +Group:        Patching
    2.36 +License:      GPL
    2.37 +Version:      3.2
    2.38 +Release:      20120512
    2.39 +
    2.40 +#   list of sources
    2.41 +Source0:      ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz
    2.42 +Patch0:       diffutils.patch
    2.43 +
    2.44 +#   build information
    2.45 +BuildPreReq:  OpenPKG, openpkg >= 20100101, texinfo, make, gcc
    2.46 +PreReq:       OpenPKG, openpkg >= 20100101
    2.47 +
    2.48 +%description
    2.49 +    The GNU set of diff utilities: cmp, diff, diff3 and sdiff.
    2.50 +
    2.51 +%track
    2.52 +    prog diffutils = {
    2.53 +        version   = %{version}
    2.54 +        url       = ftp://ftp.gnu.org/gnu/diffutils/
    2.55 +        regex     = diffutils-(__VER__)\.tar\.gz
    2.56 +    }
    2.57 +
    2.58 +%prep
    2.59 +    %setup -q
    2.60 +    %patch -p0
    2.61 +
    2.62 +%build
    2.63 +    CC="%{l_cc}" \
    2.64 +    CFLAGS="%{l_cflags -O}" \
    2.65 +    ./configure \
    2.66 +        --prefix=%{l_prefix} \
    2.67 +        --mandir=%{l_prefix}/man \
    2.68 +        --infodir=%{l_prefix}/info \
    2.69 +        --disable-nls
    2.70 +    %{l_make} %{l_mflags -O}
    2.71 +
    2.72 +%install
    2.73 +    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    2.74 +    rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
    2.75 +    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/charset.alias
    2.76 +    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
    2.77 +    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
    2.78 +
    2.79 +%files -f files
    2.80 +
    2.81 +%clean
    2.82 +