comparison: openpkg/rpm.patch.feature
openpkg/rpm.patch.feature
- changeset 333
- 4ecfc2416fd8
- parent 13
- cb59d6afeb61
- child 336
- fa72b60f59c9
equal
deleted
inserted
replaced
| 0:e05333ca95eb | 1:f946d51b208b |
|---|---|
| 966 | Adjust paths for OpenPKG filesystem layout. | 966 | Adjust paths for OpenPKG filesystem layout. |
| 967 +--------------------------------------------------------------------------- | 967 +--------------------------------------------------------------------------- |
| 968 Index: configure.ac | 968 Index: configure.ac |
| 969 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4 | 969 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4 |
| 970 +++ configure.ac 13 Sep 2006 13:39:12 -0000 | 970 +++ configure.ac 13 Sep 2006 13:39:12 -0000 |
| 971 @@ -1200,12 +1202,12 @@ | 971 @@ -1200,12 +1201,12 @@ |
| 972 AC_SUBST(LOCALEDIR) | 972 AC_SUBST(LOCALEDIR) |
| 973 LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`" | 973 LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`" |
| 974 AC_SUBST(LIBDIR) | 974 AC_SUBST(LIBDIR) |
| 975 -RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" | 975 -RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" |
| 976 +RPMCONFIGDIR="@l_prefix@/lib/openpkg" | 976 +RPMCONFIGDIR="@l_prefix@/lib/openpkg" |
| 981 -SYSCONFIGDIR="`echo /etc/rpm`" | 981 -SYSCONFIGDIR="`echo /etc/rpm`" |
| 982 +SYSCONFIGDIR="@l_prefix@/etc/openpkg" | 982 +SYSCONFIGDIR="@l_prefix@/etc/openpkg" |
| 983 AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR", | 983 AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR", |
| 984 [Full path to rpm system configuration directory (usually /etc/rpm)]) | 984 [Full path to rpm system configuration directory (usually /etc/rpm)]) |
| 985 AC_SUBST(SYSCONFIGDIR) | 985 AC_SUBST(SYSCONFIGDIR) |
| 986 @@ -1215,17 +1217,17 @@ | 986 @@ -1215,17 +1216,17 @@ |
| 987 [Colon separated paths of macro files to read.]) | 987 [Colon separated paths of macro files to read.]) |
| 988 AC_SUBST(MACROFILES) | 988 AC_SUBST(MACROFILES) |
| 989 | 989 |
| 990 -LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc" | 990 -LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc" |
| 991 +LIBRPMRC_FILENAME="${SYSCONFIGDIR}/rpmrc" | 991 +LIBRPMRC_FILENAME="${SYSCONFIGDIR}/rpmrc" |
| 1558 | "unzip" out of the bootstrap package. | 1558 | "unzip" out of the bootstrap package. |
| 1559 +--------------------------------------------------------------------------- | 1559 +--------------------------------------------------------------------------- |
| 1560 Index: rpmio/macro.c | 1560 Index: rpmio/macro.c |
| 1561 --- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7 | 1561 --- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7 |
| 1562 +++ rpmio/macro.c 22 Jan 2004 21:42:32 -0000 1.2 | 1562 +++ rpmio/macro.c 22 Jan 2004 21:42:32 -0000 1.2 |
| 1563 @@ -1114,9 +1119,11 @@ | 1563 @@ -1116,9 +1119,11 @@ |
| 1564 case 2: /* COMPRESSED_BZIP2 */ | 1564 case 2: /* COMPRESSED_BZIP2 */ |
| 1565 sprintf(be, "%%_bzip2 %s", b); | 1565 sprintf(be, "%%_bzip2 %s", b); |
| 1566 break; | 1566 break; |
| 1567 +#if 0 | 1567 +#if 0 |
| 1568 case 3: /* COMPRESSED_ZIP */ | 1568 case 3: /* COMPRESSED_ZIP */ |
| 1570 break; | 1570 break; |
| 1571 +#endif | 1571 +#endif |
| 1572 } | 1572 } |
| 1573 b = be; | 1573 b = be; |
| 1574 } else if (STREQ("S", f, fn)) { | 1574 } else if (STREQ("S", f, fn)) { |
| 1575 @@ -1717,9 +1725,11 @@ | 1575 @@ -1720,9 +1725,11 @@ |
| 1576 | 1576 |
| 1577 if ((magic[0] == 'B') && (magic[1] == 'Z')) { | 1577 if ((magic[0] == 'B') && (magic[1] == 'Z')) { |
| 1578 *compressed = COMPRESSED_BZIP2; | 1578 *compressed = COMPRESSED_BZIP2; |
| 1579 +#if 0 | 1579 +#if 0 |
| 1580 } else if ((magic[0] == 0120) && (magic[1] == 0113) && | 1580 } else if ((magic[0] == 0120) && (magic[1] == 0113) && |
| 1590 | processing. Else it would be nothing more than a %{warn:<msg>}. | 1590 | processing. Else it would be nothing more than a %{warn:<msg>}. |
| 1591 +--------------------------------------------------------------------------- | 1591 +--------------------------------------------------------------------------- |
| 1592 Index: rpmio/macro.c | 1592 Index: rpmio/macro.c |
| 1593 --- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7 | 1593 --- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7 |
| 1594 +++ rpmio/macro.c 22 Jan 2004 21:42:32 -0000 1.2 | 1594 +++ rpmio/macro.c 22 Jan 2004 21:42:32 -0000 1.2 |
| 1595 @@ -1329,7 +1337,7 @@ | 1595 @@ -1332,7 +1337,7 @@ |
| 1596 STREQ("error", f, fn)) { | 1596 STREQ("error", f, fn)) { |
| 1597 int waserror = 0; | 1597 int waserror = 0; |
| 1598 if (STREQ("error", f, fn)) | 1598 if (STREQ("error", f, fn)) |
| 1599 - waserror = 1; | 1599 - waserror = 1; |
| 1600 + waserror = 1, rc = 1; | 1600 + waserror = 1, rc = 1; |
