commit 0c69cae6fbf40b8aa44f034d37b3ade850003fc3
Author: Jan Rękorajski <[email protected]>
Date: Wed Nov 21 13:56:10 2012 +0100
- updated to 3.3.2
- removed obsolete patches
amanda-glib2.24.patch | 47 -----------------------------------------------
amanda-glib2.32.patch | 43 -------------------------------------------
amanda.spec | 6 ++----
3 files changed, 2 insertions(+), 94 deletions(-)
---
diff --git a/amanda.spec b/amanda.spec
index d7aa1db..f1db31d 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -9,12 +9,12 @@
Summary: A network-capable tape backup solution
Summary(pl.UTF-8): Sieciowo zorientowany system tworzenia kopii zapasowych
Name: amanda
-Version: 3.3.1
+Version: 3.3.2
Release: 0.1
License: BSD
Group: Networking/Utilities
Source0:
http://downloads.sourceforge.net/amanda/%{name}-%{version}.tar.gz
-# Source0-md5: dae7631b4abcf7eac874df6e3740e75b
+# Source0-md5: 1a6cfe47eaee121f22540ac5fa58c366
Source1: %{name}-srv.crontab
Source2: %{name}.inetd
Source3: %{name}idx.inetd
@@ -39,7 +39,6 @@ Patch8: %{name}-heimdal.patch
Patch9: %{name}-ac.patch
Patch11: %{name}-amstar-exclude-fix.patch
Patch12: %{name}-krb5-auth.patch
-Patch13: %{name}-glib2.32.patch
Patch14: %{name}-amstar-device.patch
URL: http://www.amanda.org/
BuildRequires: autoconf >= 2.53
@@ -212,7 +211,6 @@ typu streamer).
%patch9 -p1
%patch11 -p1
%patch12 -p1
-%patch13 -p1
%patch14 -p1
cp -a %{SOURCE10} .
diff --git a/amanda-glib2.24.patch b/amanda-glib2.24.patch
deleted file mode 100644
index 4329c53..0000000
--- a/amanda-glib2.24.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- amanda/trunk/common-src/glib-util.c 2009/10/16 22:06:51 2182
-+++ amanda/trunk/common-src/glib-util.c 2010/05/03 21:42:31 2982
-@@ -38,26 +38,15 @@
- if (did_glib_init) return;
- did_glib_init = TRUE;
-
-- /* Initialize glib's type system */
-- g_type_init();
--
- /* set up libcurl (this must happen before threading
- * is initialized) */
- #ifdef HAVE_LIBCURL
- # ifdef G_THREADS_ENABLED
-- g_assert(!g_thread_supported());
-+ g_assert(!g_thread_supported()); /* assert threads aren't initialized yet
*/
- # endif
- g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
- #endif
-
-- /* And set up glib's threads */
--#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)
-- if (g_thread_supported()) {
-- return;
-- }
-- g_thread_init(NULL);
--#endif
--
- /* do a version check */
- #if GLIB_CHECK_VERSION(2,6,0)
- {
-@@ -71,6 +60,16 @@
- }
- }
- #endif
-+
-+ /* Initialize glib's type system. On glib >= 2.24, this will initialize
-+ * threads, so it must be done after curl is initialized. */
-+ g_type_init();
-+
-+ /* And set up glib's threads */
-+#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)
-+ if (!g_thread_supported())
-+ g_thread_init(NULL);
-+#endif
- }
-
- typedef enum {
diff --git a/amanda-glib2.32.patch b/amanda-glib2.32.patch
deleted file mode 100644
index 5b9114b..0000000
--- a/amanda-glib2.32.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- amanda-3.2.3/common-src/glib-util.c~ 2010-12-08 23:09:29.000000000
+0100
-+++ amanda-3.2.3/common-src/glib-util.c 2012-04-03 12:02:32.801046078
+0200
-@@ -120,6 +120,7 @@
- }
- #endif
-
-+#if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION
< 32))
- void g_queue_free_full(GQueue * queue) {
- while (!g_queue_is_empty(queue)) {
- gpointer data;
-@@ -128,6 +129,7 @@
- }
- g_queue_free(queue);
- }
-+#endif
-
- void g_ptr_array_free_full(GPtrArray * array) {
- size_t i;
---- amanda-3.2.3/common-src/glib-util.h~ 2010-12-08 23:09:29.000000000
+0100
-+++ amanda-3.2.3/common-src/glib-util.h 2012-04-03 12:03:14.514381294
+0200
-@@ -72,7 +72,9 @@
-
- /* These functions all take a GLib container, and call free() on all the
- * pointers in the container before free()ing the container itself. */
-+#if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION
< 32))
- void g_queue_free_full(GQueue * queue);
-+#endif
- void g_ptr_array_free_full(GPtrArray * array);
-
- /* g_value_compare() does what you expect. It returns TRUE if and
---- amanda-3.2.3.old/common-src/glib-util.c 2012/03/10 13:43:52
-+++ amanda-3.2.3/common-src/glib-util.c 2012/05/07 17:25:35
-@@ -42,7 +42,9 @@
- * is initialized) */
- #ifdef HAVE_LIBCURL
- # ifdef G_THREADS_ENABLED
-+# if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 &&
GLIB_MINOR_VERSION < 32))
- g_assert(!g_thread_supported()); /* assert threads aren't initialized yet
*/
-+# endif
- # endif
- g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
- #endif
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/amanda.git/commitdiff/0c69cae6fbf40b8aa44f034d37b3ade850003fc3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
