From 4cb2a139fce86bbc8c4430d935c2c9f420b9e124 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Aug 05 2013 11:40:48 +0000
Subject: New upstream release 2.0.5


---

diff --git a/dwdiff-localedir.patch b/dwdiff-localedir.patch
index 4846165..a81f9ae 100644
--- a/dwdiff-localedir.patch
+++ b/dwdiff-localedir.patch
@@ -1,41 +1,55 @@
-diff -up ./configure.localedir ./configure
---- ./configure.localedir	2010-02-13 11:03:27.000000000 +0100
-+++ ./configure	2010-03-07 21:35:50.252004551 +0100
-@@ -148,6 +148,7 @@ create_makefile() {
+diff -up dwdiff-2.0.5/configure.localedir dwdiff-2.0.5/configure
+--- dwdiff-2.0.5/configure.localedir	2013-06-30 20:16:44.000000000 +0200
++++ dwdiff-2.0.5/configure	2013-08-05 13:36:17.331621700 +0200
+@@ -148,6 +148,8 @@ create_makefile() {
  		replace_default prefix "${PREFIX}"
  		replace_default mandir "${MANDIR}"
  		replace_default CFLAGS "${CFLAGS}"
 +		replace_default BIND_DIR "${BIND_DIR}"
++		replace_default DOC_DIR "${DOC_DIR}"
  
  
  		[ -n "${TEST_INSTALL}" ] && replace_default INSTALL "${INSTALL}"
-@@ -216,6 +217,9 @@ EOF
+@@ -216,6 +218,12 @@ EOF
  		--prefix=*)
  			PREFIX=`echo "${PARAM}" | sed 's/^--prefix=//'`
  		;;
 +		--binddir=*)
 +			BIND_DIR=`echo "${PARAM}" | sed 's/--binddir=//g'`
 +		;;
++		--docdir=*)
++			DOC_DIR=`echo "${PARAM}" | sed 's/--docdir=//g'`
++		;;
  		--mandir=*)
  			MANDIR=`echo "${PARAM}" | sed 's/^--mandir=//'`
  		;;
-diff -up ./Makefile.in.localedir ./Makefile.in
---- ./Makefile.in.localedir	2010-02-13 11:03:26.000000000 +0100
-+++ ./Makefile.in	2010-03-07 22:03:35.128020176 +0100
-@@ -34,6 +34,7 @@ GETTEXTLIBS=
+diff -up dwdiff-2.0.5/Makefile.in.localedir dwdiff-2.0.5/Makefile.in
+--- dwdiff-2.0.5/Makefile.in.localedir	2013-06-30 20:16:44.000000000 +0200
++++ dwdiff-2.0.5/Makefile.in	2013-08-05 13:37:14.455619241 +0200
+@@ -34,6 +34,8 @@ GETTEXTLIBS=
  #  translations.
  LOCALEDIR=$(prefix)/share/locale
  LINGUAS=
-+BIND_DIR=/usr/share/locale
++BIND_DIR=$(prefix)/share/locale
++DOC_DIR=$(prefix)/share/doc/dwdiff
  
  # Unicode/ICU config
  # If unicode support is to be enabled, the following flags should be set
-@@ -81,7 +82,7 @@ dist-clean: clean
+@@ -54,7 +56,7 @@ DWFILTER=yes
+ 
+ # Miscelaneous install paths
+ bindir=$(prefix)/bin
+-docdir=$(prefix)/share/doc/dwdiff-2.0.5
++docdir=$(prefix)/$(DOC_DIR)
+ mandir=$(prefix)/share/man
+ 
+ all: dwdiff $(DWFILTER:yes=dwfilter) linguas
+@@ -73,7 +75,7 @@ dist-clean: clean
  	rm -rf dwdiff config.log Makefile
  
  .c.o:
--	$(CC) $(CFLAGS) $(GETTEXTFLAGS) $(DIFF_FLAGS) -DDIFF=\"$(DIFF)\" -DDWDIFF=\"$(bindir)/dwdiff\" -DLOCALEDIR=\"$(LOCALEDIR)\" $(ICUFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(GETTEXTFLAGS) $(DIFF_FLAGS) -DDIFF=\"$(DIFF)\" -DLOCALEDIR=\"$(BIND_DIR)\" $(ICUFLAGS) -c -o $@ $<
+-	$(CC) $(CFLAGS) -Isrc $(GETTEXTFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(ICUFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -Isrc $(GETTEXTFLAGS) -DLOCALEDIR=\"$(BIND_DIR)\" $(ICUFLAGS) -c -o $@ $<
  
  dwdiff: $(OBJECTS_DWDIFF)
  	$(CC) $(CFLAGS) $(LDFLAGS) -o dwdiff $(OBJECTS_DWDIFF) $(LDLIBS) $(ICULIBS) $(GETTEXTLIBS)
diff --git a/dwdiff.spec b/dwdiff.spec
index 8000844..189a3ee 100644
--- a/dwdiff.spec
+++ b/dwdiff.spec
@@ -1,6 +1,6 @@
 Name:    dwdiff       
-Version: 1.9
-Release: 7%{?dist}
+Version: 2.0.5
+Release: 1%{?dist}
 Summary: Front end to diff for comparing on a per word basis
 
 Group:   Applications/Text       
@@ -29,8 +29,10 @@ is no whitespace separating them from preceding words or delimiters.
 
 %build
 #dwdiff uses its own custom configure script
-./configure --prefix=%{?buildroot:%{buildroot}}%{_prefix} \
-            --binddir=%{_datadir}/locale CFLAGS="%{optflags}" 
+./configure --prefix=%{_prefix} \
+            --binddir=%{_datadir}/locale \
+            --docdir='share/doc/dwdiff' \
+            CFLAGS="%{optflags}"
 make 
 
 
@@ -60,6 +62,9 @@ rm -rf %{buildroot}
 %lang(nl) %{_mandir}/nl/man1/dwfilter.1*
 
 %changelog
+* Mon Aug 05 2013 Jakub Hrozek <jhrozek@redhat.com> - 2.0.5-1
+- New upstream release 2.0.5
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild