diff --git a/.cvsignore b/.cvsignore index 5301f78..22315d7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -frysk-0.0.1.2007.03.13.rh1.tar.bz2 +frysk-0.0.1.2007.09.24.tar.bz2 diff --git a/frysk.spec b/frysk.spec index 3a86a51..2b904a6 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,23 +1,29 @@ -Summary: Frysk execution analysis tool +Summary: Frysk execution analysis and debugging tools Name: frysk -Version: 0.0.1.2007.03.13.rh1 +Version: 0.0.1.2007.09.24 Release: 1%{?dist} -License: GPL +# antlrv2 is Public Domain; antlrv3 is BSD. +# cdtparser is EPL +# getopt is GPLv2 with exception +# elfutils is GPLv2 with exception +# frysk is GPLv2 with exception +# junit licence is CPL (according to the junit rpm) +# jline licence is BSD +# libunwind is BSD +License: GPLv2 with exceptions and BSD and CPL and Public Domain and EPL Group: Development/System URL: http://sourceware.org/frysk +# The source for this package was pulled from upstream's vcs. Use the +# following commands, which brand the file with the contents of version.in, +# to generate the tarball: +# cvs -d:pserver:anoncvs@sourceware.org:/cvs/frysk export -D YYYY-MM-DD-gmt +# mv frysk frysk-`cat frysk/common/version.in` +# tar cf - frysk-`cat frysk/common/version.in` | bzip2 -9 > frysk-`cat frysk/common/version.in`.tar.bz2 Source: %{name}-%{version}.tar.bz2 %define run_make_check 0 -%if %{run_make_check} -# Disable the test which fails when building on older kernel. -Patch0: frysk-xfail-2130.patch -%endif - -# Prevent a warning from a new g++: -Patch1: frysk-20060922-a-cast.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: glib-java >= 0.2.6 @@ -39,17 +45,16 @@ BuildRequires: sharutils BuildRequires: transfig >= 3.2.0 BuildRequires: gnome-python2-gconf BuildRequires: audit-libs-devel - -# Fedora Core >= 6 and RHEL: -%if "%{?fedora}" != "5" -BuildRequires: binutils-devel -BuildRequires: dogtail >= 0.5.2 +BuildRequires: autoconf automake libtool %ifarch x86_64 ppc64 # Ensure glibc{,-devel} is installed for both multilib arches BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so %endif +# Fedora Core >= 6 and RHEL: +%if "%{?fedora}" != "5" +BuildRequires: dogtail >= 0.5.2 # Needed by "dogtail-run-headless -n": Buildrequires: metacity %endif @@ -65,12 +70,13 @@ ExclusiveArch: %{ix86} x86_64 %endif %description -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. +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. %package devel Summary: The development part of Frysk. @@ -78,8 +84,8 @@ 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. +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. @@ -90,21 +96,19 @@ 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. +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 +./bootstrap.sh %build @@ -119,22 +123,31 @@ export GCC=${GCC:-/usr/bin/gcc} export CC=${CC:-/usr/bin/gcc} export CXX=${CXX:-/usr/bin/g++} export JAVA=${JAVA:-/usr/bin/gij} -export JV_SCAN=${JV_SCAN:-/usr/bin/jv-scan} uname -a gcc --version +pwd +mkdir -p build +cd build + +# Capture the configure line +rm -f configure +echo '#!/bin/sh -x' >> configure +echo 'exec ../configure "$@"' >> configure +chmod a+x configure # FIXME: Warnings 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" \ - --disable-arch32-tests --disable-werror - + --disable-arch32-tests # Build system can end up with corrupt xmllint files: touch frysk-gui/glade.catalog touch frysk-gui/checked-glade-xml -make %{?_smp_mflags} +# in frysk-sys; make is building .o files before all BUILT_FILES are +# created. +make # %{?_smp_mflags} %if %{run_make_check} %check @@ -148,22 +161,26 @@ rm -rf %{buildroot} # Workaround for bug #??: mkdir -p $RPM_BUILD_ROOT/usr/share/frysk +pwd +cd build make DESTDIR=$RPM_BUILD_ROOT install %{?_smp_mflags} # Fix timestamp of a generated script: -touch -r frysk-gui/frysk/gui/ChangeLog $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py +touch -r \ + ../frysk-gui/frysk-gui/frysk/gui/FryskGui.javain \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py # ...and a few other ones: -# ... well, these are not installed by current tarball... -#for f in test2866.py test2985.py test3380.py; do -# touch -r frysk-gui/frysk/gui/test/dogtail_scripts/$f $RPM_BUILD_ROOT%{_datadir}/%{name}/test/$f -#done +for f in test2866.py test2985.py test3380.py; do + touch -r \ + ../frysk-gui/frysk/gui/test/dogtail_scripts/$f \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/test/$f +done # Workaround for #211824: rm $RPM_BUILD_ROOT%{_datadir}/java/*.jar # We are not yet ready to be in the menu: -mv $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop . - +mv $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop .. %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -196,9 +213,15 @@ rm -rf %{buildroot} %defattr(-,root,root) %{_libdir}/libfrysk-junit.so %dir %{_libdir}/%{name} -%{_libdir}/%{name}/* +%{_libdir}/%{name}/funit* +%{_libdir}/%{name}/ftail +%{_libdir}/%{name}/fsystest +%{_libdir}/%{name}/sys-tests +%{_libdir}/%{name}/test_main_looper %{_datadir}/%{name}/helloworld.o -%{_datadir}/%{name}/test?* +%{_datadir}/%{name}/test-core +%{_datadir}/%{name}/test_looper.xml +# Not installed by current taralls. #%dir %{_datadir}/%{name}/test #%{_datadir}/%{name}/test/test* %{_datadir}/%{name}/dogtail_scripts @@ -222,6 +245,19 @@ rm -rf %{buildroot} %{_datadir}/pixmaps/fryskTrayIcon48.png %changelog +* Mon Sep 24 2007 Andrew Cagney - 0.0.1.2007.09.24-1 +- Import frysk-0.0.1.2007.09.24.tar.bz2. +- Remove frysk-20060922-a-cast.patch +- Remove frysk-xfail-2130.patch. +- Run bootstrap.sh over source tree. +- Add autoconf, automake, and libtool to BuildRequires. +- Remove binutils-devel from BuildRequires. +- Build in separate sub-directory. +- Do not force JV_SCAN into the build environment. +- Update Licence. +- Change BuildRoot to prefered fedora format. +- Expand Summary to mention debugging. + * Tue Mar 13 2007 Stepan Kasal - 0.0.1.2007.03.13.rh1-1 - New upstream version, adapt the file list. - Remove frysk-no-dejagnu.patch. diff --git a/sources b/sources index 909b621..f9a74a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b87ee4af3553a31b12e0b430de1225d1 frysk-0.0.1.2007.03.13.rh1.tar.bz2 +34b8a93e1b7b9e4f97d3ae4c57f25d57 frysk-0.0.1.2007.09.24.tar.bz2