rpms/elinks/devel elinks-0.11.0-srcdir.patch, 1.1, 1.2 elinks.spec, 1.29, 1.30

[fedora-cvs-commits at redhat.com]

Author: kzak

Update of /cvs/dist/rpms/elinks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29057

Modified Files:
	elinks-0.11.0-srcdir.patch elinks.spec 
Log Message:
upstream version of srcdir patch

elinks-0.11.0-srcdir.patch:
 po/Makefile               |    2 +-
 src/intl/gettext/Makefile |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: elinks-0.11.0-srcdir.patch
===================================================================
RCS file: /cvs/dist/rpms/elinks/devel/elinks-0.11.0-srcdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elinks-0.11.0-srcdir.patch	10 Jan 2006 14:48:56 -0000	1.1
+++ elinks-0.11.0-srcdir.patch	10 Jan 2006 16:37:38 -0000	1.2
@@ -1,15 +1,14 @@
---- elinks-0.11.0/src/intl/gettext/Makefile.srcdir	2006-01-10 15:36:46.000000000 +0100
-+++ elinks-0.11.0/src/intl/gettext/Makefile	2006-01-10 15:38:25.000000000 +0100
+--- elinks-0.11.0/src/intl/gettext/Makefile.srcdir	2006-01-01 17:39:36.000000000 +0100
++++ elinks-0.11.0/src/intl/gettext/Makefile	2006-01-10 17:03:25.000000000 +0100
 @@ -25,9 +25,9 @@
   textdomain.o
  
  
 -# $(builddir)/charset.alias: $(srcdir)/config.charset
--$(builddir)/charset.alias: $(srcdir)config.charset
++# $(builddir)/charset.alias: $(srcdir)config.charset
+ $(builddir)/charset.alias: $(srcdir)config.charset
 -	$(SHELL) $(srcdir)/config.charset '$(host)' > $@.new
-+# $(builddir)/charset.alias: $(builddir)/config.charset
-+$(builddir)/charset.alias: $(builddir)/config.charset
-+	$(SHELL) $(builddir)/config.charset '$(host)' > $@.new
++	$(SHELL) $(srcdir)config.charset '$(host)' > $@.new
  	mv $@.new $@
  
  # FIXME: Building plural.c from plural.y on the fly doesn't work
@@ -18,7 +17,18 @@
  	  test -f $(DESTDIR)$(localedir)/locale.alias \
  	    && orig=$(DESTDIR)$(localedir)/locale.alias \
 -	    || orig=$(srcdir)/locale.alias; \
-+	    || orig=$(builddir)/locale.alias; \
++	    || orig=$(srcdir)locale.alias; \
  	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
  	  dest=$(DESTDIR)$(localedir)/locale.alias; \
  	  sed -f ref-add.sed $$orig > $$temp; \
+--- elinks-0.11.0/po/Makefile.srcdir	2006-01-01 17:39:36.000000000 +0100
++++ elinks-0.11.0/po/Makefile	2006-01-10 17:04:47.000000000 +0100
+@@ -67,7 +67,7 @@
+ # either <lang> or <lang>.po when calling make. Example: make update-po PO=is
+ 
+ update-po: Makefile $(srcdir)/$(PACKAGE).pot
+-	@cd $(srcdir)
++	@test -z "$(srcdir)" || cd $(srcdir)
+ 	@$(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(GMOFILES))), \
+ 	  echo -n "$(lang): "; \
+ 	  if $(MSGMERGE) $(srcdir)/$(lang).po $(srcdir)/$(PACKAGE).pot -o $(lang).new.po; then \


Index: elinks.spec
===================================================================
RCS file: /cvs/dist/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- elinks.spec	10 Jan 2006 14:48:56 -0000	1.29
+++ elinks.spec	10 Jan 2006 16:37:38 -0000	1.30
@@ -2,7 +2,7 @@
 Name: elinks
 Summary: A text-mode Web browser.
 Version: 0.11.0
-Release: 1
+Release: 2
 Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2
 Source1: http://links.sourceforge.net/download/docs/manual-0.82-en.tar.bz2
 Group: Applications/Internet
@@ -83,6 +83,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Tue Jan 10 2006 Karel Zak <kzak at redhat.com> 0.11.0-2
+- use upstream version of srcdir.patch
+
 * Tue Jan 10 2006 Karel Zak <kzak at redhat.com> 0.11.0-1
 - update to new upstream version
 - fix 0.11.0 build system (srcdir.patch)