rpms/elinks/FC-5 elinks-0.11.0-srcdir.patch, 1.3, 1.4 .cvsignore, 1.17, 1.18 elinks.spec, 1.33, 1.34 sources, 1.17, 1.18

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon May 29 20:57:40 UTC 2006


Author: kzak

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

Modified Files:
	.cvsignore elinks.spec sources 
Added Files:
	elinks-0.11.0-srcdir.patch 
Log Message:
fix previous commit to wrong branch...

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: elinks-0.11.0-srcdir.patch
diff -N elinks-0.11.0-srcdir.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ elinks-0.11.0-srcdir.patch	29 May 2006 20:57:37 -0000	1.4
@@ -0,0 +1,34 @@
+--- 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
+-	$(SHELL) $(srcdir)/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
+@@ -61,7 +61,7 @@
+ 	  $(MKINSTALLDIRS) $(DESTDIR)$(localedir); \
+ 	  test -f $(DESTDIR)$(localedir)/locale.alias \
+ 	    && orig=$(DESTDIR)$(localedir)/locale.alias \
+-	    || orig=$(srcdir)/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: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/elinks/FC-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	29 May 2006 20:22:39 -0000	1.17
+++ .cvsignore	29 May 2006 20:57:37 -0000	1.18
@@ -1,2 +1,2 @@
-elinks-0.11.1.tar.bz2
+elinks-0.11.0.tar.bz2
 manual-0.82-en.tar.bz2


Index: elinks.spec
===================================================================
RCS file: /cvs/dist/rpms/elinks/FC-5/elinks.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- elinks.spec	29 May 2006 20:22:39 -0000	1.33
+++ elinks.spec	29 May 2006 20:57:37 -0000	1.34
@@ -1,14 +1,15 @@
 %define rescue %{nil}
 Name: elinks
 Summary: A text-mode Web browser.
-Version: 0.11.1
-Release: 1
+Version: 0.11.0
+Release: 2.3
 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
 URL: http://elinks.or.cz/
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: autoconf, automake, openssl-devel, pkgconfig
+BuildRequires: bzip2-devel, expat-devel, libidn-devel
 License: GPL
 Provides: webclient
 Obsoletes: links
@@ -21,6 +22,7 @@
 Patch4: elinks-0.11.0-sysname.patch
 Patch5: elinks-0.10.1-xterm.patch
 Patch6: elinks-0.11.0-union.patch
+Patch7: elinks-0.11.0-srcdir.patch
 
 %description
 Links is a text-based Web browser. Links does not display any images,
@@ -45,7 +47,7 @@
 # Fix #157300 - Strange behavior on ppc64
 %patch6 -p1 -b .union
 # Fix build system
-#%patch7 -p1 -b .srcdir
+%patch7 -p1 -b .srcdir
 
 %build
 #aclocal
@@ -81,8 +83,8 @@
 %{_mandir}/man5/*
 
 %changelog
-* Mon May 29 2006 Karel Zak <kzak at redhat.com> 0.11.1-1
-- update to new upstream version
+* Mon May 29 2006 Karel Zak <kzak at redhat.com> 0.11.0-2.3
+- add buildrequires bzip2-devel, expat-devel,libidn-devel
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.11.0-2.2
 - bump again for double-long bug on ppc(64)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/elinks/FC-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	29 May 2006 20:22:39 -0000	1.17
+++ sources	29 May 2006 20:57:37 -0000	1.18
@@ -1,2 +1,2 @@
-db0d62394b03938eec81b749e49dfbbc  elinks-0.11.1.tar.bz2
+9154f493f544af31ae31ec1dd203d315  elinks-0.11.0.tar.bz2
 947950d4974c25f95f1a3988bf88cb21  manual-0.82-en.tar.bz2




More information about the fedora-cvs-commits mailing list