rpms/dwdiff/devel dwdiff-localedir.patch, NONE, 1.1 dwdiff.spec, 1.4, 1.5

[Jakub Hrozek (jhrozek)]

Author: jhrozek

Update of /cvs/extras/rpms/dwdiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9658

Modified Files:
	dwdiff.spec 
Added Files:
	dwdiff-localedir.patch 
Log Message:
Fix configure/build to make the package rebuild in mock

dwdiff-localedir.patch:

--- NEW FILE dwdiff-localedir.patch ---
--- ./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'`
 		;;


Index: dwdiff.spec
===================================================================
RCS file: /cvs/extras/rpms/dwdiff/devel/dwdiff.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dwdiff.spec	13 Aug 2007 13:51:28 -0000	1.4
+++ dwdiff.spec	21 Aug 2007 10:00:18 -0000	1.5
@@ -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 @@
 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 @@
 
 %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 @@
 %lang(nl) %{_mandir}/nl/man1/dwdiff.1*
 
 %changelog
+* Tue Aug  21 2007 Jakub Hrozek <jhrozek at redhat.com> 1.2-5
+Fix configure/build to make the package rebuild in mock
+
 * Mon Aug  13 2007 Jakub Hrozek <jhrozek at redhat.com> 1.2-4
 Clarified the license tag