From bf503d50db419bab7768d8d3045fca6fb201a148 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Aug 21 2007 10:00:18 +0000 Subject: Fix configure/build to make the package rebuild in mock --- diff --git a/dwdiff-localedir.patch b/dwdiff-localedir.patch new file mode 100644 index 0000000..4725689 --- /dev/null +++ b/dwdiff-localedir.patch @@ -0,0 +1,39 @@ +--- ./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 @@ + # 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 @@ + rm -rf dwdiff + + .c.o: +- $(CC) $(CFLAGS) $(GETTEXTFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" -c -o $@ $< ++ $(CC) $(CFLAGS) $(GETTEXTFLAGS) -DLOCALEDIR=\"$(BIND_DIR)\" -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 @@ + replace_default prefix "${PREFIX}" + replace_default mandir "${MANDIR}" + replace_default CFLAGS "${CFLAGS}" ++ replace_default BIND_DIR "${BIND_DIR}" + + + [ -n "${TEST_INSTALL}" ] && replace_default INSTALL "${INSTALL}" +@@ -202,6 +203,9 @@ + --prefix=*) + PREFIX=`echo "${PARAM}" | sed 's/--prefix=//g'` + ;; ++ --binddir=*) ++ BIND_DIR=`echo "${PARAM}" | sed 's/--binddir=//g'` ++ ;; + --mandir=*) + MANDIR=`echo "${PARAM}" | sed 's/--mandir=//g'` + ;; diff --git a/dwdiff.spec b/dwdiff.spec index 9323b5d..99e0488 100644 --- a/dwdiff.spec +++ b/dwdiff.spec @@ -1,6 +1,6 @@ Name: dwdiff Version: 1.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Front end to diff for comparing files on a word per word basis Group: Applications/Text @@ -12,6 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: diffutils BuildRequires: gettext +Patch0: dwdiff-localedir.patch + %description dwdiff is a front-end for the diff program that operates at the word level instead of the line level. It is different from wdiff in that it allows the @@ -22,11 +24,12 @@ is no whitespace separating them from preceding words or delimiters. %prep %setup -q +%patch -p1 -b .localedir %build #dwdiff uses its own custom configure script ./configure --prefix=%{?buildroot:%{buildroot}}%{_prefix} \ - CFLAGS="%{optflags}" + --binddir=%{_datadir}/locale CFLAGS="%{optflags}" make @@ -52,6 +55,9 @@ rm -rf %{buildroot} %lang(nl) %{_mandir}/nl/man1/dwdiff.1* %changelog +* Tue Aug 21 2007 Jakub Hrozek 1.2-5 +Fix configure/build to make the package rebuild in mock + * Mon Aug 13 2007 Jakub Hrozek 1.2-4 Clarified the license tag