rpm/patchutils
SHA256
1
0
Fork 0
forked from pool/patchutils
Code Pull Requests Activity

Accepting request 314938 from home:sleep_walker:branches:devel:tools

Browse Source 
- Update to 0.3.4
  * Some fixes for filterdiff and rediff.
  * The splitdiff utility now has an option to write output to a
    subdirectory.
  * Ranges can now be prefixed by a modifier ('x') to exclude spans
    instead of include them.
  * Extended headers produced by git are now handled by filterdiff
    and interdiff.
- remove overrun.diff (upstream has the fix already)
- remove autoconf part from spec file as tarball is generated with
  new enough versions
- install man pages manually
- add signature file

OBS-URL: https://build.opensuse.org/request/show/314938
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=17
This commit is contained in:
Stefan Dirsch 2015-07-03 08:06:01 +00:00 committed by Git OBS Bridge
parent 5433e5d049
commit 0398df4cc5
6 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
overrun.diff
View File

@ -1,16 +0,0 @@
Author: Dirk Mueller <dmueller@suse.de>
Subject: forgets to copy trailing NULL, so execve() fails
--- src/rediff.c
+++ src/rediff.c
@@ -1042,8 +1042,8 @@ int main (int argc, char *argv[])
char *p = xmalloc (strlen (argv[0]) +
strlen ("recountdiff") + 1);
char *f;
- char **const new_argv = xmalloc (sizeof (char *) * argc);
- memcpy (new_argv, argv, sizeof (char *) * argc);
+ char **const new_argv = xmalloc (sizeof (char *) * (argc + 1));
+ memcpy (new_argv, argv, sizeof (char *) * (argc + 1) );
new_argv[0] = p;
strcpy (p, argv[0]);
f = strrchr (p, '/');

3
patchutils-0.3.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:91f4e8451b2efcac5d40c966e42c175803450f0de94c926bfecc12c90070ad3c
size 156328

3
patchutils-0.3.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cf55d4db83ead41188f5b6be16f60f6b76a87d5db1c42f5459d596e81dabe876
size 166400

BIN
patchutils-0.3.4.tar.xz.sig Normal file
View File

Binary file not shown.

17
patchutils.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Jul 3 06:43:14 UTC 2015 - sleep_walker@opensuse.org
- Update to 0.3.4
* Some fixes for filterdiff and rediff.
* The splitdiff utility now has an option to write output to a
subdirectory.
* Ranges can now be prefixed by a modifier ('x') to exclude spans
instead of include them.
* Extended headers produced by git are now handled by filterdiff
and interdiff.
- remove overrun.diff (upstream has the fix already)
- remove autoconf part from spec file as tarball is generated with
new enough versions
- install man pages manually
- add signature file
-------------------------------------------------------------------
Fri Aug 29 18:27:42 UTC 2014 - asterios.dramis@gmail.com

19
patchutils.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package patchutils
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,15 +17,15 @@
Name: patchutils
Version: 0.3.3
Version: 0.3.4
Release: 0
Summary: A Collection of Tools for Manipulating Patch Files
License: GPL-2.0+
Group: Productivity/File utilities
Url: http://cyberelk.net/tim/software/patchutils/
Source0: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.xz
Source1: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.xz.sig
Patch0: %{name}-0.2.30-tailsyntax.diff
Patch1: overrun.diff
Patch2: rediff-hunk-init-fix.diff
BuildRequires: automake
%if 0%{?suse_version} < 1220
@ -48,18 +48,9 @@ files in a patch. Rediff corrects hand-edited patches.
%prep
%setup -q
%patch0 -p1
%patch1
%patch2 -p1
# new autoconf 1.13 removed old macro
# use it only on openSUSE > 11.1 since it fails in SLE with "configure.in:7: option `dist-xz' not recognized"
%if 0%{?suse_version} > 1110
sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
%endif
%build
%if 0%{?suse_version} > 1110
autoreconf -fi
%endif
%configure
make %{?_smp_mflags}
@ -68,11 +59,13 @@ make check
%install
make DESTDIR=%{buildroot} install
install -m 0755 -d %{buildroot}%{_mandir}/man1/
install -m 0644 -t %{buildroot}%{_mandir}/man1/ doc/*.1
%files
%defattr(-,root,root)
%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
%{_bindir}/*
%{_mandir}/man1/*.1.gz
%{_mandir}/man1/*.1*
%changelog