diff --git a/.cvsignore b/.cvsignore index 3f50757..3f27d5f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dwdiff-1.5.tgz +dwdiff-1.6.1.tgz diff --git a/dwdiff-localedir.patch b/dwdiff-localedir.patch index 51ffc6a..82cd27e 100644 --- a/dwdiff-localedir.patch +++ b/dwdiff-localedir.patch @@ -1,27 +1,7 @@ -diff -up ./Makefile.in.localedir ./Makefile.in ---- ./Makefile.in.localedir 2008-12-16 23:20:40.000000000 +0100 -+++ ./Makefile.in 2008-12-16 23:20:40.000000000 +0100 -@@ -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= - - # Unicode/ICU config -@@ -74,7 +75,7 @@ dist-clean: clean - rm -rf dwdiff config.log Makefile - - .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) $(ICULIBS) $(GETTEXTLIBS) -diff -up ./configure.localedir ./configure ---- ./configure.localedir 2008-12-16 23:12:29.000000000 +0100 -+++ ./configure 2008-12-16 23:08:13.000000000 +0100 -@@ -144,6 +144,7 @@ create_makefile() { +diff -up dwdiff-1.6.1/configure.localedir dwdiff-1.6.1/configure +--- dwdiff-1.6.1/configure.localedir 2009-11-08 19:20:07.860603725 +0100 ++++ dwdiff-1.6.1/configure 2009-11-08 19:21:19.261351396 +0100 +@@ -148,6 +148,7 @@ create_makefile() { replace_default prefix "${PREFIX}" replace_default mandir "${MANDIR}" replace_default CFLAGS "${CFLAGS}" @@ -29,7 +9,7 @@ diff -up ./configure.localedir ./configure [ -n "${TEST_INSTALL}" ] && replace_default INSTALL "${INSTALL}" -@@ -212,6 +213,9 @@ EOF +@@ -216,6 +217,9 @@ EOF --prefix=*) PREFIX=`echo "${PARAM}" | sed 's/^--prefix=//'` ;; @@ -39,3 +19,15 @@ diff -up ./configure.localedir ./configure --mandir=*) MANDIR=`echo "${PARAM}" | sed 's/^--mandir=//'` ;; +diff -up dwdiff-1.6.1/Makefile.in.localedir dwdiff-1.6.1/Makefile.in +--- dwdiff-1.6.1/Makefile.in.localedir 2009-11-08 19:18:19.026350857 +0100 ++++ dwdiff-1.6.1/Makefile.in 2009-11-08 19:19:23.225349644 +0100 +@@ -75,7 +75,7 @@ dist-clean: clean + rm -rf dwdiff config.log Makefile + + .c.o: +- $(CC) $(CFLAGS) $(GETTEXTFLAGS) $(DIFF_FLAGS) -DDIFF=\"$(DIFF)\" -DLOCALEDIR=\"$(LOCALEDIR)\" $(ICUFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(GETTEXTFLAGS) $(DIFF_FLAGS) -DDIFF=\"$(DIFF)\" -DLOCALEDIR=\"$(BIND_DIR)\" $(ICUFLAGS) -c -o $@ $< + + dwdiff: $(OBJECTS) + $(CC) $(CFLAGS) $(LDFLAGS) -o dwdiff $(OBJECTS) $(LDLIBS) $(ICULIBS) $(GETTEXTLIBS) diff --git a/dwdiff.spec b/dwdiff.spec index efafca2..cfd8da4 100644 --- a/dwdiff.spec +++ b/dwdiff.spec @@ -1,6 +1,6 @@ Name: dwdiff -Version: 1.5 -Release: 4%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: Front end to diff for comparing on a per word basis Group: Applications/Text @@ -56,6 +56,9 @@ rm -rf %{buildroot} %lang(nl) %{_mandir}/nl/man1/dwdiff.1* %changelog +* Sun Nov 8 2009 Jakub Hrozek 1.6.1-1 +- New upstream release + * Fri Jul 24 2009 Fedora Release Engineering - 1.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index fa51400..214bbfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83ae2714193fbe9bc5e1fb058d5b9eb2 dwdiff-1.5.tgz +e7bf94f579ce764c2070c17cc5a24332 dwdiff-1.6.1.tgz