rpms/rekall/devel .cvsignore, 1.4, 1.5 rekall-2.4.0-64bitfix.patch, 1.2, 1.3 rekall-2.4.0-gcc4.patch, 1.1, 1.2 rekall-2.4.0-noldconfig.patch, 1.1, 1.2 rekall.spec, 1.13, 1.14 sources, 1.4, 1.5

Tom Callaway (spot) fedora-extras-commits at redhat.com
Fri Sep 15 20:05:08 UTC 2006 

Author: spot

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

Modified Files:
	.cvsignore rekall-2.4.0-64bitfix.patch rekall-2.4.0-gcc4.patch 
	rekall-2.4.0-noldconfig.patch rekall.spec sources 
Log Message:

Fix patches, new source, new tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Jan 2006 06:17:13 -0000	1.4
+++ .cvsignore	15 Sep 2006 20:05:08 -0000	1.5
@@ -1,3 +1,4 @@
 rekall-2.2.3-2.tar.gz
 rekall-2.2.4-2.tar.gz
 rekall-2.4.0.tar.gz
+rekall-2.4.3.tar.gz

rekall-2.4.0-64bitfix.patch:

Index: rekall-2.4.0-64bitfix.patch
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.4.0-64bitfix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rekall-2.4.0-64bitfix.patch	2 Mar 2006 18:34:39 -0000	1.2
+++ rekall-2.4.0-64bitfix.patch	15 Sep 2006 20:05:08 -0000	1.3
@@ -1,6 +1,6 @@
---- rekall-2.2.3/libs/el32/hash.cpp.BAD	2005-09-22 13:34:45.000000000 -0500
-+++ rekall-2.2.3/libs/el32/hash.cpp	2005-09-22 13:34:53.000000000 -0500
-@@ -141,7 +141,7 @@
+--- rekall-2.4.3/libs/el32/hash.cpp.orig	2005-02-21 15:10:25.000000000 -0600
++++ rekall-2.4.3/libs/el32/hash.cpp	2006-09-15 14:43:49.000000000 -0500
+@@ -145,7 +145,7 @@
  			/* otherwise use just the tag (pretty useless	*/
  			/* but so what, not a common case).		*/
  			if ((key.tag->flags & TF_SHARED) == 0)
@@ -9,54 +9,25 @@
  			else	hval	= key.tag->tag ;
  			break	;
  	}
---- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD	2005-09-22 14:29:36.000000000 -0500
-+++ rekall-2.2.4/libs/kbase/kb_parse.cpp	2005-09-22 14:29:52.000000000 -0500
-@@ -971,7 +971,7 @@
- 			receiver,
- 			SLOT (newNode(int)),
- 			0,
--			(int)nsItem
-+			(long)nsItem
- 		)	;
- 
- 		sep	= true	;
-@@ -1025,7 +1025,7 @@
- 			receiver,
- 			SLOT (newNode(int)),
- 			0,
--			(int)nsItem
-+			(long)nsItem
- 		)	;
- 	}
- 
-@@ -1043,7 +1043,7 @@
- 				receiver,
- 				SLOT (newNode(int)),
- 				0,
--				(int)exItem
-+				(long)exItem
- 			)	;
- 		)
- 
---- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD	2005-09-22 15:53:11.000000000 -0500
-+++ rekall-2.2.4/libs/kbase/kb_link.cpp	2005-09-22 15:53:53.000000000 -0500
-@@ -849,21 +849,21 @@
+--- rekall-2.4.3/libs/kbase/kb_tree.cpp.orig	2006-03-14 12:01:59.000000000 -0600
++++ rekall-2.4.3/libs/kbase/kb_tree.cpp	2006-09-15 14:43:49.000000000 -0500
+@@ -430,21 +430,21 @@
  		receiver,
  		SLOT(newNode(int)),
  		0,
 -		(int)&nodeSpecTable
 +		(long)&nodeSpecTable
  	)	;
- 	lp->insertItem
- 	(	TR("Query link"),
+ 	tp->insertItem
+ 	(	TR("Query tree"),
  		receiver,
  		SLOT(newNode(int)),
  		0,
 -		(int)&nodeSpecQuery
 +		(long)&nodeSpecQuery
  	)	;
- 	lp->insertItem
- 	(	TR("SQL link"  ),
+ 	tp->insertItem
+ 	(	TR("SQL tree"  ),
  		receiver,
  		SLOT(newNode(int)),
  		0,
@@ -64,52 +35,30 @@
 +		(long)&nodeSpecSQL
  	) 	;
  
- 	popup->insertItem (TR("New &Link"), lp) ;
---- rekall-2.4.0/libs/kbase/kb_overridedlg.cpp.BAD	2006-01-10 10:37:02.000000000 -0600
-+++ rekall-2.4.0/libs/kbase/kb_overridedlg.cpp	2006-01-10 10:37:22.000000000 -0600
-@@ -360,7 +360,7 @@
- 	old.clear () ;
- 
- 	QListViewItem	*item	= m_lvOverride->firstChild() ;
--	uint		ident	= 0x000ffffff & (uint)(void *)item ;
-+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
- 
- 	while (item != 0)
- 	{
---- rekall-2.4.0/libs/kbase/kb_configdlg.cpp.BAD	2006-01-10 10:37:46.000000000 -0600
-+++ rekall-2.4.0/libs/kbase/kb_configdlg.cpp	2006-01-10 10:37:59.000000000 -0600
-@@ -312,7 +312,7 @@
- 	old.clear () ;
- 
- 	QListViewItem	*item	= m_lvConfigs->firstChild() ;
--	uint		ident	= 0x000ffffff & (uint)(void *)item ;
-+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
- 
- 	while (item != 0)
- 	{
---- rekall-2.4.0/script/python/tkc_pydebugbase.cpp.BAD	2006-01-10 10:38:42.000000000 -0600
-+++ rekall-2.4.0/script/python/tkc_pydebugbase.cpp	2006-01-10 10:39:07.000000000 -0600
-@@ -553,7 +553,7 @@
- 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
- 		if (findTracePoint (pyObj, lineNo) == 0)
- 		{
--			fprintf	(stderr, "Set trace: %08x:%d\n", (uint)pyObj, lineNo) ;
-+			fprintf	(stderr, "Set trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
- 			tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ;
- 			enable	() ;
- 		}
-@@ -576,7 +576,7 @@
- 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
- 		if ((tp = findTracePoint (pyObj, lineNo)) != 0)
- 		{
--			fprintf	(stderr, "Rem trace: %08x:%d\n", (uint)pyObj, lineNo) ;
-+			fprintf	(stderr, "Rem trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
- 			tracePoints.remove (tp) ;
- 			delete	tp ;
- 			disable	() ;
---- rekall-2.4.0/libs/kbase/kb_object_full.cpp.BAD	2006-03-02 10:22:13.000000000 -0600
-+++ rekall-2.4.0/libs/kbase/kb_object_full.cpp	2006-03-02 10:22:26.000000000 -0600
-@@ -194,11 +194,11 @@
+ 	*dflt	= &nodeSpecTable ;
+--- rekall-2.4.3/libs/kbase/kb_stack.cpp.orig	2006-03-14 12:01:59.000000000 -0600
++++ rekall-2.4.3/libs/kbase/kb_stack.cpp	2006-09-15 14:46:15.000000000 -0500
+@@ -440,7 +440,7 @@
+ 				this,
+ 				SLOT	(setCurrentPage(int)),
+ 				0,
+-				(int)p
++				(long)p
+ 			)	;
+ 		else
+ 			raiser->insertItem
+@@ -448,7 +448,7 @@
+ 				this,
+ 				SLOT	(setCurrentPage(int)),
+ 				0,
+-				(int)p
++				(long)p
+ 			)	;
+ 
+ 	)
+--- rekall-2.4.3/libs/kbase/kb_object_full.cpp.orig	2006-01-13 11:49:05.000000000 -0600
++++ rekall-2.4.3/libs/kbase/kb_object_full.cpp	2006-09-15 14:43:49.000000000 -0500
+@@ -196,11 +196,11 @@
  		}
  
  		/* Not a special case, call the ::newNode with the	*/
@@ -123,25 +72,54 @@
  		return	true ;
  	}
  
---- rekall-2.4.0/libs/kbase/kb_tree.cpp.BAD	2006-03-02 10:46:41.000000000 -0600
-+++ rekall-2.4.0/libs/kbase/kb_tree.cpp	2006-03-02 10:46:54.000000000 -0600
-@@ -365,21 +365,21 @@
+--- rekall-2.4.3/libs/kbase/kb_parse.cpp.orig	2006-03-14 12:01:58.000000000 -0600
++++ rekall-2.4.3/libs/kbase/kb_parse.cpp	2006-09-15 14:43:49.000000000 -0500
+@@ -978,7 +978,7 @@
+ 			receiver,
+ 			SLOT (newNode(int)),
+ 			0,
+-			(int)nsItem
++			(long)nsItem
+ 		)	;
+ 
+ 		sep	= true	;
+@@ -1034,7 +1034,7 @@
+ 			receiver,
+ 			SLOT (newNode(int)),
+ 			0,
+-			(int)nsItem
++			(long)nsItem
+ 		)	;
+ 	}
+ 
+@@ -1052,7 +1052,7 @@
+ 				receiver,
+ 				SLOT (newNode(int)),
+ 				0,
+-				(int)exItem
++				(long)exItem
+ 			)	;
+ 		)
+ 
+--- rekall-2.4.3/libs/kbase/kb_link.cpp.orig	2006-03-14 22:16:22.000000000 -0600
++++ rekall-2.4.3/libs/kbase/kb_link.cpp	2006-09-15 14:43:49.000000000 -0500
+@@ -475,21 +475,21 @@
  		receiver,
  		SLOT(newNode(int)),
  		0,
 -		(int)&nodeSpecTable
 +		(long)&nodeSpecTable
  	)	;
- 	tp->insertItem
- 	(	TR("Query tree"),
+ 	lp->insertItem
+ 	(	TR("Query link"),
  		receiver,
  		SLOT(newNode(int)),
  		0,
 -		(int)&nodeSpecQuery
 +		(long)&nodeSpecQuery
  	)	;
- 	tp->insertItem
- 	(	TR("SQL tree"  ),
+ 	lp->insertItem
+ 	(	TR("SQL link"  ),
  		receiver,
  		SLOT(newNode(int)),
  		0,
@@ -150,14 +128,23 @@
  	) 	;
  
  	*dflt	= &nodeSpecTable ;
---- rekall-2.4.0/libs/kbase/kb_stack.cpp.BAD	2006-03-02 11:10:53.000000000 -0600
-+++ rekall-2.4.0/libs/kbase/kb_stack.cpp	2006-03-02 11:10:57.000000000 -0600
-@@ -431,7 +431,7 @@
- 			this,
- 			SLOT	(setCurrentPage(int)),
- 			0,
--			(int)p
-+			(long)p
- 		)	;
- 
- 	)
+--- rekall-2.4.3/script/python/tkc_pydebugbase.cpp.orig	2005-12-26 15:11:10.000000000 -0600
++++ rekall-2.4.3/script/python/tkc_pydebugbase.cpp	2006-09-15 14:47:11.000000000 -0500
+@@ -569,7 +569,7 @@
+ 		{
+ 			DPRINTF
+ 			((	"TKCPyDebugBase::setTracePoint: %08x:%d\n",
+-				(uint)pyObj,
++				(unsigned long)pyObj,
+ 				lineNo
+ 			))	;
+ 			tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ;
+@@ -596,7 +596,7 @@
+ 		{
+ 			DPRINTF
+ 			((	"TKCPyDebugBase::clearTracePoint: %08x:%d\n",
+-				(uint)pyObj,
++				(unsigned long)pyObj,
+ 				lineNo
+ 			))	;
+ 			tracePoints.remove (tp) ;

rekall-2.4.0-gcc4.patch:

Index: rekall-2.4.0-gcc4.patch
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.4.0-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rekall-2.4.0-gcc4.patch	12 Jan 2006 06:17:13 -0000	1.1
+++ rekall-2.4.0-gcc4.patch	15 Sep 2006 20:05:08 -0000	1.2
@@ -9,3 +9,14 @@
  
     virtual void GetExpression(char *buf, int len);
  };
+--- rekall-2.4.3/support/dbtcp/dbug.c.BAD	2006-09-15 14:56:06.000000000 -0500
++++ rekall-2.4.3/support/dbtcp/dbug.c	2006-09-15 14:56:16.000000000 -0500
+@@ -203,7 +203,7 @@
+ IMPORT int fclose ();		/* Close a stream */
+ IMPORT FILE *fopen ();		/* Open a stream */
+ /*IMPORT int fprintf ();		Formatted print on file */
+-IMPORT int vfprintf ();		/* Varargs form of fprintf */
++/*IMPORT int vfprintf ();		Varargs form of fprintf */
+ IMPORT VOID free ();
+ IMPORT char *malloc ();		/* Allocate memory */
+ IMPORT int strlen ();

rekall-2.4.0-noldconfig.patch:

Index: rekall-2.4.0-noldconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.4.0-noldconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rekall-2.4.0-noldconfig.patch	12 Jan 2006 06:17:13 -0000	1.1
+++ rekall-2.4.0-noldconfig.patch	15 Sep 2006 20:05:08 -0000	1.2
@@ -1,14 +1,14 @@
---- rekall-2.4.0/scons/Makefile.BAD	2006-01-10 15:25:03.000000000 -0600
-+++ rekall-2.4.0/scons/Makefile	2006-01-10 15:25:13.000000000 -0600
-@@ -3,11 +3,9 @@
+--- rekall-2.4.3/scons/Makefile.orig	2006-01-19 06:31:07.000000000 -0600
++++ rekall-2.4.3/scons/Makefile	2006-09-15 14:49:05.000000000 -0500
+@@ -11,11 +11,9 @@
  
- install:
- 		PYTHONPATH=scons/ scons -Q install
+ install.kde:
+ 		REKALL_MODE=kde PYTHONPATH=scons/ scons -Q install
 -		[ `id -u` = 0 ] && ldconfig
  
- inst:
- 		PYTHONPATH=scons/ scons -Q install
+ install.qt3:
+ 		REKALL_MODE=qt3 PYTHONPATH=scons/ scons -Q install
 -		[ `id -u` = 0 ] && ldconfig
  
- clean:
- 		PYTHONPATH=scons/ scons -Q --clean
+ install.mac:
+ 		REKALL_MODE=mac PYTHONPATH=scons/ scons -Q install


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rekall.spec	15 Sep 2006 19:30:25 -0000	1.13
+++ rekall.spec	15 Sep 2006 20:05:08 -0000	1.14
@@ -1,7 +1,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
@@ -100,7 +100,7 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+# %patch3 -p1
 %patch4 -p1
 %ifarch sparc64 alpha x86_64 ia64
 %patch5 -p1
@@ -117,15 +117,15 @@
 echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3
 echo "with-qt-includes=%{_libdir}/qt-3.3/include" >> scons/settings.qt3
 echo "with-qt-libraries=%{_libdir}/qt-3.3/lib" >> scons/settings.qt3
-cp scons/settings.qt3 settings
+cp scons/settings.qt3 settings.qt3
 cp scons/Makefile .
 
-make config
-make
+make config.qt3
+make qt3
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install.qt3
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mv $RPM_BUILD_ROOT%{_datadir}/doc/HTML $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -318,6 +318,9 @@
 %{_libdir}/librekallqtrt_tableview.so
 
 %changelog
+* Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.3-3
+- actually upload new source
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.3-2
 - bump for fc6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Jan 2006 06:17:13 -0000	1.4
+++ sources	15 Sep 2006 20:05:08 -0000	1.5
@@ -1 +1 @@
-0d90d4bbe3e470b0764b10e8c9b81559  rekall-2.4.0.tar.gz
+d72ab22d40f1556027c473eed9783297  rekall-2.4.3.tar.gz

More information about the fedora-extras-commits mailing list