diff --git a/.cvsignore b/.cvsignore index bee1708..565b04e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dwdiff-1.3.tgz +dwdiff-1.4.tgz diff --git a/dwdiff-localedir.patch b/dwdiff-localedir.patch index 4725689..f239a82 100644 --- a/dwdiff-localedir.patch +++ b/dwdiff-localedir.patch @@ -1,25 +1,27 @@ ---- ./Makefile.in.localedir 2006-10-28 12:23:07.000000000 +0200 -+++ ./Makefile.in 2007-08-21 11:34:51.000000000 +0200 -@@ -22,6 +22,7 @@ +diff -up ./Makefile.in.localedir ./Makefile.in +--- ./Makefile.in.localedir 2008-07-10 22:19:21.000000000 +0200 ++++ ./Makefile.in 2008-07-10 22:20:47.000000000 +0200 +@@ -32,6 +32,7 @@ GETTEXTLIBS= # LINGUAS: translations to be installed. Look in po directory for available # translations. LOCALEDIR=$(prefix)/share/locale +BIND_DIR=$(prefix)/share/locale LINGUAS= - # diff program configuration -@@ -56,7 +57,7 @@ + # Unicode/ICU config +@@ -74,7 +75,7 @@ dist-clean: clean rm -rf dwdiff .c.o: -- $(CC) $(CFLAGS) $(GETTEXTFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" -c -o $@ $< -+ $(CC) $(CFLAGS) $(GETTEXTFLAGS) -DLOCALEDIR=\"$(BIND_DIR)\" -c -o $@ $< +- $(CC) $(CFLAGS) $(GETTEXTFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(ICUFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(GETTEXTFLAGS) -DLOCALEDIR=\"$(BIND_DIR)\" $(ICUFLAGS) -c -o $@ $< dwdiff: $(OBJECTS) - $(CC) $(CFLAGS) $(LDFLAGS) -o dwdiff $(OBJECTS) $(LDLIBS) $(GETTEXTLIBS) ---- ./configure.localedir 2006-10-28 12:23:07.000000000 +0200 -+++ ./configure 2007-08-21 11:35:49.000000000 +0200 -@@ -134,6 +134,7 @@ + $(CC) $(CFLAGS) $(LDFLAGS) -o dwdiff $(OBJECTS) $(LDLIBS) $(ICULIBS) $(GETTEXTLIBS) +diff -up ./configure.localedir ./configure +--- ./configure.localedir 2008-07-10 22:21:33.000000000 +0200 ++++ ./configure 2008-07-10 22:22:45.000000000 +0200 +@@ -144,6 +144,7 @@ create_makefile() { replace_default prefix "${PREFIX}" replace_default mandir "${MANDIR}" replace_default CFLAGS "${CFLAGS}" @@ -27,13 +29,13 @@ [ -n "${TEST_INSTALL}" ] && replace_default INSTALL "${INSTALL}" -@@ -202,6 +203,9 @@ +@@ -212,6 +213,9 @@ EOF --prefix=*) - PREFIX=`echo "${PARAM}" | sed 's/--prefix=//g'` + PREFIX=`echo "${PARAM}" | sed 's/^--prefix=//'` ;; + --binddir=*) + BIND_DIR=`echo "${PARAM}" | sed 's/--binddir=//g'` + ;; --mandir=*) - MANDIR=`echo "${PARAM}" | sed 's/--mandir=//g'` + MANDIR=`echo "${PARAM}" | sed 's/^--mandir=//'` ;; diff --git a/dwdiff.spec b/dwdiff.spec index a9943bb..fd871c0 100644 --- a/dwdiff.spec +++ b/dwdiff.spec @@ -1,6 +1,6 @@ Name: dwdiff -Version: 1.3 -Release: 2%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Front end to diff for comparing files on a word per word basis Group: Applications/Text @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: diffutils BuildRequires: gettext +BuildRequires: libicu-devel Patch0: dwdiff-localedir.patch @@ -55,6 +56,9 @@ rm -rf %{buildroot} %lang(nl) %{_mandir}/nl/man1/dwdiff.1* %changelog +* Tue Jul 08 2008 Jakub Hrozek 1.4-1 +- New upstream release, which BR: libicu-devel + * Sun Feb 10 2008 Jakub Hrozek 1.3-2 - Bump & rebuild for GCC 4.3 diff --git a/sources b/sources index ee61634..e5caa26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dddf28ca43a4b490a6999e6b379596da dwdiff-1.3.tgz +8415fdb6963fe662d0042bb18dde49df dwdiff-1.4.tgz