OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Jul-2008 20:53:17
Branch: HEAD Handle: 2008070219530800
Modified files:
openpkg-src/patchutils patchutils.patch patchutils.spec
Log:
upgrading package: patchutils 0.2.31 -> 0.3.0
Summary:
Revision Changes Path
1.5 +12 -64 openpkg-src/patchutils/patchutils.patch
1.57 +5 -3 openpkg-src/patchutils/patchutils.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/patchutils/patchutils.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 patchutils.patch
--- openpkg-src/patchutils/patchutils.patch 6 Jan 2007 13:43:34 -0000
1.4
+++ openpkg-src/patchutils/patchutils.patch 2 Jul 2008 18:53:08 -0000
1.5
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2005-06-13 19:41:01 +0200
-+++ Makefile.in 2007-01-06 14:18:07 +0100
-@@ -113,7 +113,7 @@
+--- Makefile.in.orig 2008-07-02 13:44:45 +0200
++++ Makefile.in 2008-07-02 20:38:58 +0200
+@@ -119,7 +119,7 @@
bin_PROGRAMS = src/interdiff src/filterdiff src/rediff
bin_SCRIPTS = fixcvsdiff splitdiff editdiff recountdiff unwrapdiff
dehtmldiff \
@@ -10,7 +10,7 @@
man_MANS = doc/interdiff.1 doc/filterdiff.1 doc/fixcvsdiff.1 doc/rediff.1 \
doc/editdiff.1 doc/combinediff.1 doc/lsdiff.1 doc/splitdiff.1 \
-@@ -513,6 +513,8 @@
+@@ -400,6 +400,8 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
espdiff: $(top_builddir)/config.status espdiff.in
cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -20,20 +20,20 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
Index: configure
---- configure.orig 2005-06-13 19:41:01 +0200
-+++ configure 2007-01-06 14:19:46 +0100
-@@ -4879,7 +4879,7 @@
+--- configure.orig 2008-07-02 13:44:45 +0200
++++ configure 2008-07-02 20:41:36 +0200
+@@ -5470,7 +5470,7 @@
_ACEOF
--
ac_config_files="$ac_config_files Makefile splitdiff editdiff
fixcvsdiff recountdiff unwrapdiff dehtmldiff espdiff patchutils.spec"
-+
ac_config_files="$ac_config_files Makefile splitdiff editdiff
fixcvsdiff recountdiff unwrapdiff dehtmldiff espdiff patchutils.spec gendiff"
+-ac_config_files="$ac_config_files Makefile splitdiff editdiff fixcvsdiff
recountdiff unwrapdiff dehtmldiff espdiff patchutils.spec"
++ac_config_files="$ac_config_files Makefile splitdiff editdiff fixcvsdiff
recountdiff unwrapdiff dehtmldiff espdiff patchutils.spec gendiff"
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
Index: gendiff.in
---- /dev/null 2007-01-06 14:19:19 +0100
-+++ gendiff.in 2007-01-06 14:18:07 +0100
+--- /dev/null 2008-07-02 20:40:00 +0200
++++ gendiff.in 2008-07-02 20:38:58 +0200
@@ -0,0 +1,18 @@
+#!/bin/bash
+if [ $# -ne 2 ]; then
@@ -53,55 +53,3 @@
+ esac
+ diff $U "$OP" "$NP"
+done
-Index: src/diff.c
---- src/diff.c.orig 2005-02-27 00:45:20 +0100
-+++ src/diff.c 2007-01-06 14:18:07 +0100
-@@ -67,16 +67,20 @@
- {
- int *pathname_components;
- int *basename_length;
-+ int *is_dev_null;
- int best_pn, best_bn, best_n, best = 0; /* shut gcc up */
- int i;
-
- pathname_components = xmalloc (sizeof (int *) * n);
- basename_length = xmalloc (sizeof (int *) * n);
-+ is_dev_null = xmalloc (sizeof (int *) * n);
-
- best_pn = -1;
- for (i = 0; i < n; i++) {
-- if (!strcmp (names[i], "/dev/null"))
-+ is_dev_null[i] = !strcmp (names[i], "/dev/null");
-+ if (is_dev_null[i])
- continue;
-+
- pathname_components[i] = num_pathname_components (names[i]);
- if ((best_pn == -1) ||
- (pathname_components[i] < best_pn))
-@@ -87,7 +91,7 @@
- for (i = 0; i < n; i++) {
- char *p;
-
-- if (!strcmp (names[i], "/dev/null"))
-+ if (is_dev_null[i])
- continue;
-
- if (pathname_components[i] != best_pn)
-@@ -109,6 +113,9 @@
- for (i = 0; i < n; i++) {
- int len;
-
-+ if (is_dev_null[i])
-+ continue;
-+
- if (basename_length[i] != best_bn)
- continue;
-
-@@ -122,6 +129,7 @@
-
- free (pathname_components);
- free (basename_length);
-+ free (is_dev_null);
- return names[best];
- }
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/patchutils/patchutils.spec
============================================================================
$ cvs diff -u -r1.56 -r1.57 patchutils.spec
--- openpkg-src/patchutils/patchutils.spec 1 Jan 2008 15:01:16 -0000
1.56
+++ openpkg-src/patchutils/patchutils.spec 2 Jul 2008 18:53:08 -0000
1.57
@@ -31,8 +31,8 @@
Class: BASE
Group: Patching
License: GPL
-Version: 0.2.31
-Release: 20080101
+Version: 0.3.0
+Release: 20080702
# list of sources
Source0:
http://cyberelk.net/tim/data/patchutils/stable/patchutils-%{version}.tar.bz2
@@ -92,6 +92,7 @@
PERL="%{l_prefix}/bin/perl" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--with-diff=%{l_prefix}/bin/diff \
--with-patch=%{l_prefix}/bin/patch \
--disable-nls
@@ -101,7 +102,8 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install \
prefix=$RPM_BUILD_ROOT%{l_prefix} \
- exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
+ exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
+ mandir=$RPM_BUILD_ROOT%{l_prefix}/man
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
