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: 04-Sep-2007 10:16:21
Branch: HEAD Handle: 2007090409161900
Modified files:
openpkg-src/socat socat.spec
Log:
upgrading package: socat 1.6.0.0 -> 2.0.0.b1
Summary:
Revision Changes Path
1.46 +7 -13 openpkg-src/socat/socat.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/socat/socat.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 socat.spec
--- openpkg-src/socat/socat.spec 7 Jun 2007 08:09:31 -0000 1.45
+++ openpkg-src/socat/socat.spec 4 Sep 2007 08:16:19 -0000 1.46
@@ -23,8 +23,8 @@
##
# package version
-%define V_major 1.6
-%define V_minor 0.0
+%define V_major 2.0.0
+%define V_minor b1
# package information
Name: socat
@@ -37,14 +37,14 @@
Group: Network
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20070607
+Release: 20070904
# package options
%option with_readline yes
%option with_ssl yes
# list of sources
-Source0:
http://www.dest-unreach.org/socat/download/socat-%{version}.tar.bz2
+Source0:
http://www.dest-unreach.org/socat/download/socat-%{V_major}-%{V_minor}.tar.bz2
# build information
Prefix: %{l_prefix}
@@ -73,12 +73,11 @@
prog socat = {
version = %{version}
url = http://www.dest-unreach.org/socat/download/
- regex = socat-(\d+\.\d+\.\d+(?:\.\d+)?)\.tar\.bz2
+ regex = socat-(__VER__)\.tar\.bz2
}
%prep
- %setup -q
- chmod a+x install-sh
+ %setup -q -n socat-%{V_major}-%{V_minor}
%build
CC="%{l_cc} %{l_cflags -O} %{l_cppflags}" \
@@ -104,12 +103,7 @@
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1
- %{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix} \
- exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
