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: 15-Aug-2005 18:17:36
Branch: HEAD Handle: 2005081517173501
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
Log:
fix Fedora Core 4 compile problems with a more clean and permanent
patch
Summary:
Revision Changes Path
1.288 +1 -0 openpkg-src/openpkg/HISTORY
1.443 +1 -1 openpkg-src/openpkg/openpkg.spec
1.59 +4 -4 openpkg-src/openpkg/rpm.patch.bugfix
1.62 +5 -5 openpkg-src/openpkg/rpm.patch.feature
1.68 +17 -21 openpkg-src/openpkg/rpm.patch.porting
1.58 +17 -29 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.287 -r1.288 HISTORY
--- openpkg-src/openpkg/HISTORY 12 Aug 2005 22:51:37 -0000 1.287
+++ openpkg-src/openpkg/HISTORY 15 Aug 2005 16:17:35 -0000 1.288
@@ -2,6 +2,7 @@
2005
====
+20050815 fix Fedora Core 4 compile problems with a more clean and permanent
patch
20050813 add --fallback and related options, enabling use of "foreign" dev
tools
20050812 use ls(1) as a better strip(1) replacement as both fail when a file
is missing
20050812 store l_ar, l_ld and l_strip in .buildenv, reorder rpmmacros and
introduce l_strip
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.442 -r1.443 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 13 Aug 2005 12:57:45 -0000 1.442
+++ openpkg-src/openpkg/openpkg.spec 15 Aug 2005 16:17:36 -0000 1.443
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20050813
+%define V_openpkg 20050815
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.58 -r1.59 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 8 Jun 2005 13:25:48 -0000
1.58
+++ openpkg-src/openpkg/rpm.patch.bugfix 15 Aug 2005 16:17:35 -0000
1.59
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 08-Jun-2005
+## Created on: 15-Aug-2005
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -49,7 +49,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
++++ configure.ac 15 Aug 2005 09:43:41 -0000
@@ -416,7 +417,7 @@
AC_CHECK_HEADER([beecrypt/beecrypt.h], [
AC_CHECK_LIB(beecrypt, mpfprintln, [
@@ -66,8 +66,8 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
-@@ -1274,7 +1302,6 @@
++++ configure.ac 15 Aug 2005 09:43:42 -0000
+@@ -1274,7 +1305,6 @@
python/rpmdb/Makefile
python/test/Makefile
], [ echo timestamp > popt/stamp-h.in
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.61 -r1.62 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 8 Jun 2005 13:25:48 -0000
1.61
+++ openpkg-src/openpkg/rpm.patch.feature 15 Aug 2005 16:17:36 -0000
1.62
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 08-Jun-2005
+## Created on: 15-Aug-2005
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -837,7 +837,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
++++ configure.ac 15 Aug 2005 09:44:17 -0000
@@ -53,7 +53,7 @@
AS=${AS-as}
AC_SUBST(AS)
@@ -871,7 +871,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
++++ configure.ac 15 Aug 2005 09:44:19 -0000
@@ -310,7 +311,7 @@
WITH_ZLIB_SUBDIR=
WITH_ZLIB_INCLUDE=
@@ -889,7 +889,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
++++ configure.ac 15 Aug 2005 09:44:20 -0000
@@ -324,38 +325,38 @@
localdone=
@@ -967,7 +967,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
++++ configure.ac 15 Aug 2005 09:44:22 -0000
@@ -1200,12 +1202,12 @@
AC_SUBST(LOCALEDIR)
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.67 -r1.68 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 5 Aug 2005 18:40:39 -0000
1.67
+++ openpkg-src/openpkg/rpm.patch.porting 15 Aug 2005 16:17:36 -0000
1.68
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 08-Jun-2005
+## Created on: 15-Aug-2005
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -36,7 +36,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
++++ configure.ac 15 Aug 2005 09:45:15 -0000
@@ -150,10 +151,10 @@
dnl XXX Test for libpthread.a that is NPTL aware (static link only).
dnl
@@ -59,7 +59,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
++++ configure.ac 15 Aug 2005 09:45:17 -0000
@@ -446,14 +447,17 @@
AC_CHECK_LIB(socket, socket)
])
@@ -91,7 +91,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
++++ configure.ac 15 Aug 2005 09:45:18 -0000
@@ -963,12 +967,13 @@
AC_CHECK_FUNCS(getpassphrase)
@@ -114,7 +114,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
++++ configure.ac 15 Aug 2005 09:45:19 -0000
@@ -1141,9 +1146,6 @@
dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
@@ -136,8 +136,8 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
-@@ -1249,11 +1251,37 @@
++++ configure.ac 15 Aug 2005 09:45:21 -0000
+@@ -1249,11 +1251,40 @@
AC_SUBST(OBJDUMP)
@@ -150,7 +150,10 @@
+AC_CACHE_VAL(ac_cv_type_$1,
+[AC_EGREP_CPP(dnl
+[(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]],
-+[#include <sys/types.h>
++[#if HAVE_STDINT_H
++#include <stdint.h>
++#endif
++#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
@@ -508,7 +511,7 @@
+---------------------------------------------------------------------------
Index: file/config.h.in
--- file/config.h.in 7 Mar 2003 19:39:18 -0000 1.1.1.1
-+++ file/config.h.in 6 Jun 2005 15:53:05 -0000 1.2
++++ file/config.h.in 15 Aug 2005 09:45:39 -0000
@@ -106,6 +106,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
@@ -519,7 +522,7 @@
/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
*/
#undef MAJOR_IN_MKDEV
-@@ -162,6 +165,9 @@
+@@ -162,12 +165,16 @@
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
@@ -529,22 +532,15 @@
/* Define to `long' if <sys/types.h> does not define. */
#undef off_t
-+---------------------------------------------------------------------------
-| Use private uint*_t only if not having stdint.h (unbreak file on FC4/cc)
-+---------------------------------------------------------------------------
-Index: file/config.h.in
---- file/config.h.in.orig 2005-08-04 10:21:26.000000000 +0100
-+++ file/config.h.in 2005-08-04 10:25:04.000000000 +0100
-@@ -174,6 +174,7 @@
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
-
+
+#ifndef HAVE_STDINT_H
/* uint16_t */
#undef uint16_t
-
-@@ -185,3 +186,4 @@
-
+
+@@ -179,3 +186,4 @@
+
/* uint8_t */
#undef uint8_t
+#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.57 -r1.58 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 5 Aug 2005 18:40:39 -0000
1.57
+++ openpkg-src/openpkg/rpm.patch.regen 15 Aug 2005 16:17:36 -0000
1.58
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 08-Jun-2005
+## Created on: 15-Aug-2005
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -21,7 +21,7 @@
+---------------------------------------------------------------------------
Index: config.h.in
--- config.h.in 16 Jul 2003 17:17:13 -0000 1.1.1.18
-+++ config.h.in 22 Jan 2004 21:42:06 -0000 1.17
++++ config.h.in 15 Aug 2005 09:46:31 -0000
@@ -108,6 +108,9 @@
/* Define if you have the getmntent() function */
#undef HAVE_GETMNTENT
@@ -81,10 +81,11 @@
/* Define to 1 if you have the `tsearch' function. */
#undef HAVE_TSEARCH
-@@ -586,6 +574,15 @@
+@@ -586,6 +574,17 @@
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
++#ifndef HAVE_STDINT_H
+/* uint16_t */
+#undef uint16_t
+
@@ -93,6 +94,7 @@
+
+/* uint8_t */
+#undef uint8_t
++#endif
+
/* Define to unsigned long or unsigned long long if <inttypes.h> and
<stdint.h> don't define. */
@@ -104,7 +106,7 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 6 Jun 2005 15:53:03 -0000 1.23
++++ configure 15 Aug 2005 09:46:33 -0000
@@ -467,7 +467,7 @@
# include <unistd.h>
#endif"
@@ -804,7 +806,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME"
-@@ -23588,9 +23344,193 @@
+@@ -23588,9 +23344,202 @@
@@ -820,6 +822,9 @@
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
++#if HAVE_STDINT_H
++#include <stdint.h>
++#endif
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
@@ -856,6 +861,9 @@
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
++#if HAVE_STDINT_H
++#include <stdint.h>
++#endif
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
@@ -892,6 +900,9 @@
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
++#if HAVE_STDINT_H
++#include <stdint.h>
++#endif
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
@@ -999,7 +1010,7 @@
ac_config_files="$ac_config_files Doxyfile
Makefile rpmrc macros platform rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile
lib/Makefile build/Makefile scripts/Makefile scripts/brp-redhat
scripts/macros.perl scripts/macros.php scripts/macros.python tools/Makefile
tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile misc/Makefile
intl/Makefile po/Makefile.in doc/Makefile doc/manual/Makefile doc/fr/Makefile
doc/ja/Makefile doc/ko/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
python/Makefile python/rpmdb/Makefile python/test/Makefile"
-@@ -25157,7 +25097,6 @@
+@@ -25157,7 +25106,6 @@
esac
done ;;
default ) echo timestamp > popt/stamp-h.in
@@ -1025,26 +1036,3 @@
-+---------------------------------------------------------------------------
-| Use private uint*_t only if not having stdint.h (unbreak rpmio on FC4/cc)
-+---------------------------------------------------------------------------
-Index: config.h.in
---- config.h.in.orig 2005-08-04 12:14:39.000000000 +0100
-+++ config.h.in 2005-08-04 12:37:58.000000000 +0100
-@@ -574,6 +574,7 @@
- /* Define to `unsigned' if <sys/types.h> does not define. */
- #undef size_t
-
-+#ifndef HAVE_STDINT_H
- /* uint16_t */
- #undef uint16_t
-
-@@ -582,6 +583,7 @@
-
- /* uint8_t */
- #undef uint8_t
-+#endif
-
- /* Define to unsigned long or unsigned long long if <inttypes.h> and
- <stdint.h> don't define. */
-
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
