rpms/lynx/F-9 lynx-build-fixes.patch, NONE, 1.1 lynx-more-build-fixes.patch, NONE, 1.1 lynx.spec, 1.51, 1.52
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Sat May 17 05:37:25 UTC 2008
Author: ausil
Update of /cvs/pkgs/rpms/lynx/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11670
Modified Files:
lynx.spec
Added Files:
lynx-build-fixes.patch lynx-more-build-fixes.patch
Log Message:
pathces fixing paralle builds tested on 32 way builds
lynx-build-fixes.patch:
--- NEW FILE lynx-build-fixes.patch ---
diff -up lynx2-8-6/src/makefile.in.jx lynx2-8-6/src/makefile.in
--- lynx2-8-6/src/makefile.in.jx 2006-08-31 19:37:53.000000000 -0400
+++ lynx2-8-6/src/makefile.in 2008-05-08 10:28:52.000000000 -0400
@@ -105,7 +105,7 @@ message:
@echo "Compiling Lynx sources"
do_chartrans_stuff:
- -cd chrtrans && $(MAKE) \
+ $(MAKE) -C chrtrans \
SITE_DEFS="$(SITE_DEFS)" \
BUILD_CFLAGS="$(BUILD_CFLAGS)" \
BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
@@ -118,7 +118,7 @@ lint:
clean:
rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS
- cd chrtrans && $(MAKE) clean
+ $(MAKE) -C chstrans clean
tags:
ctags *.[ch]
@@ -185,8 +185,8 @@ TABLES= \
$(CHRTR)utf8_uni.h \
$(CHRTR)viscii_uni.h
-$(TABLES):
- -cd chrtrans && $(MAKE) tables
+$(TABLES): chrtrans/makeuctb$(BUILD_EXEEXT)
+ -$(MAKE) -C chrtrans tables
UCdomap$o : UCdomap.c \
chrtrans/UCkd.h \
@@ -195,7 +195,7 @@ UCdomap$o : UCdomap.c \
UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
chrtrans/makeuctb$(BUILD_EXEEXT):
- cd chrtrans; make makeuctb$(BUILD_EXEEXT)
+ $(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT)
UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h
LYCookie$o : $(top_srcdir)/userdefs.h
lynx-more-build-fixes.patch:
--- NEW FILE lynx-more-build-fixes.patch ---
diff -Nur lynx2-8-6-orig/makefile.in lynx2-8-6/makefile.in
--- lynx2-8-6-orig/makefile.in 2006-09-03 18:25:39.000000000 -0500
+++ lynx2-8-6/makefile.in 2008-05-16 23:53:02.000000000 -0500
@@ -159,12 +159,12 @@
all lynx$x: cfg_defs.h LYHelp.h
@MSG_DIR_MAKE@ $(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
- at MSG_DIR_MAKE@ cd po && $(MAKE) CC="$(CC)"
- cd $(WWWINC) && $(MAKE) CC="$(CC)" \
+ at MSG_DIR_MAKE@ $(MAKE) -C po CC="$(CC)"
+ $(MAKE) -C $(WWWINC) CC="$(CC)" \
LY_CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
LYFLAGS="$(SITE_LYDEFS)"
- cd src && $(MAKE) all CC="$(CC)" \
+ $(MAKE) -C src all CC="$(CC)" \
CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
LIBS="$(LIBS) $(RESOLVLIB) $(WAISLIB) $(SITE_LIBS)" \
@@ -173,11 +173,11 @@
WWWLIB="../$(WWWINC)/libwww.a"
lint:
- cd $(WWWINC) && $(MAKE) LINT="$(LINT)" CC="$(CC)" \
+ $(MAKE) -C $(WWWINC) LINT="$(LINT)" CC="$(CC)" \
LY_CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
LYFLAGS="$(SITE_LYDEFS)" lint
- cd src && $(MAKE) all LINT="$(LINT)" CC="$(CC)" \
+ $(MAKE) -C src all LINT="$(LINT)" CC="$(CC)" \
CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
LIBS="$(LIBS) $(RESOLVLIB) $(WAISLIB) $(SITE_LIBS)" \
@@ -200,25 +200,25 @@
clean:
rm -f WWW/Library/*/*.[aoib]
rm -f WWW/Library/*/.created
- cd src && $(MAKE) clean
+ $(MAKE) -C src clean
@MSG_DIR_MAKE@ rm -f LYMessages.c
- at MSG_DIR_MAKE@ cd po && $(MAKE) $@
+ at MSG_DIR_MAKE@ $(MAKE) -C po $@
rm -f *.b src/lynx$x *.leaks cfg_defs.h LYHelp.h lint.*
@LYNXCFG_MAKE@ -rm -f alphatoc.html body.html cattoc.html tmp007
rm -f help_files.sed
rm -f core *.core
depend: cfg_defs.h LYHelp.h
- cd $(WWWINC) && $(MAKE) $@
- cd src && $(MAKE) $@
+ $(MAKE) -C $(WWWINC) $@
+ $(MAKE) -C src $@
distclean: clean
-rm -f WWW/Library/*/*~
-rm -f WWW/Library/*/*.bak
-rm -rf src/obsolete
- -cd src && $(MAKE) $@
- -cd src/chrtrans && $(MAKE) $@
- at MSG_DIR_MAKE@ cd po && $(MAKE) $@
+ -$(MAKE) -C src $@
+ -$(MAKE) -C src/chrtrans $@
+ at MSG_DIR_MAKE@ $(MAKE) -C po $@
@MSG_DIR_MAKE@ -rmdir po
-rm -f *~ *.bak *.sav tags TAGS
-rm -f $(WWWINC)/makefile src/makefile src/chrtrans/makefile
@@ -287,7 +287,7 @@
@echo Full installation complete.
install-bin: $(BINDIR) lynx$x
- at MSG_DIR_MAKE@ cd po && $(MAKE) CC="$(CC)" install
+ at MSG_DIR_MAKE@ $(MAKE) -C po CC="$(CC)" install
-mv -f $(BINDIR)/lynx$x $(BINDIR)/lynx.old
$(INSTALL_PROGRAM) lynx$x $(BINDIR)/lynx$x
@@ -405,7 +405,7 @@
$(INSTALL_DATA) $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
uninstall ::
- at MSG_DIR_MAKE@ cd po && $(MAKE) CC="$(CC)" uninstall
+ at MSG_DIR_MAKE@ $(MAKE) -C po CC="$(CC)" uninstall
-rm -f $(BINDIR)/lynx$x
-rm -f $(MANDIR)/lynx.1
-rm -f $(SYSCONFDIR)/lynx.cfg
diff -Nur lynx2-8-6-orig/src/makefile.in lynx2-8-6/src/makefile.in
--- lynx2-8-6-orig/src/makefile.in 2008-05-16 23:26:20.000000000 -0500
+++ lynx2-8-6/src/makefile.in 2008-05-17 00:20:31.000000000 -0500
@@ -195,7 +195,7 @@
UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
chrtrans/makeuctb$(BUILD_EXEEXT):
- $(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT)
+ -$(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT)
UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h
LYCookie$o : $(top_srcdir)/userdefs.h
Index: lynx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lynx/F-9/lynx.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- lynx.spec 19 Feb 2008 06:30:46 -0000 1.51
+++ lynx.spec 17 May 2008 05:36:40 -0000 1.52
@@ -1,7 +1,7 @@
Summary: A text-based Web browser
Name: lynx
Version: 2.8.6
-Release: 13%{?dist}
+Release: 14%{?dist}
License: GPL
Group: Applications/Internet
Source: http://lynx.isc.org/current/lynx%{version}.tar.bz2
@@ -11,11 +11,14 @@
Patch2: lynx-2.8.6-options.patch
Patch3: lynx-2.8.6-backgrcolor.patch
Patch4: lynx-2.8.6-fmt_string.patch
+Patch5: lynx-build-fixes.patch
+Patch6: lynx-more-build-fixes.patch
Requires: indexhtml
Provides: webclient
Provides: text-www-browser
BuildRequires: openssl-devel, pkgconfig, ncurses-devel >= 5.3-5,
BuildRequires: slang-devel, zlib-devel, gettext, rsh, telnet, zip, unzip
+#BuildRequires: automake autoconf gettext-devel
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -31,8 +34,10 @@
%patch2 -p1 -b .opt
%patch3 -p1 -b .bgcol
%patch4 -p1 -b .fmt_string
+%patch5 -p1 -b .build-fix
+%patch6 -p1 -b .build-fix-more
perl -pi -e "s,^HELPFILE:.*,HELPFILE:file://localhost/usr/share/doc/lynx-%{version}/lynx_help/lynx_help_main.html,g" lynx.cfg
-perl -pi -e "s,^DEFAULT_INDEX_FILE:.*,DEFAULT_INDEX_FILE:http://www.google.com/,g" lynx.cfg
+perl -pi -e "s,^DEFAULT_INDEX_FILE:.*,DEFAULT_INDEX_FILE:http://start.fedoraproject.org/,g" lynx.cfg
perl -pi -e 's,^#LOCALE_CHARSET:.*,LOCALE_CHARSET:TRUE,' lynx.cfg
%build
@@ -102,6 +107,11 @@
%config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
%changelog
+* Thu May 08 2008 Dennis Gilmore <dennis at ausil.us> - 2.8.6-14
+- patch from ajax to fix parallel builds
+- additional patch from me for parallel builds
+- set default home page to start.fedoraproject.org
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.8.6-13
- Autorebuild for GCC 4.3
More information about the fedora-extras-commits
mailing list