OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Apr-2004 15:19:51
Branch: HEAD Handle: 2004042114195000
Modified files:
openpkg-src/coreutils coreutils.patch coreutils.spec
Log:
make sure makeinfo is not run (because it is run unconditionally and
actually not needed at all) and remove some hacks from the past which
are no longer needed
Summary:
Revision Changes Path
1.8 +33 -0 openpkg-src/coreutils/coreutils.patch
1.40 +1 -3 openpkg-src/coreutils/coreutils.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/coreutils/coreutils.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 coreutils.patch
--- openpkg-src/coreutils/coreutils.patch 24 Mar 2004 15:10:20 -0000 1.7
+++ openpkg-src/coreutils/coreutils.patch 21 Apr 2004 13:19:50 -0000 1.8
@@ -229,3 +229,36 @@
{
error (0, 0, _("`-%lu' option is obsolete; use `-f %lu'"),
(unsigned long) skip_fields, (unsigned long) skip_fields);
+Index: doc/Makefile.in
+--- doc/Makefile.in.orig 2004-03-11 09:57:59.000000000 +0100
++++ doc/Makefile.in 2004-04-21 15:11:16.000000000 +0200
+@@ -319,29 +319,6 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ .texi.info:
+- restore=: && \
+- backupdir="$(am__leading_dot)am$$$$" && \
+- am__cwd=`pwd` && cd $(srcdir) && \
+- rm -rf $$backupdir && mkdir $$backupdir && \
+- for f in $@ [EMAIL PROTECTED] [EMAIL PROTECTED] $(@:.info=).i[0-9]
$(@:.info=).i[0-9][0-9]; do \
+- if test -f $$f; then \
+- mv $$f $$backupdir; \
+- restore=mv; \
+- fi; \
+- done; \
+- cd "$$am__cwd"; \
+- if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+- -o $@ $<; \
+- then \
+- rc=0; \
+- cd $(srcdir); \
+- else \
+- rc=$$?; \
+- cd $(srcdir) && \
+- $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
+- fi; \
+- rm -rf $$backupdir; \
+- exit $$rc
+
+ .texi.dvi:
+ TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/coreutils/coreutils.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 coreutils.spec
--- openpkg-src/coreutils/coreutils.spec 24 Mar 2004 15:10:20 -0000 1.39
+++ openpkg-src/coreutils/coreutils.spec 21 Apr 2004 13:19:50 -0000 1.40
@@ -38,7 +38,7 @@
Group: Utility
License: GPL
Version: %{V_release}
-Release: 20040324
+Release: 20040421
# package options
%option with_legacy no
@@ -90,7 +90,6 @@
-e 's;^\(install-exec-local:\).*;\1;' \
-e 's;^\(bin_PROGRAMS =\);\1 su;' \
src/Makefile.in
- ( cd man && touch nice.1 stat.1 test.1 ls.1 dir.1 vdir.1 ) || exit 1
%build
CC="%{l_cc}" \
@@ -103,7 +102,6 @@
--prefix=%{l_prefix} \
--program-prefix=g \
--disable-nls
- chmod a+rx config/install-sh
%{l_make} %{l_mflags -O}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
