OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Aug-2006 12:07:28
Branch: HEAD Handle: 2006082411072800
Modified files:
openpkg-src/findutils findutils.patch findutils.spec
Log:
finally upgrade to latest version and cleanup packages by removing
obsolete hacks
Summary:
Revision Changes Path
1.8 +15 -4 openpkg-src/findutils/findutils.patch
1.73 +7 -12 openpkg-src/findutils/findutils.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/findutils/findutils.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 findutils.patch
--- openpkg-src/findutils/findutils.patch 21 Jun 2005 19:04:14 -0000
1.7
+++ openpkg-src/findutils/findutils.patch 24 Aug 2006 10:07:28 -0000
1.8
@@ -1,7 +1,18 @@
+Index: configure
+--- configure.orig 2006-08-05 20:54:49 +0200
++++ configure 2006-08-24 12:00:28 +0200
+@@ -16231,6 +16231,7 @@
+
+
+
++LIBOBJS="$LIBOBJS regex.$ac_objext"
+
+
+ { echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
Index: locate/updatedb.sh
---- locate/updatedb.sh.orig 2005-06-19 11:11:59 +0200
-+++ locate/updatedb.sh 2005-06-21 20:59:47 +0200
-@@ -136,6 +136,7 @@
+--- locate/updatedb.sh.orig 2006-06-14 23:19:51 +0200
++++ locate/updatedb.sh 2006-08-24 12:00:05 +0200
+@@ -137,6 +137,7 @@
: [EMAIL PROTECTED]@}
# Directory to hold intermediate files.
@@ -9,7 +20,7 @@
if test -d /var/tmp; then
: ${TMPDIR=/var/tmp}
elif test -d /usr/tmp; then
-@@ -143,7 +144,7 @@
+@@ -144,7 +145,7 @@
else
: ${TMPDIR=/tmp}
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/findutils/findutils.spec
============================================================================
$ cvs diff -u -r1.72 -r1.73 findutils.spec
--- openpkg-src/findutils/findutils.spec 1 Jan 2006 13:13:33 -0000
1.72
+++ openpkg-src/findutils/findutils.spec 24 Aug 2006 10:07:28 -0000
1.73
@@ -32,8 +32,8 @@
Class: BASE
Group: Utility
License: GPL
-Version: 4.2.27
-Release: 20051207
+Version: 4.2.28
+Release: 20060824
# list of sources
Source0: ftp://ftp.gnu.org/gnu/findutils/findutils-%{version}.tar.gz
@@ -63,14 +63,9 @@
%patch -p0
%build
- CC="%{l_cc}"
- CFLAGS="%{l_cflags -O}"
- CPPFLAGS=""
- case "%{l_platform -t}" in
- *-freebsd* ) CPPFLAGS="-DHAVE_F_FSTYPENAME_IN_STATFS" ;;
- esac
- SORT="%{l_prefix}/bin/gsort"
- export CC CFLAGS CPPFLAGS SORT
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ SORT="%{l_prefix}/bin/gsort" \
./configure \
--prefix=%{l_prefix} \
--libexecdir=%{l_prefix}/libexec/findutils \
@@ -82,10 +77,10 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install \
- AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT
localstatedir=$RPM_BUILD_ROOT%{l_prefix}/var/findutils"
+ AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
%{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/var/findutils
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.findutils} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]