rpms/frysk/FC-6 frysk-no-dejagnu.patch, NONE, 1.1 .cvsignore, 1.42, 1.43 frysk.spec, 1.109, 1.110 sources, 1.42, 1.43 frysk-20061201-i386_is_not_64bit.patch, 1.1, NONE frysk-arch32-disable.patch, 1.1, NONE

Fri Dec 22 19:25:58 UTC 2006

Author: skasal

Update of /cvs/dist/rpms/frysk/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv24849

Modified Files:
	.cvsignore frysk.spec sources 
Added Files:
	frysk-no-dejagnu.patch 
Removed Files:
	frysk-20061201-i386_is_not_64bit.patch 
	frysk-arch32-disable.patch 
Log Message:
Sync with RHEL 5 branch.

frysk-no-dejagnu.patch:
 Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE frysk-no-dejagnu.patch ---
--- frysk-core/Makefile.in.orig	2006-12-22 17:12:06.000000000 +0100
+++ frysk-core/Makefile.in	2006-12-22 17:11:01.000000000 +0100
@@ -5838,8 +5838,8 @@
 # frysk's core, which doesn't have a UI gets install-tested using
 # dejagnu.  Add those tests to 
 
-install-data-local: install-dejagnu-testsuite-local
-uninstall-local: uninstall-dejagnu-testsuite-local
+#install-data-local: install-dejagnu-testsuite-local
+#uninstall-local: uninstall-dejagnu-testsuite-local
 .PHONY: install-dejagnu-testsuite-local uninstall-dejagnu-testsuite-local
 install-dejagnu-testsuite-local:
 	set -e ; \


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-6/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	1 Dec 2006 15:28:26 -0000	1.42
+++ .cvsignore	22 Dec 2006 19:25:56 -0000	1.43
@@ -1 +1 @@
-frysk-0.0.1.2006.12.01.rh1.tar.bz2
+frysk-0.0.1.2006.12.22.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-6/frysk.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- frysk.spec	19 Dec 2006 22:25:40 -0000	1.109
+++ frysk.spec	22 Dec 2006 19:25:56 -0000	1.110
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.12.01.rh1
-Release:	4%{?dist}
+Version:	0.0.1.2006.12.22.rh1
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -17,11 +17,8 @@
 # Prevent a warning from a new g++:
 Patch1:		frysk-20060922-a-cast.patch
 
-# Do not build 32bit tests:
-Patch2:		frysk-arch32-disable.patch
-
-# A hack to fix a bug:
-Patch3:		frysk-20061201-i386_is_not_64bit.patch
+# Temporarily disable install-dejagnu:
+Patch2:		frysk-no-dejagnu.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -110,7 +107,6 @@
 %endif
 %patch1
 %patch2
-%patch3
 
 %build 
 
@@ -131,7 +127,7 @@
 
 # FIXME: Warninggs should be fixed, not suppressed:
 RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /}
-%configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
+%configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" --disable-arch32-tests
 
 # Build system can end up with corrupt xmllint files:
 touch frysk-gui/glade.catalog
@@ -147,6 +143,10 @@
 %install
 
 rm -rf %{buildroot}
+
+# Workaround for bug #??:
+mkdir -p $RPM_BUILD_ROOT/usr/share/frysk
+
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
 # Workaround for #211824:
@@ -155,9 +155,6 @@
 # We are not yet ready to be in the menu:
 rm $RPM_BUILD_ROOT/%{_datadir}/applications/frysk.desktop
 
-d=$RPM_BUILD_ROOT/%{_libdir}/frysk/arch32
-[ ! -d $d ] || rmdir $d
-
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -171,6 +168,10 @@
 %{_bindir}/ftrace
 %{_bindir}/fstack
 %{_bindir}/fcore
+%{_bindir}/fparser
+%{_bindir}/fstep
+%{_bindir}/fcatch
+%{_bindir}/fhpd
 %{_libdir}/libfrysk-antlr.so
 %{_libdir}/libfrysk-cdtparser.so
 %{_libdir}/libfrysk-core.so
@@ -178,7 +179,6 @@
 %{_libdir}/libfrysk-imports.so
 %{_libdir}/libfrysk-jdom.so
 %{_libdir}/libfrysk-jline.so
-%{_libdir}/libfrysk-sys.so
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/messages.properties
 %{_mandir}/man*/*
@@ -186,12 +186,16 @@
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libfrysk-junit.so
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/funit*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/funit*
+%{_libdir}/%{name}/ftail
+%{_libdir}/%{name}/fsystest
+%{_libdir}/%{name}/sys-tests
 %{_datadir}/%{name}/helloworld.o
 %{_datadir}/%{name}/test-core
 %dir %{_datadir}/%{name}/test
 %{_datadir}/%{name}/test/test*
+%{_datadir}/%{name}/dogtail_scripts
 
 %files gnome
 %defattr(-,root,root)
@@ -206,6 +210,14 @@
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
 %changelog
+* Tue Dec 19 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.22.rh1-1
+- New upstream version.
+- libexecdir -> libdir and other file list updates
+- Remove frysk-arch32-disable.patch, use --disable-arch32-tests instead.
+- Add frysk-no-dejagnu.patch and create $RPM_BUILD_ROOT/${pkgdatadir},
+  to work around a bug in install-dejagnu-testsuite-local rule.
+- Resolves: #218819
+
 * Tue Dec 19 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.01.rh1-4
 - Add frysk-20061201-i386_is_not_64bit.patch
 - Related: #218835


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-6/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	1 Dec 2006 15:28:26 -0000	1.42
+++ sources	22 Dec 2006 19:25:56 -0000	1.43
@@ -1 +1 @@
-d7c389a3fe0962bba74c014037072df4  frysk-0.0.1.2006.12.01.rh1.tar.bz2
+a731c5042d5be6a3b3498475cf4099b9  frysk-0.0.1.2006.12.22.rh1.tar.bz2


--- frysk-20061201-i386_is_not_64bit.patch DELETED ---


--- frysk-arch32-disable.patch DELETED ---


