From 5433e5d0496d9a5787c8226c263f7815997a4b472992fa30336bbc2211eba1cc Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 1 Sep 2014 15:39:48 +0000
Subject: [PATCH] Accepting request 246964 from home:adra:branches:devel:tools

Update to 0.3.3

OBS-URL: https://build.opensuse.org/request/show/246964
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=15
---
 patchutils-0.3.2.tar.bz2 |  3 ---
 patchutils-0.3.3.tar.xz  |  3 +++
 patchutils.changes       | 11 ++++++++++
 patchutils.spec          | 45 ++++++++++++++++++++--------------------
 4 files changed, 37 insertions(+), 25 deletions(-)
 delete mode 100644 patchutils-0.3.2.tar.bz2
 create mode 100644 patchutils-0.3.3.tar.xz

diff --git a/patchutils-0.3.2.tar.bz2 b/patchutils-0.3.2.tar.bz2
deleted file mode 100644
index 1d46801..0000000
--- a/patchutils-0.3.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fdeb1a571b42faeafbc6bcd999717efca256601a1aa2b4b2f34ec93b6977ae21
-size 160193
diff --git a/patchutils-0.3.3.tar.xz b/patchutils-0.3.3.tar.xz
new file mode 100644
index 0000000..da1bdea
--- /dev/null
+++ b/patchutils-0.3.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91f4e8451b2efcac5d40c966e42c175803450f0de94c926bfecc12c90070ad3c
+size 156328
diff --git a/patchutils.changes b/patchutils.changes
index f4178c5..0e452d6 100644
--- a/patchutils.changes
+++ b/patchutils.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Aug 29 18:27:42 UTC 2014 - asterios.dramis@gmail.com
+
+- Update to 0.3.3:
+  * Context output format for "no newline" lines has been fixed.
+  * The splitdiff utility now has an option to disable ".patch"
+    filename extensions.
+  * Some fixes for bugs spotted by Coverity.
+  * Interdiff can now use "-" (stdin) for one of the inputs.
+- Run "make check" in %check section.
+
 -------------------------------------------------------------------
 Sat Mar  9 17:37:27 UTC 2013 - seife+obs@b1-systems.com
 
diff --git a/patchutils.spec b/patchutils.spec
index a9febed..800825d 100644
--- a/patchutils.spec
+++ b/patchutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package patchutils
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products 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,19 +17,22 @@
 
 
 Name:           patchutils
-Url:            http://cyberelk.net/tim/patchutils/
-Requires:       diffutils
-Requires:       patch
-BuildRequires:  automake
-Version:        0.3.2
+Version:        0.3.3
 Release:        0
 Summary:        A Collection of Tools for Manipulating Patch Files
 License:        GPL-2.0+
 Group:          Productivity/File utilities
-Source:         http://cyberelk.net/tim/data/patchutils/stable/patchutils-%{version}.tar.bz2
-Patch:          %name-0.2.30-tailsyntax.diff
+Url:            http://cyberelk.net/tim/software/patchutils/
+Source0:        http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.xz
+Patch0:         %{name}-0.2.30-tailsyntax.diff
 Patch1:         overrun.diff
 Patch2:         rediff-hunk-init-fix.diff
+BuildRequires:  automake
+%if 0%{?suse_version} < 1220
+BuildRequires:  xz
+%endif
+Requires:       diffutils
+Requires:       patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -42,36 +45,34 @@ Filterdiff is for extracting or excluding patches from a patch set
 based on modified files matching shell wildcards. Lsdiff lists modified
 files in a patch. Rediff corrects hand-edited patches.
 
-
-
-Authors:
---------
-    Tim Waugh <twaugh@redhat.com>
-    Marko Kreen <marko@l-t.ee>
-    Matthias Hanisch <matze@camline.com>
-
 %prep
 %setup -q
-%patch -p1
+%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
-export CFLAGS="$RPM_OPT_FLAGS"
-./configure --prefix=/usr --mandir=%_mandir
+%endif
+%configure
 make %{?_smp_mflags}
+
+%check
 make check
 
 %install
-make DESTDIR=%buildroot install
+make DESTDIR=%{buildroot} install
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
-/usr/bin/*
-%_mandir/man1/*.1.gz
+%{_bindir}/*
+%{_mandir}/man1/*.1.gz
 
 %changelog