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: 20-Dec-2004 20:08:04
Branch: HEAD Handle: 2004122019080400
Added files:
openpkg-src/cpio cpio.patch
Modified files:
openpkg-src/cpio cpio.spec
Log:
upgrading package: cpio 2.5 -> 2.6
Summary:
Revision Changes Path
1.3 +38 -0 openpkg-src/cpio/cpio.patch
1.26 +13 -10 openpkg-src/cpio/cpio.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.patch
============================================================================
$ cvs diff -u -r0 -r1.3 cpio.patch
--- /dev/null 2004-12-20 20:08:04 +0100
+++ cpio.patch 2004-12-20 20:08:04 +0100
@@ -0,0 +1,38 @@
+Index: src/userspec.c
+--- src/userspec.c.orig 2004-09-06 14:23:06 +0200
++++ src/userspec.c 2004-12-20 19:58:04 +0100
+@@ -20,6 +20,7 @@
+ #include <system.h>
+
+ #ifdef __GNUC__
++#undef alloca
+ #define alloca __builtin_alloca
+ #else
+ #ifdef HAVE_ALLOCA_H
+@@ -72,7 +73,7 @@
+ otherwise return 0. */
+
+ static int
+-isnumber (const char *str)
++my_isnumber (const char *str)
+ {
+ for (; *str; str++)
+ if (!isdigit (*str))
+@@ -136,7 +137,7 @@
+ if (pwd == NULL)
+ {
+
+- if (!isnumber (u))
++ if (!my_isnumber (u))
+ error_msg = _("invalid user");
+ else
+ {
+@@ -182,7 +183,7 @@
+ grp = getgrnam (g);
+ if (grp == NULL)
+ {
+- if (!isnumber (g))
++ if (!my_isnumber (g))
+ error_msg = _("invalid group");
+ else
+ *gid = atoi (g);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 cpio.spec
--- openpkg-src/cpio/cpio.spec 7 Feb 2004 17:54:08 -0000 1.25
+++ openpkg-src/cpio/cpio.spec 20 Dec 2004 19:08:04 -0000 1.26
@@ -33,11 +33,12 @@
Class: BASE
Group: Archiver
License: GPL
-Version: 2.5
-Release: 20040207
+Version: 2.6
+Release: 20041220
# list of sources
Source0: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-%{version}.tar.gz
+Patch0: cpio.patch
# build information
Prefix: %{l_prefix}
@@ -62,22 +63,24 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
- --prefix=%{l_prefix}
- %{l_make} %{l_mflags -O} cpio cpio.info
+ --prefix=%{l_prefix} \
+ --libexecdir=%{l_prefix}/libexec/cpio
+ %{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
- %{l_shtool} install -c -s -m 755 cpio $RPM_BUILD_ROOT%{l_prefix}/bin/
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/man/man1
- %{l_shtool} install -c -m 644 cpio.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/info
- %{l_shtool} install -c -m 644 cpio.info $RPM_BUILD_ROOT%{l_prefix}/info/
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+ mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/mt.1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/rmt.1
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
