From 1bb149c5388e7a018df74f2e211e406322e00c94a5eaa5ac7996fcaec50ca0e6 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Mon, 15 Aug 2011 10:30:12 +0000
Subject: [PATCH] Accepting request 78714 from Base:System

Update to 3.1

OBS-URL: https://build.opensuse.org/request/show/78714
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/diffutils?expand=0&rev=14
---
 diffutils-3.0.tar.bz2 |  3 ---
 diffutils-3.1.tar.xz  |  3 +++
 diffutils.changes     | 10 ++++++++++
 diffutils.spec        | 14 ++++++++------
 4 files changed, 21 insertions(+), 9 deletions(-)
 delete mode 100644 diffutils-3.0.tar.bz2
 create mode 100644 diffutils-3.1.tar.xz

diff --git a/diffutils-3.0.tar.bz2 b/diffutils-3.0.tar.bz2
deleted file mode 100644
index afc6176..0000000
--- a/diffutils-3.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4227343cde98067e8cd14487d04ca1f360fdf49618e9408263c9317a5f07d609
-size 1331576
diff --git a/diffutils-3.1.tar.xz b/diffutils-3.1.tar.xz
new file mode 100644
index 0000000..7e69f36
--- /dev/null
+++ b/diffutils-3.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21016a0eeb59190107105276e97023e19023648db547192162aab6da6242fcf9
+size 1133392
diff --git a/diffutils.changes b/diffutils.changes
index 3319273..5b13158 100644
--- a/diffutils.changes
+++ b/diffutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Aug 13 03:10:31 CEST 2011 - pth@suse.de
+
+- Update to 3.1:
+  + Bug fixes
+    - diff no longer reports spurious differences merely because two
+      entries in the same directory have names that compare equal in
+      the current locale, or compare equal because --ignore-file-name-case
+      was given.
+
 -------------------------------------------------------------------
 Sun Sep 19 10:02:52 CEST 2010 - vuntz@opensuse.org
 
diff --git a/diffutils.spec b/diffutils.spec
index 75af1a3..9535cd8 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package diffutils (Version 3.0)
+# spec file for package diffutils (Version 3.1)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -25,11 +25,12 @@ Group:          Productivity/Text/Utilities
 Provides:       diff
 Obsoletes:      diff
 PreReq:         %{install_info_prereq}
-Version:        3.0
+Version:        3.1
 Release:        1
 Summary:        GNU diff Utilities
-Source:         %{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  xz
 
 %description
 The GNU diff utilities find differences between files. diff is used to
@@ -44,13 +45,14 @@ make %{?_smp_mflags}
 
 %install
 %makeinstall
+gzip -9 %{buildroot}%{_infodir}/%{name}.info
 %find_lang %name
 
 %post
-%install_info --info-dir=%{_infodir} %{_infodir}/diff.info.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
 %postun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/diff.info.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -62,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/diff
 %{_bindir}/diff3
 %{_bindir}/sdiff
-%doc %{_infodir}/diff.info*.gz
+%doc %{_infodir}/%{name}.info.gz
 %doc %{_mandir}/man1/*.gz
 
 %changelog