Hello community,
here is the log from the commit of package xorg-x11-fonts
checked in at Fri Mar 7 23:31:53 CET 2008.
--------
--- xorg-x11-fonts/xorg-x11-fonts.changes 2007-12-13 17:17:12.000000000 +0100
+++ xorg-x11-fonts/xorg-x11-fonts.changes 2008-03-07 20:30:52.726515000 +0100
@@ -1,0 +2,5 @@
+Fri Mar 7 20:47:22 CET 2008 - sndirsch@suse.de
+
+- font-xfree86-type1 1.0.1
+
+-------------------------------------------------------------------
Old:
----
font-xfree86-type1-X11R7.0-1.0.0.tar.bz2
New:
----
font-xfree86-type1-1.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-fonts.spec ++++++
--- /var/tmp/diff_new_pack.rn1842/_old 2008-03-07 23:31:19.000000000 +0100
+++ /var/tmp/diff_new_pack.rn1842/_new 2008-03-07 23:31:19.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-fonts (Version 7.3)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,11 +10,12 @@
# norootforbuild
+
Name: xorg-x11-fonts
BuildRequires: fontconfig freetype2 pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxkbfile xorg-x11-proto-devel
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 22
+Release: 48
License: X11/MIT
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -55,7 +56,7 @@
Source28: font-sony-misc-X11R7.0-1.0.0.tar.bz2
Source29: font-sun-misc-X11R7.0-1.0.0.tar.bz2
Source30: font-winitzki-cyrillic-X11R7.0-1.0.0.tar.bz2
-Source31: font-xfree86-type1-X11R7.0-1.0.0.tar.bz2
+Source31: font-xfree86-type1-1.0.1.tar.bz2
Source32: encodings-1.0.2.tar.bz2
Source33: font-adobe-utopia-100dpi-X11R7.0-1.0.1.tar.bz2
Source34: font-adobe-utopia-75dpi-X11R7.0-1.0.1.tar.bz2
@@ -189,24 +190,26 @@
/usr/share/fonts/misc/*.pcf.gz
%changelog
-* Thu Dec 13 2007 - sndirsch@suse.de
+* Fri Mar 07 2008 sndirsch@suse.de
+- font-xfree86-type1 1.0.1
+* Thu Dec 13 2007 sndirsch@suse.de
- mark fonts.dir/fonts.scale/encodings.dir as %%config in filelist
-* Sat Sep 29 2007 - sndirsch@suse.de
+* Sat Sep 29 2007 sndirsch@suse.de
- bumped version to 7.3
-* Tue Jul 24 2007 - sndirsch@suse.de
+* Tue Jul 24 2007 sndirsch@suse.de
- move most important fonts to xorg-x11-fonts-core (Bug #293793)
-* Mon Feb 12 2007 - sndirsch@suse.de
+* Mon Feb 12 2007 sndirsch@suse.de
- font-misc-ethiopic.diff:
* don't install TTF fonts any longer; OTF fonts should be enough
-* Wed Nov 08 2006 - sndirsch@suse.de
+* Wed Nov 08 2006 sndirsch@suse.de
- udpated font-screen-cyrillic to release 1.0.1 (X.Org 7.2 RC2)
* Add license from Andrey via Mikhail on xorg list.
-* Wed Nov 08 2006 - sndirsch@suse.de
+* Wed Nov 08 2006 sndirsch@suse.de
- updated encodings to release 1.0.2 (X.Org 7.2 RC2)
* Limit UNDEFINE line to en encoding's declared SIZE (bug 1248).
Simplify some encodings to avoid stating the obvious.
Remove the ansi-1251 encoding, it's called microsoft-cp1251.
-* Sat Oct 21 2006 - sndirsch@suse.de
+* Sat Oct 21 2006 sndirsch@suse.de
- updated encodings to release 1.0.1
* Added configure flags for --disable-gzip-small-encodings and
--disable-gzip-large-encodings for those who can afford a
@@ -214,21 +217,21 @@
non-compressed reads.
* Also added COPYING file with generic XFree86 copyright/license
and converted ChangeLog to generate from git log.
-* Mon Oct 16 2006 - aj@suse.de
+* Mon Oct 16 2006 aj@suse.de
- Fix build, fonts.cache might not exist.
-* Thu Aug 31 2006 - sndirsch@suse.de
+* Thu Aug 31 2006 sndirsch@suse.de
- added fonts-config to Prereq of main and -core subpackage
-* Wed Aug 30 2006 - sndirsch@suse.de
+* Wed Aug 30 2006 sndirsch@suse.de
- moved encodings to -core subpackage
-* Tue Aug 29 2006 - sndirsch@suse.de
+* Tue Aug 29 2006 sndirsch@suse.de
- move 'fixed' + 'cursor' fonts to new xorg-x11-fonts-core package
-* Wed Aug 09 2006 - sndirsch@suse.de
+* Wed Aug 09 2006 sndirsch@suse.de
- fixed /usr/share/fonts directory conflict with filesystem
-* Fri Jul 28 2006 - sndirsch@suse.de
+* Fri Jul 28 2006 sndirsch@suse.de
- use "-fno-strict-aliasing"
-* Thu Jul 27 2006 - sndirsch@suse.de
+* Thu Jul 27 2006 sndirsch@suse.de
- adjusted JIS0201 to CP932 encoding (Bug #194720)
-* Thu Jul 27 2006 - sndirsch@suse.de
+* Thu Jul 27 2006 sndirsch@suse.de
- use $RPM_OPT_FLAGS
-* Wed Jun 28 2006 - sndirsch@suse.de
+* Wed Jun 28 2006 sndirsch@suse.de
- created package
++++++ font-xfree86-type1-X11R7.0-1.0.0.tar.bz2 -> font-xfree86-type1-1.0.1.tar.bz2 ++++++
++++ 6880 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-xfree86-type1-X11R7.0-1.0.0/ChangeLog new/font-xfree86-type1-1.0.1/ChangeLog
--- old/font-xfree86-type1-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:26.000000000 +0100
+++ new/font-xfree86-type1-1.0.1/ChangeLog 2008-03-07 02:20:46.000000000 +0100
@@ -1,21 +1,122 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 242c71c56d9c44ea00835ffc50d5ad22c7d40702
+Author: Alan Coopersmith
+Date: Thu Mar 6 17:18:40 2008 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Version bump: 1.0.1
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit bff00386a4f612211acf7592bac4eba5e3cc894e
+Author: Alan Coopersmith
+Date: Mon Feb 4 10:36:33 2008 -0800
- * configure.ac:
- Add m4 magic to allow AS_HELP_STRING to work with older versions
- of autoconf 2.57.
+ Copy in XFree86 License 1.0 to COPYING file
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 060919d3ef2a559aba0ff254d716ef02df720fc3
+Author: James Cloos
+Date: Thu Dec 6 16:38:12 2007 -0500
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d45492c9e3cfa05dcf0013d55e5552e36f94a4d8
+Author: James Cloos
+Date: Mon Sep 3 05:53:26 2007 -0400
- * Makefile.am:
- * configure.ac:
- Add configure option to change the installed font dir.
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 1ccfc3910544a221f26ad059d4fb93e894af033b
+Author: James Cloos
+Date: Thu Aug 23 19:26:54 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 2760cdf6588cb31512156c160b5bc6baaa8dd451
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:26 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 5879f5b83b88ad7ec9226dcba93a0e4be122d66c
+Author: Kevin E Martin
+Date: Sat Dec 3 17:08:54 2005 +0000
+
+ Add m4 magic to allow AS_HELP_STRING to work with older versions of
+ autoconf 2.57.
+
+commit f20ba7224ac760e470290bb01fc210841a4c8d00
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:41 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit f0a168289dc72f3e104ed2d15e8845714d3c6aca
+Author: Eric Anholt
+Date: Tue Nov 22 02:00:22 2005 +0000
+
+ Add .cvsignores for fonts.
+
+commit 5862795a77587055486b4d247bd609ae82747a37
+Author: Kevin E Martin
+Date: Tue Nov 15 08:29:20 2005 +0000
+
+ Add configure option to change the installed font dir.
+
+commit 7c5aebd7505781252ffba64accdd396a2e37096c
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:49 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit af48fc0f4bc55701a1e9ffa31c8807b0f68484e9
+Author: Kevin E Martin
+Date: Thu Jun 30 22:28:09 2005 +0000
+
+ Initial build system files for font module
+
+commit 97318d414db57d1efc9297767ff4f77263ac9ece
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:05 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 134436cc44f4bc1287cccab4e6ac115cb76d1d6d
+Author: Egbert Eich
+Date: Sun Mar 14 08:31:31 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 5efc1ec735de01f459c3ac0ed7654cd792901de0
+Author: Egbert Eich
+Date: Wed Mar 3 12:10:53 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 18b5123176aedafa3bc97d4a0f4075f98c95b4aa
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:11 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 1a6f962bf3b67a3ba0ca835147c30d9cb33ddf44
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:24 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 6ef094436f181c6904338a4683238abf7d496106
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:42 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 33927d9a45faea054fc9b63990eb89a4b7e21298
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:42 2003 +0000
+
+ Initial revision
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-xfree86-type1-X11R7.0-1.0.0/configure.ac new/font-xfree86-type1-1.0.1/configure.ac
--- old/font-xfree86-type1-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:26.000000000 +0100
+++ new/font-xfree86-type1-1.0.1/configure.ac 2008-03-07 02:16:40.000000000 +0100
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(font-xfree86-type1, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-xfree86-type1)
+AC_INIT(font-xfree86-type1, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-xfree86-type1)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-xfree86-type1-X11R7.0-1.0.0/COPYING new/font-xfree86-type1-1.0.1/COPYING
--- old/font-xfree86-type1-X11R7.0-1.0.0/COPYING 2005-07-01 00:28:09.000000000 +0200
+++ new/font-xfree86-type1-1.0.1/COPYING 2008-02-04 19:48:33.000000000 +0100
@@ -1 +1,24 @@
-Copyright (c) 2000 XFree86, Inc.
+Copyright (C) 2000 The XFree86 Project, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-xfree86-type1-X11R7.0-1.0.0/Makefile.am new/font-xfree86-type1-1.0.1/Makefile.am
--- old/font-xfree86-type1-X11R7.0-1.0.0/Makefile.am 2005-11-15 09:29:20.000000000 +0100
+++ new/font-xfree86-type1-1.0.1/Makefile.am 2007-12-08 02:52:13.000000000 +0100
@@ -36,3 +36,13 @@
distuninstallcheck:
@:
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-xfree86-type1-X11R7.0-1.0.0/missing new/font-xfree86-type1-1.0.1/missing
--- old/font-xfree86-type1-X11R7.0-1.0.0/missing 2005-12-21 09:21:07.000000000 +0100
+++ new/font-xfree86-type1-1.0.1/missing 2008-03-07 02:20:40.000000000 +0100
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +44,24 @@
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -67,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +87,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +104,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +149,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +158,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -130,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +177,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,20 +188,15 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -185,74 +212,67 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -262,32 +282,36 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +347,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +358,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org