Package: dose2 Version: 1.4.2-3 Severity: normal Tags: patch User: [email protected] Usertags: origin-ubuntu ubuntu-patch oneiric
dose2 fails to build with rpm 4.9.0 from experimental: checking for library containing fdWritable... no configure: error: Could not find RPM library. http://www.rpm.org/wiki/Releases/4.9.0 says: Unused fdReadable() and fdWritable() functions have been removed. Since dose2 doesn't actually use fdWritable itself, it would make more sense to check for a symbol it uses. Fopen seems reasonable. * fdWritable no longer exists in RPM 4.9.0. Look for a symbol we actually use instead. diff -Nru dose2-1.4.2/debian/patches/rpm-4.9.0.patch dose2-1.4.2/debian/patches/rpm-4.9.0.patch --- dose2-1.4.2/debian/patches/rpm-4.9.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ dose2-1.4.2/debian/patches/rpm-4.9.0.patch 2011-05-20 15:57:46.000000000 +0100 @@ -0,0 +1,86 @@ +Description: fdWritable no longer exists in RPM 4.9.0 + Look for a symbol we actually use instead. +Author: Colin Watson <[email protected]> +Last-Update: 2011-05-20 + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -145,7 +145,7 @@ + AC_CHECK_HEADERS([caml/custom.h],,AC_MSG_ERROR(Could not find OCaml headers.)) + AC_CHECK_MEMBER([struct rpmlead.major],[AC_DEFINE([HAVE_RPMLEAD],[1],[Define if rpmlead exists.])]) + AC_SEARCH_LIBS([poptGetContext],[popt],,AC_MSG_ERROR(Could not find popt library.)) +-AC_SEARCH_LIBS([fdWritable],[rpmio],,AC_MSG_ERROR(Could not find RPM library.)) ++AC_SEARCH_LIBS([Fopen],[rpmio],,AC_MSG_ERROR(Could not find RPM library.)) + AC_SEARCH_LIBS([rpmdbOpen],[rpmdb],,,[-lrpm],,AC_MSG_ERROR(Could not find RPM library.)) + AC_SEARCH_LIBS([rpmVerifyFile],[rpm],,AC_MSG_ERROR(Could not find RPM library.)) + +Index: b/configure +=================================================================== +--- a/configure ++++ b/configure +@@ -5315,9 +5315,9 @@ + { (exit 1); exit 1; }; } + fi + +-{ $as_echo "$as_me:$LINENO: checking for library containing fdWritable" >&5 +-$as_echo_n "checking for library containing fdWritable... " >&6; } +-if test "${ac_cv_search_fdWritable+set}" = set; then ++{ $as_echo "$as_me:$LINENO: checking for library containing Fopen" >&5 ++$as_echo_n "checking for library containing Fopen... " >&6; } ++if test "${ac_cv_search_Fopen+set}" = set; then + $as_echo_n "(cached) " >&6 + else + ac_func_search_save_LIBS=$LIBS +@@ -5334,11 +5334,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char fdWritable (); ++char Fopen (); + int + main () + { +-return fdWritable (); ++return Fopen (); + ; + return 0; + } +@@ -5371,7 +5371,7 @@ + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then +- ac_cv_search_fdWritable=$ac_res ++ ac_cv_search_Fopen=$ac_res + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -5382,21 +5382,21 @@ + rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext +- if test "${ac_cv_search_fdWritable+set}" = set; then ++ if test "${ac_cv_search_Fopen+set}" = set; then + break + fi + done +-if test "${ac_cv_search_fdWritable+set}" = set; then ++if test "${ac_cv_search_Fopen+set}" = set; then + : + else +- ac_cv_search_fdWritable=no ++ ac_cv_search_Fopen=no + fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_fdWritable" >&5 +-$as_echo "$ac_cv_search_fdWritable" >&6; } +-ac_res=$ac_cv_search_fdWritable ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_Fopen" >&5 ++$as_echo "$ac_cv_search_Fopen" >&6; } ++ac_res=$ac_cv_search_Fopen + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + diff -Nru dose2-1.4.2/debian/patches/series dose2-1.4.2/debian/patches/series --- dose2-1.4.2/debian/patches/series 2011-02-10 20:47:56.000000000 +0000 +++ dose2-1.4.2/debian/patches/series 2011-05-20 15:55:45.000000000 +0100 @@ -1 +1,2 @@ debian-changes-1.4.2-3 +rpm-4.9.0.patch Thanks, -- Colin Watson [[email protected]] -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
