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 openpkg-web Date: 21-Oct-2003 16:50:45
Branch: HEAD Handle: 2003102115504302
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
openpkg-web news.txt
Log:
fix RPM building on Unixware by using Linux i386 assembly specific
stuff on Linux only.
Summary:
Revision Changes Path
1.78 +1 -0 openpkg-src/openpkg/HISTORY
1.236 +1 -1 openpkg-src/openpkg/openpkg.spec
1.33 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.33 +1 -1 openpkg-src/openpkg/rpm.patch.feature
1.40 +17 -1 openpkg-src/openpkg/rpm.patch.porting
1.31 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.7097 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.77 -r1.78 HISTORY
--- openpkg-src/openpkg/HISTORY 20 Oct 2003 18:20:43 -0000 1.77
+++ openpkg-src/openpkg/HISTORY 21 Oct 2003 14:50:44 -0000 1.78
@@ -2,6 +2,7 @@
2003
====
+20031021 fix RPM GCC building on Unixware by using Linux i386 assembly specific
stuff on Linux only.
20031020 include "trigger argument passing patch" from RPM BugDB
20031020 make "rpm --setperms" and "rpm --setugids" more portable by using Bash
20031020 finish porting to SCO UnixWare 7.1.3
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.235 -r1.236 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 20 Oct 2003 18:10:37 -0000 1.235
+++ openpkg-src/openpkg/openpkg.spec 21 Oct 2003 14:50:44 -0000 1.236
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20031020
+%define V_openpkg 20031021
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.32 -r1.33 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 20 Oct 2003 18:20:43 -0000 1.32
+++ openpkg-src/openpkg/rpm.patch.bugfix 21 Oct 2003 14:50:44 -0000 1.33
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 20-Oct-2003
+## Created on: 21-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.32 -r1.33 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 20 Oct 2003 12:47:37 -0000 1.32
+++ openpkg-src/openpkg/rpm.patch.feature 21 Oct 2003 14:50:44 -0000 1.33
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 20-Oct-2003
+## Created on: 21-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.39 -r1.40 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 20 Oct 2003 12:47:37 -0000 1.39
+++ openpkg-src/openpkg/rpm.patch.porting 21 Oct 2003 14:50:44 -0000 1.40
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 20-Oct-2003
+## Created on: 21-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -1051,3 +1051,19 @@
lt_cv_deplibs_check_method=pass_all
;;
+
++---------------------------------------------------------------------------
+| Use Linux i386 assembly specific stuff on Linux only.
++---------------------------------------------------------------------------
+Index: rpmio/rpmsw.c
+--- rpmio/rpmsw.c 5 Jun 2003 12:04:05 -0000 1.1.1.1
++++ rpmio/rpmsw.c 21 Oct 2003 14:45:54 -0000
+@@ -27,7 +27,7 @@
+ /[EMAIL PROTECTED]@*/
+ static int rpmsw_initialized = 0;
+
+-#if defined(__i386__)
++#if defined(__linux__) && defined(__i386__)
+ /* Swiped from glibc-2.3.2 sysdeps/i386/i686/hp-timing.h */
+
+ #define HP_TIMING_ZERO(Var) (Var) = (0)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.30 -r1.31 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 20 Oct 2003 12:47:37 -0000 1.30
+++ openpkg-src/openpkg/rpm.patch.regen 21 Oct 2003 14:50:45 -0000 1.31
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 20-Oct-2003
+## Created on: 21-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7096 -r1.7097 news.txt
--- openpkg-web/news.txt 21 Oct 2003 14:16:08 -0000 1.7096
+++ openpkg-web/news.txt 21 Oct 2003 14:50:43 -0000 1.7097
@@ -1,3 +1,4 @@
+21-Oct-2003: Upgraded package: P<openpkg-20031021-20031021>
21-Oct-2003: Upgraded package: P<djbdns-1.05-20031021>
21-Oct-2003: Upgraded package: P<dhcp-agent-0.41-20031021>
21-Oct-2003: New package: P<tcpwrappers-7.6k-20031021>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
