diff --git a/amanda-2.6.1p2-ftbfs.patch b/amanda-2.6.1p2-ftbfs.patch new file mode 100644 index 0000000..433ee97 --- /dev/null +++ b/amanda-2.6.1p2-ftbfs.patch @@ -0,0 +1,12 @@ +diff -up amanda-2.6.1p2/common-src/glib-util.c.ftbfs amanda-2.6.1p2/common-src/glib-util.c +--- amanda-2.6.1p2/common-src/glib-util.c.ftbfs 2010-02-16 13:06:25.000000000 +0100 ++++ amanda-2.6.1p2/common-src/glib-util.c 2010-02-16 13:06:52.000000000 +0100 +@@ -45,7 +45,7 @@ glib_init(void) { + * is initialized) */ + #ifdef HAVE_LIBCURL + # ifdef G_THREADS_ENABLED +- g_assert(!g_thread_supported()); ++/* g_assert(!g_thread_supported()); */ + # endif + g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0); + #endif diff --git a/amanda.spec b/amanda.spec index c2176df..e916435 100644 --- a/amanda.spec +++ b/amanda.spec @@ -7,7 +7,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 2.6.1p2 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz #Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%{version}.tar.gz Source1: amanda.crontab @@ -20,6 +20,7 @@ Patch2: amanda-2.6.1p2-xattrs.patch Patch3: amanda-2.6.0p2-tcpport.patch Patch4: amanda-2.6.0b3-lib.patch Patch5: amanda-2.6.0p2-pie.patch +Patch6: amanda-2.6.1p2-ftbfs.patch License: BSD Group: Applications/System URL: http://www.amanda.org @@ -94,6 +95,7 @@ be used to develop amanda applications. %patch3 -p1 -b .tcpport %patch4 -p1 -b .lib #%%patch5 -p1 -b .pie +%patch6 -p1 -b .ftbfs ./autogen %build @@ -406,6 +408,9 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %{_libdir}/libamxfer.so %changelog +* Tue Feb 16 2010 Daniel Novotny 2.6.1p2-2 +- fix #564935 - FTBFS amanda-2.6.1p2-1.fc13 + * Thu Jan 21 2010 Daniel Novotny 2.6.1p2-1 - upgrade to 2.6.1p2, drop upstreamed patches, rebase remaining patches