rpms/dwdiff/devel .cvsignore, 1.3, 1.4 dwdiff-localedir.patch, 1.1, 1.2 dwdiff.spec, 1.7, 1.8 sources, 1.3, 1.4

[Jakub Hrozek (jhrozek)]

Author: jhrozek

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

Modified Files:
	.cvsignore dwdiff-localedir.patch dwdiff.spec sources 
Log Message:
New upstream release of dwdiff



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dwdiff/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Dec 2007 13:11:53 -0000	1.3
+++ .cvsignore	10 Jul 2008 20:36:35 -0000	1.4
@@ -1 +1 @@
-dwdiff-1.3.tgz
+dwdiff-1.4.tgz

dwdiff-localedir.patch:

Index: dwdiff-localedir.patch
===================================================================
RCS file: /cvs/extras/rpms/dwdiff/devel/dwdiff-localedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dwdiff-localedir.patch	21 Aug 2007 10:00:18 -0000	1.1
+++ dwdiff-localedir.patch	10 Jul 2008 20:36:35 -0000	1.2
@@ -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=//'`
  		;;


Index: dwdiff.spec
===================================================================
RCS file: /cvs/extras/rpms/dwdiff/devel/dwdiff.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dwdiff.spec	10 Feb 2008 17:17:06 -0000	1.7
+++ dwdiff.spec	10 Jul 2008 20:36:35 -0000	1.8
@@ -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 @@
 
 Requires: diffutils
 BuildRequires: gettext
+BuildRequires: libicu-devel
 
 Patch0: dwdiff-localedir.patch
 
@@ -55,6 +56,9 @@
 %lang(nl) %{_mandir}/nl/man1/dwdiff.1*
 
 %changelog
+* Tue Jul 08 2008 Jakub Hrozek <jhrozek at redhat.com> 1.4-1
+- New upstream release, which BR: libicu-devel
+
 * Sun Feb 10 2008 Jakub Hrozek <jhrozek at redhat.com> 1.3-2
 - Bump & rebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dwdiff/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Dec 2007 13:11:53 -0000	1.3
+++ sources	10 Jul 2008 20:36:35 -0000	1.4
@@ -1 +1 @@
-dddf28ca43a4b490a6999e6b379596da  dwdiff-1.3.tgz
+8415fdb6963fe662d0042bb18dde49df  dwdiff-1.4.tgz