rpms/frysk/devel frysk.spec, 1.108, 1.109 frysk-arch32-disable.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: skasal

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

Modified Files:
	frysk.spec 
Removed Files:
	frysk-arch32-disable.patch 
Log Message:
- New upstream version.
- 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
- Remove frysk-arch32-disable.patch, use --disable-arch32-tests instead.
- Disable ppc64 build.



Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- frysk.spec	1 Dec 2006 16:52:23 -0000	1.108
+++ frysk.spec	18 Dec 2006 20:34:06 -0000	1.109
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.12.01.rh1
-Release:	2%{?dist}
+Version:	0.0.1.2006.12.18.rh1
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -17,13 +17,9 @@
 # Prevent a warning from a new g++:
 Patch1:		frysk-20060922-a-cast.patch
 
-# Do not build 32bit tests:
-Patch2:		frysk-arch32-disable.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
@@ -58,7 +54,9 @@
 Buildrequires:	metacity
 %endif
 
-ExclusiveArch: %{ix86} x86_64 ppc64
+#ExclusiveArch: %{ix86} x86_64 ppc64
+# ppc64 is broken, see #220073
+ExclusiveArch: %{ix86} x86_64
 
 # We do not want to build a ``cross-debugging version'' i686->i386;
 # libunwind build would get confused by this.  Override the cmd-line
@@ -75,13 +73,38 @@
 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}
 %patch0
 %endif
 %patch1
-%patch2
 
 %build 
 
@@ -102,7 +125,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
@@ -123,6 +146,9 @@
 # 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
+
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -133,17 +159,55 @@
 %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
+%{_bindir}/fparser
+%{_bindir}/fstep
+%{_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
 %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 %{_libdir}/%{name}
+%{_libdir}/%{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
+* Mon Dec 18 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.18.rh1-1
+- New upstream version.
+- 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
+- Remove frysk-arch32-disable.patch, use --disable-arch32-tests instead.
+- Disable ppc64 build.
+
 * Fri Dec  1 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.01.rh1-2
 - Relates: #211775
 - The ppc64 build works again.
@@ -165,7 +229,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.


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