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: 08-May-2004 14:42:45
Branch: HEAD Handle: 2004050813424400
Added files:
openpkg-src/mpack mpack.patch
Modified files:
openpkg-src/mpack mpack.spec
Log:
upgrading package: mpack 1.5 -> 1.6
Summary:
Revision Changes Path
1.1 +35 -0 openpkg-src/mpack/mpack.patch
1.26 +19 -12 openpkg-src/mpack/mpack.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mpack/mpack.patch
============================================================================
$ cvs diff -u -r0 -r1.1 mpack.patch
--- /dev/null 2004-05-08 14:42:44.000000000 +0200
+++ mpack.patch 2004-05-08 14:42:45.000000000 +0200
@@ -0,0 +1,35 @@
+Index: unixos.c
+--- unixos.c.orig 2003-07-21 22:54:05.000000000 +0200
++++ unixos.c 2004-05-08 14:40:53.000000000 +0200
+@@ -23,6 +23,7 @@
+ * SOFTWARE.
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include <string.h>
+ #include <errno.h>
+@@ -38,10 +39,6 @@
+ #define MAXHOSTNAMELEN 64
+ #endif
+
+-extern int errno;
+-extern char *malloc();
+-extern char *getenv();
+-
+ int overwrite_files = 0;
+ int didchat;
+
+Index: xmalloc.c
+--- xmalloc.c.orig 2003-07-21 22:35:31.000000000 +0200
++++ xmalloc.c 2004-05-08 14:41:24.000000000 +0200
+@@ -23,8 +23,8 @@
+ * SOFTWARE.
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+-extern char *malloc(), *realloc();
+
+ char *xmalloc (int size)
+ {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mpack/mpack.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 mpack.spec
--- openpkg-src/mpack/mpack.spec 7 Feb 2004 17:56:47 -0000 1.25
+++ openpkg-src/mpack/mpack.spec 8 May 2004 12:42:44 -0000 1.26
@@ -33,11 +33,12 @@
Class: EVAL
Group: Converter
License: GPL
-Version: 1.5
-Release: 20040207
+Version: 1.6
+Release: 20040508
# list of sources
-Source0: ftp://ftp.andrew.cmu.edu/pub/mpack/mpack-%{version}-src.tar.Z
+Source0: ftp://ftp.andrew.cmu.edu/pub/mpack/mpack-%{version}.tar.gz
+Patch0: mpack.patch
# build information
Prefix: %{l_prefix}
@@ -54,23 +55,29 @@
prog mpack = {
version = %{version}
url = ftp://ftp.andrew.cmu.edu/pub/mpack/
- regex = mpack-(__VER__)-src\.tar\.Z
+ regex = mpack-(__VER__)\.tar\.gz
}
%prep
- %setup -q -n mpack
+ %setup -q
+ %patch -p0
%build
- %{l_make} %{l_mflags -O} CC="%{l_cc}" OPT="%{l_cflags -O}"
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ ./configure \
+ --prefix=%{l_prefix}
+ %{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} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/man/man1
- %{l_shtool} install -c -s -m 755 mpack $RPM_BUILD_ROOT%{l_prefix}/bin/
- %{l_shtool} install -c -s -m 755 munpack $RPM_BUILD_ROOT%{l_prefix}/bin/
- %{l_shtool} install -c -m 644 unixpk.man
$RPM_BUILD_ROOT%{l_prefix}/man/man1/mpack.1
- %{l_shtool} install -c -m 644 unixunpk.man
$RPM_BUILD_ROOT%{l_prefix}/man/man1/munpack.1
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/bin \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1
+ %{l_shtool} install -c -s -m 755 \
+ mpack munpack $RPM_BUILD_ROOT%{l_prefix}/bin/
+ %{l_shtool} install -c -m 644 \
+ mpack.1 munpack.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
%{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]
