rpms/rekall/FC-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-lib64.patch, 1.1, 1.2 rekall-2.4.0-noldconfig.patch, 1.1, 1.2 rekall.spec, 1.12, 1.13 sources, 1.4, 1.5

Tom Callaway (spot) fedora-extras-commits at redhat.com
Mon Sep 18 13:45:39 UTC 2006


Author: spot

Update of /cvs/extras/rpms/rekall/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28164/FC-5

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

OK. Rekall is working again.


rekall-2.4.0-64bitfix.patch:

Index: rekall-2.4.0-64bitfix.patch
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-5/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	18 Sep 2006 13:45:39 -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,9 +9,72 @@
  			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 @@
+--- 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
+ 	)	;
+ 	tp->insertItem
+ 	(	TR("Query tree"),
+ 		receiver,
+ 		SLOT(newNode(int)),
+ 		0,
+-		(int)&nodeSpecQuery
++		(long)&nodeSpecQuery
+ 	)	;
+ 	tp->insertItem
+ 	(	TR("SQL tree"  ),
+ 		receiver,
+ 		SLOT(newNode(int)),
+ 		0,
+-		(int)&nodeSpecSQL
++		(long)&nodeSpecSQL
+ 	) 	;
+ 
+ 	*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	*/
+-		/* specification. The (int) cast is is there because	*/
++		/* specification. The (long) cast is is there because	*/
+ 		/* ::newNode is a slot which the popup menu system	*/
+ 		/* invokes, whence the arguement is really a NodeSpec	*/
+ 		/* structure.						*/
+-		newNode ((int)spec) ;
++		newNode ((long)spec) ;
+ 		return	true ;
+ 	}
+ 
+--- 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,
@@ -20,7 +83,7 @@
  		)	;
  
  		sep	= true	;
-@@ -1025,7 +1025,7 @@
+@@ -1034,7 +1034,7 @@
  			receiver,
  			SLOT (newNode(int)),
  			0,
@@ -29,7 +92,7 @@
  		)	;
  	}
  
-@@ -1043,7 +1043,7 @@
+@@ -1052,7 +1052,7 @@
  				receiver,
  				SLOT (newNode(int)),
  				0,
@@ -38,9 +101,9 @@
  			)	;
  		)
  
---- 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_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,
@@ -64,100 +127,46 @@
 +		(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 @@
+ 	*dflt	= &nodeSpecTable ;
+--- 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.3/libs/kbase/kb_configdlg.cpp.BAD	2006-09-17 13:39:09.000000000 -0500
++++ rekall-2.4.3/libs/kbase/kb_configdlg.cpp	2006-09-17 13:39:16.000000000 -0500
+@@ -312,7 +312,7 @@
  	old.clear () ;
  
- 	QListViewItem	*item	= m_lvOverride->firstChild() ;
+ 	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/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 @@
+--- rekall-2.4.3/libs/kbase/kb_overridedlg.cpp.BAD	2006-09-17 20:17:13.000000000 -0500
++++ rekall-2.4.3/libs/kbase/kb_overridedlg.cpp	2006-09-17 20:17:33.000000000 -0500
+@@ -360,7 +360,7 @@
  	old.clear () ;
  
- 	QListViewItem	*item	= m_lvConfigs->firstChild() ;
+ 	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/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 @@
- 		}
- 
- 		/* Not a special case, call the ::newNode with the	*/
--		/* specification. The (int) cast is is there because	*/
-+		/* specification. The (long) cast is is there because	*/
- 		/* ::newNode is a slot which the popup menu system	*/
- 		/* invokes, whence the arguement is really a NodeSpec	*/
- 		/* structure.						*/
--		newNode ((int)spec) ;
-+		newNode ((long)spec) ;
- 		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 @@
- 		receiver,
- 		SLOT(newNode(int)),
- 		0,
--		(int)&nodeSpecTable
-+		(long)&nodeSpecTable
- 	)	;
- 	tp->insertItem
- 	(	TR("Query tree"),
- 		receiver,
- 		SLOT(newNode(int)),
- 		0,
--		(int)&nodeSpecQuery
-+		(long)&nodeSpecQuery
- 	)	;
- 	tp->insertItem
- 	(	TR("SQL tree"  ),
- 		receiver,
- 		SLOT(newNode(int)),
- 		0,
--		(int)&nodeSpecSQL
-+		(long)&nodeSpecSQL
- 	) 	;
- 
- 	*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.0-gcc4.patch:

Index: rekall-2.4.0-gcc4.patch
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-5/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	18 Sep 2006 13:45:39 -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-lib64.patch:

Index: rekall-2.4.0-lib64.patch
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-5/rekall-2.4.0-lib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rekall-2.4.0-lib64.patch	2 Mar 2006 18:34:39 -0000	1.1
+++ rekall-2.4.0-lib64.patch	18 Sep 2006 13:45:39 -0000	1.2
@@ -1,13 +1,26 @@
---- rekall-2.4.0/scons/rkBuilder.py.BAD	2006-03-02 11:48:44.000000000 -0600
-+++ rekall-2.4.0/scons/rkBuilder.py	2006-03-02 11:49:02.000000000 -0600
-@@ -49,8 +49,8 @@
+--- rekall-2.4.3/scons/rkBuilder.py.orig	2006-03-14 12:01:59.000000000 -0600
++++ rekall-2.4.3/scons/rkBuilder.py	2006-09-15 15:06:51.000000000 -0500
+@@ -88,9 +88,9 @@
  if rkConfig.mode in [ 'qt3' ] :
      instDir		= rkConfig.prefix
      binDir		= destDir + os.path.join (instDir, 'bin')
 -    libDir		= destDir + os.path.join (instDir, 'lib')
--    pluginDir		= destDir + os.path.join (instDir, 'lib')
 +    libDir		= destDir + os.path.join (instDir, 'lib64')
+     pyLibDir		= destDir + os.path.join (rkConfig.pythonLibDir, rkConfig.pythonLib, 'site-packages')
+-    pluginDir		= destDir + os.path.join (instDir, 'lib')
 +    pluginDir		= destDir + os.path.join (instDir, 'lib64')
      appDir		= destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName)
      docDir		= destDir + os.path.join (instDir, 'share', 'doc', 'HTML', 'en')
      rekallServicesDir	= os.path.join (appDir,  'services')
+@@ -99,9 +99,9 @@
+ if rkConfig.mode in [ 'kde' ] :
+     instDir		= rkConfig.prefix
+     binDir		= destDir + os.path.join (instDir, 'bin')
+-    libDir		= destDir + os.path.join (instDir, 'lib')
++    libDir		= destDir + os.path.join (instDir, 'lib64')
+     pyLibDir		= destDir + os.path.join (rkConfig.pythonLibDir, rkConfig.pythonLib, 'site-packages')
+-    pluginDir		= destDir + os.path.join (instDir, 'lib')
++    pluginDir		= destDir + os.path.join (instDir, 'lib64')
+     appDir		= destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName)
+     if rkConfig.deb :
+         docDir		= destDir + os.path.join (instDir, 'share', 'doc', 'kde', 'HTML', 'en')

rekall-2.4.0-noldconfig.patch:

Index: rekall-2.4.0-noldconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-5/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	18 Sep 2006 13:45:39 -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/FC-5/rekall.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rekall.spec	2 Mar 2006 18:34:39 -0000	1.12
+++ rekall.spec	18 Sep 2006 13:45:39 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		rekall
 Summary:	A KDE database front-end application
-Version:	2.4.0
+Version:	2.4.3
 Release:	4%{?dist}
 Group:		Development/Tools
 License:	GPL
@@ -17,10 +17,16 @@
 BuildRequires:  scons, flex, bison
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
-Requires:	rekall-common = %{version}-%{release}
+Provides:	rekall-common = %{version}-%{release}
+Obsoletes:	rekall-common
 Provides:	rekall-devel = %{version}-%{release}
 Obsoletes:	rekall-devel
 
+# rekall-runtime went away. Never really seemed useful to me anyways.
+# This provides is bogus, but present to ensure clean upgrades.
+Provides:	rekall-runtime = %{version}-%{release}
+Obsoletes:	rekall-runtime
+
 %description
 Rekall is a database front-end, however, Rekall is not itself a 
 database, and does not include a database. By this we mean that data 
@@ -30,14 +36,6 @@
 database agnostic, and does not have any preferred database (plugins are 
 available for MySQL and PostgreSQL).
 
-%package common
-Summary: Rekall common libraries
-Group: System Environment/Libraries
-
-%description common
-This package contains a set of common libraries that both rekall and 
-rekall-runtime require to function.
-
 %package docs
 Summary: Rekall documentation
 Group: Documentation
@@ -78,29 +76,11 @@
 %description python
 Python components and scripts for Rekall.
 
-%package runtime
-Summary: Rekall runtime environment
-Group: Development/Tools
-Provides: %{name}-runtime-devel = %{version}-%{release}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-Requires: rekall-common = %{version}-%{release}
-
-%description runtime
-RekallRT is the runtime version of Rekall. It contains all the functionality 
-of Rekall except that all design functions are removed, and direct access to 
-tables and queries is restricted.
-
-Typically, you can develop a Rekall application with the full version, then 
-allow users to run it under the runtime version. Such a user is restricted 
-to accessing the database only via the forms and reports that you have 
-designed, and via any associated scripts.
-
 %prep
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+# %patch3 -p1
 %patch4 -p1
 %ifarch sparc64 alpha x86_64 ia64
 %patch5 -p1
@@ -117,22 +97,21 @@
 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}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 install -m0644 kbase/rekall.desktop $RPM_BUILD_ROOT%{_datadir}
-install -m0644 kbase/rekallrt.desktop $RPM_BUILD_ROOT%{_datadir}
 
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -142,27 +121,14 @@
   --add-mime-type Application/x-rlk \
   $RPM_BUILD_ROOT%{_datadir}/%{name}.desktop
 
-sed -i -e 's|Rekall|Rekall RT|' $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop
-sed -i -e 's|rekall.png|rekallrt.png|' $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop
-
-desktop-file-install --vendor fedora --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Application \
-  --add-category Office \
-  --add-mime-type Application/x-rlk \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop
-
 # No need to have this file twice.
 rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekallqt/LICENSE
 
 cd $RPM_BUILD_ROOT%{_datadir}
 ln -s %{_datadir}/apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
-cp apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
 cd $RPM_BUILD_ROOT%{_bindir}
 ln -s %{_bindir}/rekallqt rekall
 ln -s %{_bindir}/rekallqtManual rekallManual
-ln -s %{_bindir}/rekallqtrt rekallrt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -177,10 +143,6 @@
   update-desktop-database %{_datadir}/applications &> /dev/null
 fi
 
-%post common -p /sbin/ldconfig
-
-%postun common -p /sbin/ldconfig
-
 %post extra -p /sbin/ldconfig
 
 %postun extra -p /sbin/ldconfig
@@ -197,22 +159,13 @@
 
 %postun python -p /sbin/ldconfig
 
-%post runtime
-/sbin/ldconfig
-update-desktop-database %{_datadir}/applications &> /dev/null
-
-%postun runtime
-/sbin/ldconfig
-if [ "$1" = "0" ]; then
-  update-desktop-database %{_datadir}/applications &> /dev/null
-fi
-
 %files
 %defattr(-, root, root, 0755)
 %doc LICENSE
 %{_libdir}/librekallqt.so
 %{_bindir}/rekall
 %{_bindir}/rekallqt
+%{_bindir}/rkdcop
 %{_datadir}/pixmaps/rekall.png
 %dir %{_datadir}/apps/rekallqt
 %{_datadir}/apps/rekallqt/dict/
@@ -226,11 +179,14 @@
 %{_datadir}/apps/rekallqt/rekall_lite.png
 %{_datadir}/apps/rekallqt/services/rekall_component.desktop
 %{_datadir}/apps/rekallqt/services/rekall_copier.desktop
+%{_datadir}/apps/rekallqt/services/rekall_driver_dbtcp.desktop
+%{_datadir}/apps/rekallqt/services/rekall_driver_test.desktop
 %{_datadir}/apps/rekallqt/services/rekall_driver_xbase.desktop
 %{_datadir}/apps/rekallqt/services/rekall_dummy.desktop
 %{_datadir}/apps/rekallqt/services/rekall_editor.desktop
 %{_datadir}/apps/rekallqt/services/rekall_form.desktop
 %{_datadir}/apps/rekallqt/services/rekall_macro.desktop
+%{_datadir}/apps/rekallqt/services/rekall_plugin_scriptall.desktop
 %{_datadir}/apps/rekallqt/services/rekall_query.desktop
 %{_datadir}/apps/rekallqt/services/rekall_report.desktop
 %{_datadir}/apps/rekallqt/services/rekall_script_kjs.desktop
@@ -242,27 +198,29 @@
 %{_datadir}/apps/rekallqt/wizards/
 %{_datadir}/applications/fedora-rekall.desktop
 %{_libdir}/librekallqt_app.so
+%{_libdir}/librekallqt_common.so
 %{_libdir}/librekallqt_componentview.so
 %{_libdir}/librekallqt_copierview.so
+%{_libdir}/librekallqt_driver_dbtcp.so
+%{_libdir}/librekallqt_driver_test.so
 %{_libdir}/librekallqt_driver_xbase.so
 %{_libdir}/librekallqt_editor.so
 %{_libdir}/librekallqt_el32.so
 %{_libdir}/librekallqt_formview.so
+%{_libdir}/librekallqt_kde.so
+%{_libdir}/librekallqt_kjs.so
 %{_libdir}/librekallqt_macroview.so
 %{_libdir}/librekallqt_queryview.so
 %{_libdir}/librekallqt_reportview.so
+%{_libdir}/librekallqt_rkdcop.so
+%{_libdir}/librekallqt_script_kjs.so
+%{_libdir}/librekallqt_scriptall.so
 %{_libdir}/librekallqt_tableview.so
+%{_libdir}/librekallqt_support_dbtcp.so
 %{_libdir}/librekallqt_support_xbase.so
 %{_libdir}/librekallqt_support_xbsql.so
 %{_libdir}/librekallqt_wizard.so
 
-%files common
-%defattr(-, root, root, 0755)
-%{_libdir}/librekallqt_common.so
-%{_libdir}/librekallqt_kde.so
-%{_libdir}/librekallqt_kjs.so
-%{_libdir}/librekallqt_script_kjs.so
-
 %files docs
 %defattr(-, root, root, 0755)
 %doc AUTHORS README.FIRST Release.Notes
@@ -294,30 +252,22 @@
 %{_datadir}/apps/rekallqt/script/py/*
 %{_datadir}/apps/rekallqt/services/rekall_script_py.desktop
 %{_libdir}/librekallqt_script_py.so
-
-%files runtime
-%defattr(-, root, root, 0755)
-%{_bindir}/rekallrt
-%{_bindir}/rekallqtrt
-%{_datadir}/apps/rekallqt/services/rekallrt_form.desktop
-%{_datadir}/apps/rekallqt/services/rekallrt_query.desktop
-%{_datadir}/apps/rekallqt/services/rekallrt_report.desktop
-%{_datadir}/apps/rekallqt/services/rekallrt_table.desktop
-%{_datadir}/apps/rekallqt/services/rekallrt_plugin_extra.desktop
-%{_datadir}/apps/rekallqt/services/rekallrt_script_py.desktop
-%{_datadir}/apps/rekallqtrt
-%{_datadir}/applications/fedora-rekallrt.desktop
-%{_datadir}/pixmaps/rekallrt.png
-%{_libdir}/librekallqtrt_plugin_extra.so
-%{_libdir}/librekallqtrt_script_py.so
-%{_libdir}/librekallqtrt.so*
-%{_libdir}/librekallqtrt_app.so*
-%{_libdir}/librekallqtrt_formview.so
-%{_libdir}/librekallqtrt_queryview.so
-%{_libdir}/librekallqtrt_reportview.so
-%{_libdir}/librekallqtrt_tableview.so
+%{_libdir}/python*/site-packages/rkdcop.so
 
 %changelog
+* Sun Sep 17 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.3-4
+- fix 64 bit, nuke -common, add new files
+
+* Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.3-3
+- actually upload new source
+- no more rt bits
+
+* Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.3-2
+- bump for fc6
+
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.3-1
+- bump to 2.4.3
+
 * Thu Mar  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-4
 - really fix 64bit arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-5/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	18 Sep 2006 13:45:39 -0000	1.5
@@ -1 +1 @@
-0d90d4bbe3e470b0764b10e8c9b81559  rekall-2.4.0.tar.gz
+d72ab22d40f1556027c473eed9783297  rekall-2.4.3.tar.gz




More information about the scm-commits mailing list