rpms/frysk/FC-6 frysk-20061201-i386_is_not_64bit.patch, NONE, 1.1 frysk.spec, 1.108, 1.109
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Dec 19 22:25:42 UTC 2006
Author: skasal
Update of /cvs/dist/rpms/frysk/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv17418
Modified Files:
frysk.spec
Added Files:
frysk-20061201-i386_is_not_64bit.patch
Log Message:
Sync with RHEL-5
frysk-20061201-i386_is_not_64bit.patch:
ChangeLog | 5 +++++
IsaFactory.java | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
--- NEW FILE frysk-20061201-i386_is_not_64bit.patch ---
? diffs
Index: frysk-core/frysk/proc/ChangeLog
===================================================================
RCS file: /cvs/frysk/frysk-core/frysk/proc/ChangeLog,v
retrieving revision 1.535
diff -p -u -r1.535 ChangeLog
--- frysk-core/frysk/proc/ChangeLog 29 Nov 2006 18:28:32 -0000 1.535
+++ frysk-core/frysk/proc/ChangeLog 19 Dec 2006 21:35:21 -0000
@@ -1,3 +1,8 @@
+2006-12-19 Andrew Cagney <cagney at redhat.com>
+
+ * IsaFactory.java: For i386, only return Ia32On64 when build
+ system was x86-64. HACK!!
+
2006-11-29 Andrew Cagney <cagney at redhat.com>
* TestTaskTerminateObserver.java (AttachedCounter): Delete.
Index: frysk-core/frysk/proc/IsaFactory.java
===================================================================
RCS file: /cvs/frysk/frysk-core/frysk/proc/IsaFactory.java,v
retrieving revision 1.8
diff -p -u -r1.8 IsaFactory.java
--- frysk-core/frysk/proc/IsaFactory.java 10 Oct 2006 07:56:24 -0000 1.8
+++ frysk-core/frysk/proc/IsaFactory.java 19 Dec 2006 21:35:21 -0000
@@ -89,10 +89,10 @@ public class IsaFactory
{
case ElfEMachine.EM_386:
{
- if (frysk.core.Build.BUILD_ARCH.equals("i686"))
- return LinuxIa32.isaSingleton ();
- else
- return LinuxIa32On64.isaSingleton();
+ if (frysk.core.Build.BUILD_ARCH.equals ("x86_64"))
+ return LinuxIa32On64.isaSingleton();
+ else
+ return LinuxIa32.isaSingleton ();
}
case ElfEMachine.EM_PPC:
{
Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-6/frysk.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- frysk.spec 1 Dec 2006 15:28:26 -0000 1.108
+++ frysk.spec 19 Dec 2006 22:25:40 -0000 1.109
@@ -1,7 +1,7 @@
Summary: Frysk execution analysis tool
Name: frysk
Version: 0.0.1.2006.12.01.rh1
-Release: 1%{?dist}
+Release: 4%{?dist}
License: GPL
Group: Development/System
URL: http://sourceware.org/frysk
@@ -20,10 +20,12 @@
# Do not build 32bit tests:
Patch2: frysk-arch32-disable.patch
+# A hack to fix a bug:
+Patch3: frysk-20061201-i386_is_not_64bit.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: libglade-java >= 2.12.5
-Requires: libvte-java >= 0.12.0
+Requires: glib-java >= 0.2.6
Requires: libgconf-java
BuildRequires: gcc-java >= 4.1.1
BuildRequires: junit >= 3.8.1
@@ -75,6 +77,32 @@
primitives and will also expose deadlocks, gather data and debug any given
process in the system.
+%package devel
+Summary: The development part of Frysk.
+Group: Development/System
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Frysk is an execution-analysis technology implemented using native Java and C++.
+This package contains the development part of Frysk.
+
+%package gnome
+Summary: The GUI frontend of Frysk.
+Requires: %{name} = %{version}-%{release}
+Group: Development/System
+Requires: libglade-java >= 2.12.5
+Requires: libvte-java >= 0.12.0
+
+%description gnome
+Frysk is an execution-analysis technology implemented using native Java and C++.
+It is aimed at providing developers and sysadmins with the ability to both
+examine and analyze running multi-host, multi-process, multi-threaded systems.
+Frysk allows the monitoring of running processes and threads, of locking
+primitives and will also expose deadlocks, gather data and debug any given
+process in the system.
+
+This package contains the GUI front end for Frysk.
+
%prep
%setup -q -n %{name}-%{version}
%if %{run_make_check}
@@ -82,6 +110,7 @@
%endif
%patch1
%patch2
+%patch3
%build
@@ -123,6 +152,12 @@
# Workaround for #211824:
rm $RPM_BUILD_ROOT/%{_datadir}/java/*.jar
+# 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
@@ -133,17 +168,67 @@
%files
%defattr(-,root,root)
%doc COPYING frysk-imports/common/EXCEPTION
-# frysk, ftrace, fstack, perhaps fcrash
-%{_bindir}/f*
-%{_libdir}/*so*
+%{_bindir}/ftrace
+%{_bindir}/fstack
+%{_bindir}/fcore
+%{_libdir}/libfrysk-antlr.so
+%{_libdir}/libfrysk-cdtparser.so
+%{_libdir}/libfrysk-core.so
+%{_libdir}/libfrysk-getopt.so
+%{_libdir}/libfrysk-imports.so
+%{_libdir}/libfrysk-jdom.so
+%{_libdir}/libfrysk-jline.so
+%{_libdir}/libfrysk-sys.so
%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
-%{_datadir}/applications/frysk.desktop
-%{_datadir}/pixmaps/fryskTrayIcon48.png
+%{_datadir}/%{name}/messages.properties
%{_mandir}/man*/*
-%{_libexecdir}/frysk/*
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/libfrysk-junit.so
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/funit*
+%{_datadir}/%{name}/helloworld.o
+%{_datadir}/%{name}/test-core
+%dir %{_datadir}/%{name}/test
+%{_datadir}/%{name}/test/test*
+
+%files gnome
+%defattr(-,root,root)
+%{_bindir}/frysk
+%{_libdir}/libEggTrayIcon.so
+%{_libdir}/libfrysk-ftk.so
+%{_libdir}/libfrysk-gtk.so
+%{_libdir}/libfrysk-gui.so
+%{_libdir}/libftk*.so
+%{_datadir}/%{name}/glade
+%{_datadir}/%{name}/images
+%{_datadir}/pixmaps/fryskTrayIcon48.png
%changelog
+* 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
+
+* Tue Dec 19 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.01.rh1-3
+- Use libexecdir with the old version.
+- Related: #218835
+
+* Mon Dec 18 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.01.rh1-2
+- Fix typo in the previous chlog entry.
+- Resolves: #211200
+
+* Mon Dec 18 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.01.rh1-2
+- Do not install the .desktop file.
+- Resolves: #211200
+- Split to frysk, frysk-devel, and frysk-gnome; move the requires for gui
+ java-gnome libraries to frysk-gnome.
+- Resolves: #218835
+
+* Fri Dec 1 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.01.rh1-2
+- Related: #211775
+- The ppc64 build works again.
+
* Fri Dec 1 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.01.rh1-1
- New upstream version.
- Resolves: #211288.
@@ -151,6 +236,7 @@
* Thu Nov 30 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.11.30.rh1-1
- New upstream version.
- The stamp file for glade files has been renamed.
+- Disable ppc64 build.
* Mon Oct 30 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.10.30.rh1-1
- New upstream version.
@@ -160,7 +246,7 @@
* Mon Oct 23 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.10.23.rh1-1
- New upstream version.
- Do not pack the jars; they cause multilib conflicts.
-- Add /usr/bin/fcrash tothe file list.
+- Add /usr/bin/fcrash to the file list.
* Tue Oct 17 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.10.17.rh1-1
- New upstream version.
More information about the fedora-cvs-commits
mailing list