Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 19 years ago
parent
commit
b6e28db2e5
3 changed files with 32 additions and 29 deletions
  1. +8
    -27
      package/base/xfsprogs/new_automake.patch
  2. +22
    -0
      package/base/xfsprogs/readline-termcap.patch
  3. +2
    -2
      package/base/xfsprogs/xfsprogs.desc

+ 8
- 27
package/base/xfsprogs/new_automake.patch

@ -1,29 +1,9 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/xfsprogs/new_automake.patch
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
diff -ruN xfsprogs-2.6.13-old/configure.in xfsprogs-2.6.13/configure.in
--- xfsprogs-2.6.13-old/configure.in 2004-06-17 11:42:40.341733888 +0200
+++ xfsprogs-2.6.13/configure.in 2004-06-17 11:41:28.386672720 +0200
@@ -26,7 +26,50 @@
enable_editline=no)
AC_SUBST(libeditline)
AC_SUBST(enable_editline)
--- ./configure.in~ 2005-10-19 04:38:18.000000000 +0200
+++ ./configure.in 2005-10-19 04:39:58.000000000 +0200
@@ -32,6 +32,51 @@
test $enable_termcap = yes && libtermcap="-ltermcap",)
AC_SUBST(libtermcap)
+# Generic macro, sets up all of the global packaging variables.
+# The following environment variables may be set to override defaults:
+# DEBUG OPTIMIZER MALLOCLIB PLATFORM DISTRIBUTION INSTALL_USER INSTALL_GROUP
@ -32,7 +12,7 @@ diff -ruN xfsprogs-2.6.13-old/configure.in xfsprogs-2.6.13/configure.in
+AC_DEFUN([AC_PACKAGE_GLOBALS],
+ [ pkg_name="$1"
+ AC_SUBST(pkg_name)
+
+ . ./VERSION
+ pkg_version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION}
+ AC_SUBST(pkg_version)
@ -68,6 +48,7 @@ diff -ruN xfsprogs-2.6.13-old/configure.in xfsprogs-2.6.13/configure.in
+ test -z "$PLATFORM" || pkg_platform="$PLATFORM"
+ AC_SUBST(pkg_platform)
+ ])
+
AC_PACKAGE_GLOBALS(xfsprogs)
AC_PACKAGE_UTILITIES(xfsprogs)

+ 22
- 0
package/base/xfsprogs/readline-termcap.patch

@ -0,0 +1,22 @@
--- xfsprogs-2.7.3/configure~ 2005-10-07 18:52:51.000000000 +0200
+++ xfsprogs-2.7.3/configure 2005-10-24 00:18:45.000000000 +0200
@@ -1284,7 +1284,7 @@
# Check whether --enable-readline or --disable-readline was given.
if test "${enable_readline+set}" = set; then
enableval="$enable_readline"
- test $enable_readline = yes && libreadline="-lreadline"
+ test $enable_readline = yes && libreadline="-lreadline -ltermcap"
else
enable_readline=no
fi;
--- xfsprogs-2.7.3/configure.in~ 2005-10-07 18:51:32.000000000 +0200
+++ xfsprogs-2.7.3/configure.in 2005-10-24 00:18:34.000000000 +0200
@@ -13,7 +13,7 @@
AC_ARG_ENABLE(readline,
[ --enable-readline=[yes/no] Enable readline command editing [default=no]],
- test $enable_readline = yes && libreadline="-lreadline",
+ test $enable_readline = yes && libreadline="-lreadline -ltermcap",
enable_readline=no)
AC_SUBST(libreadline)
AC_SUBST(enable_readline)

+ 2
- 2
package/base/xfsprogs/xfsprogs.desc

@ -42,8 +42,8 @@
[L] GPL
[S] Stable
[V] 2.6.25
[V] 2.7.3
[P] X -?---5---9 184.400
[D] 2161488680 xfsprogs-2.6.25.src.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/
[D] 888413655 xfsprogs-2.7.3.src.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/

Loading…
Cancel
Save