rpms/nntpgrab/F-10 nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch, NONE, 1.1 nntpgrab_0_4_90_fix_removing_collections.patch, NONE, 1.1 nntpgrab.spec, 1.30, 1.31

[Erik van Pienbroek]

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8102/F-10

Modified Files:
	nntpgrab.spec 
Added Files:
	nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch 
	nntpgrab_0_4_90_fix_removing_collections.patch 
Log Message:
- Added a patch to prevent a possible deadlock (upstream SVN rev #1264)
- Added a patch to fix the removal of collections (upstream SVN rev #1260)
- Added BR: gail-devel for F9 (RHBZ #491785)


nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch:

--- NEW FILE nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch ---
--- trunk/plugins/unpack/plugin_unpack.c	2009/04/10 19:26:25	1263
+++ trunk/plugins/unpack/plugin_unpack.c	2009/04/12 18:17:58	1264
@@ -137,7 +137,7 @@
         g_idle_add(do_start_unpack, unpack_data);
     }
 
-    if (action == FR_ACTION_EXTRACTING_FILES) {
+    if (action == FR_ACTION_EXTRACTING_FILES || unpack_data->error_occured) {
         on_progress(archive, 1.0, unpack_data);
 
         /* Send a signal to the unpack thread that we're done */

nntpgrab_0_4_90_fix_removing_collections.patch:

--- NEW FILE nntpgrab_0_4_90_fix_removing_collections.patch ---
--- trunk/plugins/schedular/schedular.c	2009/03/21 15:03:04	1259
+++ trunk/plugins/schedular/schedular.c	2009/04/04 18:44:29	1260
@@ -1060,6 +1060,7 @@
                     // Remove the entry from the database
                     if (!remove_file_from_database(collection, file, delete_flag, errmsg)) {
                         g_static_mutex_unlock(&schedular->mutex);
+                        db_close();
                         return FALSE;
                     }
 
@@ -1098,6 +1099,11 @@
                         imported_funcs_collection_unref(collection);
 
                         g_static_mutex_unlock(&schedular->mutex);
+
+                        if (!db_end_transaction(errmsg)) {
+                            return FALSE;
+                        }
+
                         db_close();
                         return TRUE;
                     }


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-10/nntpgrab.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nntpgrab.spec	21 Mar 2009 15:12:55 -0000	1.30
+++ nntpgrab.spec	13 Apr 2009 10:57:25 -0000	1.31
@@ -1,13 +1,15 @@
 Summary: Download files from the usenet
 Name: nntpgrab
 Version: 0.4.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
 Source1: nntpgrab_php.ini
 Source2: nntpgrab_apache.conf
 Patch0:  nntpgrab_0_4_90_load_correct_library.patch
+Patch1:  nntpgrab_0_4_90_fix_removing_collections.patch
+Patch2:  nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://www.nntpgrab.nl
@@ -35,6 +37,9 @@
 BuildRequires:	nss-devel
 BuildRequires:	nss_compat_ossl-devel
 BuildRequires:	PolicyKit-gnome-devel
+%if 0%{fedora} == 9
+BuildRequires:	gail-devel
+%endif
 
 %description
 With this program it is possible to download files from the usenet
@@ -131,6 +136,12 @@
 # Patch is already applied in upstream SVN rev #1259
 %patch0 -p0
 
+# Patch is already applied in upstream SVN rev #1260
+%patch1 -p1
+
+# Patch is already applied in upstream SVN rev #1264
+%patch2 -p1
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -276,6 +287,11 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Mon Apr 13 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.90-3
+- Added a patch to prevent a possible deadlock (upstream SVN rev #1264)
+- Added a patch to fix the removal of collections (upstream SVN rev #1260)
+- Added BR: gail-devel for F9 (RHBZ #491785)
+
 * Sat Mar 21 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.90-2
 - The program wouldn't start unless the -devel package was installed. Fixed