rpms/ochusha/devel ochusha-0.5.99.66-cvs070110-disable-lock-check.patch, NONE, 1.1 ochusha.spec, 1.41, 1.42

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32605

Modified Files:
	ochusha.spec 
Added Files:
	ochusha-0.5.99.66-cvs070110-disable-lock-check.patch 
Log Message:
* Tue Apr 17 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.66-0.2.cvs070110
- Disable lock checking for now.


ochusha-0.5.99.66-cvs070110-disable-lock-check.patch:

--- NEW FILE ochusha-0.5.99.66-cvs070110-disable-lock-check.patch ---
--- ochusha-0.5.99.66-cvs070110/libochusha/lock.cc.orig	2007-04-17 15:30:32.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/lock.cc	2007-04-17 15:21:38.000000000 +0900
@@ -115,6 +115,7 @@
     }
 
 #ifdef CHECK_LOCK_ORDER
+#if 0
   // recursive¤Ê2²óÌܰʹߤÏOK¤Ê¤Î¤Ç¡¢1²óÌܤÎlock»þ¤Î¤ß¥Á¥§¥Ã¥¯¡£
   if (slave != NULL
       && slave->count > 0 && pthread_equal(slave->locker, pthread_self()))
@@ -123,6 +124,7 @@
       abort();
     }
 #endif
+#endif
 
   int result;
   if ((result = pthread_mutex_lock(&mutex)) == 0)
@@ -180,8 +182,10 @@
 {
   if (count < 1 || !pthread_equal(locker, pthread_self()))
     {
+#if 0
       cerr << "Couldn't unlock a Lock held by another thread!\n";
       abort();
+#endif
     }
 
   if (--count > 0)


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ochusha.spec	10 Jan 2007 18:49:48 -0000	1.41
+++ ochusha.spec	17 Apr 2007 06:36:32 -0000	1.42
@@ -4,7 +4,7 @@
 %define              main_ver        0.5.99.66
 %define              strtag          cvs070110
 
-%define              vendor_rel      1
+%define              vendor_rel      2
 %define              pre_release     1
 
 %if %{pre_release}
@@ -23,6 +23,7 @@
 %else
 Source:              http://keihanna.dl.sourceforge.jp/ochusha/16560/%{name}-%{version}.tar.bz2
 %endif
+Patch0:              ochusha-0.5.99.66-cvs070110-disable-lock-check.patch
 License:             BSD
 Group:               Applications/Internet
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@
 %else
 %setup -q
 %endif
+%patch0 -p1 -b .lock
 
 # change desktop entry to use png file at %%{icondir}.
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
@@ -155,6 +157,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
+* Tue Apr 17 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.66-0.2.cvs070110
+- Disable lock checking for now.
+
 * Wed Jan 10 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.66-0.1.cvs070110
 - cvs 070110 (19:20 JST)