update spec

git-svn-id: http://ltt.polymtl.ca/svn@1983 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/specs/lttv.spec b/ltt/branches/poly/specs/lttv.spec
index f09629c2db5475b641b8e6a87762547a75632202..31852770178981e3375e6badf90c40509c72a287 100644 (file)
--- a/ltt/branches/poly/specs/lttv.spec
+++ b/ltt/branches/poly/specs/lttv.spec
@@ -3,8 +3,8 @@
 #
 Summary: Linux Trace Toolkit Viewer
 Name: lttv
-Version: 0.6.9
-Release: 10102005
+Version: 0.8.48
+Release: 21062006
 License: GPL
 Group: Applications/Development
 Source: http://ltt.polymtl.ca/packages/LinuxTraceToolkitViewer-%{version}-%{release}.tar.gz
@@ -12,82 +12,94 @@ URL: http://ltt.polymtl.ca
 Packager: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Where do we install the libs
+%ifarch x86_64 ppc64 ppc64iseries ia64 
+%define libdir /usr/lib64
+%else
+%define libdir /usr/lib
+%endif
+
+
 %description
 LTTV is a modular trace viewer. It can perform analysis on traces of a Linux
  kernel instrumented with LTTng.
 
 %prep
 %setup -q -n LinuxTraceToolkitViewer-%{version}-%{release}
-%patch0 -p1
 
 %build
-./configure --prefix=/usr
+# These two commands were added to fix compilation on x86_64 machines
+aclocal
+automake
+
+./configure --prefix=/usr --libdir=%{libdir}
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
+%post
+echo "Running ldconfig (might take a while)"
+ldconfig
+
+%postun
+echo "Running ldconfig (might take a while)"
+ldconfig
+
 %files
-/usr/lib/liblttctl.so.0.0.0
-/usr/lib/liblttctl.so.0
-/usr/lib/liblttctl.so
-/usr/lib/liblttctl.la
-/usr/lib/liblttctl.a
-/usr/lib/liblttvtraceread.so.0.0.0
-/usr/lib/liblttvtraceread.so.0
-/usr/lib/liblttvtraceread.so
-/usr/lib/liblttvtraceread.la
-/usr/lib/liblttvtraceread.a
-/usr/lib/lttv
-/usr/lib/lttv/plugins
-/usr/lib/lttv/plugins/libtextDump.so.0.0.0
-/usr/lib/lttv/plugins/libtextDump.so.0
-/usr/lib/lttv/plugins/libtextDump.so
-/usr/lib/lttv/plugins/libtextDump.la
-/usr/lib/lttv/plugins/libtextDump.a
-/usr/lib/lttv/plugins/libbatchAnalysis.so.0.0.0
-/usr/lib/lttv/plugins/libbatchAnalysis.so.0
-/usr/lib/lttv/plugins/libbatchAnalysis.so
-/usr/lib/lttv/plugins/libbatchAnalysis.la
-/usr/lib/lttv/plugins/libbatchAnalysis.a
-/usr/lib/lttv/plugins/libtextFilter.so.0.0.0
-/usr/lib/lttv/plugins/libtextFilter.so.0
-/usr/lib/lttv/plugins/libtextFilter.so
-/usr/lib/lttv/plugins/libtextFilter.la
-/usr/lib/lttv/plugins/libtextFilter.a
-/usr/lib/lttv/plugins/libguicontrolflow.so.0.0.0
-/usr/lib/lttv/plugins/libguicontrolflow.so.0
-/usr/lib/lttv/plugins/libguicontrolflow.so
-/usr/lib/lttv/plugins/libguicontrolflow.la
-/usr/lib/lttv/plugins/libguicontrolflow.a
-/usr/lib/lttv/plugins/libguievents.so.0.0.0
-/usr/lib/lttv/plugins/libguievents.so.0
-/usr/lib/lttv/plugins/libguievents.so
-/usr/lib/lttv/plugins/libguievents.la
-/usr/lib/lttv/plugins/libguievents.a
-/usr/lib/lttv/plugins/libguistatistics.so.0.0.0
-/usr/lib/lttv/plugins/libguistatistics.so.0
-/usr/lib/lttv/plugins/libguistatistics.so
-/usr/lib/lttv/plugins/libguistatistics.la
-/usr/lib/lttv/plugins/libguistatistics.a
-/usr/lib/lttv/plugins/libguifilter.so.0.0.0
-/usr/lib/lttv/plugins/libguifilter.so.0
-/usr/lib/lttv/plugins/libguifilter.so
-/usr/lib/lttv/plugins/libguifilter.la
-/usr/lib/lttv/plugins/libguifilter.a
-/usr/lib/lttv/plugins/libguitracecontrol.so.0.0.0
-/usr/lib/lttv/plugins/libguitracecontrol.so.0
-/usr/lib/lttv/plugins/libguitracecontrol.so
-/usr/lib/lttv/plugins/libguitracecontrol.la
-/usr/lib/lttv/plugins/libguitracecontrol.a
-/usr/lib/liblttvwindow.so.0.0.0
-/usr/lib/liblttvwindow.so.0
-/usr/lib/liblttvwindow.so
-/usr/lib/liblttvwindow.la
-/usr/lib/liblttvwindow.a
-/usr/include/liblttctl
-/usr/include/liblttctl/lttctl.h
+%{libdir}/liblttvtraceread.so.0.0.0
+%{libdir}/liblttvtraceread.so.0
+%{libdir}/liblttvtraceread.so
+%{libdir}/liblttvtraceread.la
+%{libdir}/liblttvtraceread.a
+%{libdir}/lttv
+%{libdir}/lttv/plugins
+%{libdir}/lttv/plugins/libtextDump.so.0.0.0
+%{libdir}/lttv/plugins/libtextDump.so.0
+%{libdir}/lttv/plugins/libtextDump.so
+%{libdir}/lttv/plugins/libtextDump.la
+%{libdir}/lttv/plugins/libtextDump.a
+%{libdir}/lttv/plugins/libbatchAnalysis.so.0.0.0
+%{libdir}/lttv/plugins/libbatchAnalysis.so.0
+%{libdir}/lttv/plugins/libbatchAnalysis.so
+%{libdir}/lttv/plugins/libbatchAnalysis.la
+%{libdir}/lttv/plugins/libbatchAnalysis.a
+%{libdir}/lttv/plugins/libtextFilter.so.0.0.0
+%{libdir}/lttv/plugins/libtextFilter.so.0
+%{libdir}/lttv/plugins/libtextFilter.so
+%{libdir}/lttv/plugins/libtextFilter.la
+%{libdir}/lttv/plugins/libtextFilter.a
+%{libdir}/lttv/plugins/libguicontrolflow.so.0.0.0
+%{libdir}/lttv/plugins/libguicontrolflow.so.0
+%{libdir}/lttv/plugins/libguicontrolflow.so
+%{libdir}/lttv/plugins/libguicontrolflow.la
+%{libdir}/lttv/plugins/libguicontrolflow.a
+%{libdir}/lttv/plugins/libguievents.so.0.0.0
+%{libdir}/lttv/plugins/libguievents.so.0
+%{libdir}/lttv/plugins/libguievents.so
+%{libdir}/lttv/plugins/libguievents.la
+%{libdir}/lttv/plugins/libguievents.a
+%{libdir}/lttv/plugins/libguistatistics.so.0.0.0
+%{libdir}/lttv/plugins/libguistatistics.so.0
+%{libdir}/lttv/plugins/libguistatistics.so
+%{libdir}/lttv/plugins/libguistatistics.la
+%{libdir}/lttv/plugins/libguistatistics.a
+%{libdir}/lttv/plugins/libguifilter.so.0.0.0
+%{libdir}/lttv/plugins/libguifilter.so.0
+%{libdir}/lttv/plugins/libguifilter.so
+%{libdir}/lttv/plugins/libguifilter.la
+%{libdir}/lttv/plugins/libguifilter.a
+%{libdir}/lttv/plugins/libguitracecontrol.so.0.0.0
+%{libdir}/lttv/plugins/libguitracecontrol.so.0
+%{libdir}/lttv/plugins/libguitracecontrol.so
+%{libdir}/lttv/plugins/libguitracecontrol.la
+%{libdir}/lttv/plugins/libguitracecontrol.a
+%{libdir}/liblttvwindow.so.0.0.0
+%{libdir}/liblttvwindow.so.0
+%{libdir}/liblttvwindow.so
+%{libdir}/liblttvwindow.la
+%{libdir}/liblttvwindow.a
 /usr/include/ltt
 /usr/include/ltt/compiler.h
 /usr/include/ltt/event.h
@@ -116,11 +128,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 /usr/include/lttvwindow/mainwindow.h
 /usr/include/lttvwindow/menu.h
 /usr/include/lttvwindow/toolbar.h
-/usr/bin/lttctl
 /usr/bin/lttv.real
 /usr/bin/lttv
 /usr/bin/lttv-gui
-/usr/bin/lttd
 /usr/share/LinuxTraceToolkitViewer
 /usr/share/LinuxTraceToolkitViewer/pixmaps
 /usr/share/LinuxTraceToolkitViewer/pixmaps/1downarrow.png
@@ -149,14 +159,3 @@ make DESTDIR=$RPM_BUILD_ROOT install
 /usr/share/LinuxTraceToolkitViewer/pixmaps/stock_zoom_fit_24.png
 /usr/share/LinuxTraceToolkitViewer/pixmaps/stock_zoom_in_24.png
 /usr/share/LinuxTraceToolkitViewer/pixmaps/stock_zoom_out_24.png
-/usr/share/LinuxTraceToolkitViewer/facilities
-/usr/share/LinuxTraceToolkitViewer/facilities/core.xml
-/usr/share/LinuxTraceToolkitViewer/facilities/fs.xml
-/usr/share/LinuxTraceToolkitViewer/facilities/ipc.xml
-/usr/share/LinuxTraceToolkitViewer/facilities/kernel.xml
-/usr/share/LinuxTraceToolkitViewer/facilities/memory.xml
-/usr/share/LinuxTraceToolkitViewer/facilities/network.xml
-/usr/share/LinuxTraceToolkitViewer/facilities/process.xml
-/usr/share/LinuxTraceToolkitViewer/facilities/s390_kernel.xml
-/usr/share/LinuxTraceToolkitViewer/facilities/socket.xml
-/usr/share/LinuxTraceToolkitViewer/facilities/timer.xml