[RPM]: 1.0, finally!

Fixing problems found in the fedora packaging review. There are still problems,
but lets get what works out of the door so that it gets into a distro and we
can see what is more important to work on from now on.

The OLS paper will be included as soon as it is published by the OLS organizers.

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

CMakeLists.txt

@@ -81,7 +81,7 @@ install(TARGETS dwarves LIBRARY DESTINATION ${LIB_INSTALL_DIR})
 install(TARGETS dwarves dwarves_emit dwarves_reorganize LIBRARY DESTINATION ${LIB_INSTALL_DIR})
 install(FILES dwarves.h dwarves_emit.h dwarves_reorganize.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
 install(FILES ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-install(FILES ostra/python/ostra.py DESTINATION ${LIB_INSTALL_DIR}/ctracer/python)
+install(FILES ostra/python/ostra.py DESTINATION /usr/share/dwarves/runtime/python)
 install(FILES lib/Makefile lib/ctracer_jprobe.c
 	      lib/ctracer_relay.c lib/ctracer_relay.h
-	DESTINATION ${LIB_INSTALL_DIR}/ctracer)
+	DESTINATION /usr/share/dwarves/runtime)

README.ctracer

@@ -19,7 +19,7 @@ Basic instructions to use ctracer:
 
 mkdir foo
 cd foo
-ln -s /usr/lib/ctracer/* .
+ln -s /usr/share/dwarves/runtime/* .
 make CLASS=sock # to trace struct sock methods, this one is safe, try others
                 # and tell me your horror (or success :-) ) story.
 

lib/ctracer_relay.c

@@ -110,7 +110,7 @@ void ctracer__method_exit(unsigned long long function_id)
 int ctracer__relay_init(void)
 {
 	ctracer__rchan = relay_open("ctracer", NULL, 256 * 1024, 64,
-				    &ctracer__relay_callbacks);
+				    &ctracer__relay_callbacks, NULL);
 	if (ctracer__rchan == NULL) {
 		pr_info("ctracer: couldn't create the relay\n");
 		return -1;

rpm/SPECS/dwarves.spec

@@ -2,20 +2,20 @@
 %define libver 1
 
 Name: dwarves
-Version: 0
-Release: 24
+Version: 1.0
+Release: 1
 License: GPL
 Summary: Dwarf Tools
 Group: Development/Tools
 URL: http://oops.ghostprotocols.net:81/blog
-Source: pahole-%{version}.tar.bz2
+Source: http://http://userweb.kernel.org/~acme/dwarves/%{name}-%{version}.tar.bz2
 BuildRequires: cmake
 BuildRequires: elfutils-devel
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
 dwarves is a set of tools that use the DWARF debugging information inserted in
-ELF binaries by compilers such as GCC , used by well known debuggers such as
+ELF binaries by compilers such as GCC, used by well known debuggers such as
 GDB, and more recent ones such as systemtap.
 
 Utilities in the dwarves suite include pahole, that can be used to find
@@ -50,7 +50,6 @@ make %{?_smp_mflags}
 
 %install
 rm -Rf %{buildroot}
-mkdir -p %{buildroot}{%{_libdir},%{_bindir},%{_includedir},%{_libdir}/ctracer}
 
 make DESTDIR=%{buildroot} install
 
@@ -74,14 +73,14 @@ rm -rf %{buildroot}
 %{_bindir}/pglobal
 %{_bindir}/prefcnt
 %{_bindir}/ostra-cg
-%dir %{_libdir}/ctracer
-%dir %{_libdir}/ctracer/python
+%dir %{_datadir}/dwarves/runtime/
+%dir %{_datadir}/dwarves/runtime/python/
 %defattr(0644,root,root,0755)
-%{_libdir}/ctracer/Makefile
-%{_libdir}/ctracer/ctracer_jprobe.c
-%{_libdir}/ctracer/ctracer_relay.c
-%{_libdir}/ctracer/ctracer_relay.h
-%attr(0755,root,root) %{_libdir}/ctracer/python/ostra.py*
+%{_datadir}/dwarves/runtime/Makefile
+%{_datadir}/dwarves/runtime/ctracer_jprobe.c
+%{_datadir}/dwarves/runtime/ctracer_relay.c
+%{_datadir}/dwarves/runtime/ctracer_relay.h
+%attr(0755,root,root) %{_datadir}/dwarves/runtime/python/ostra.py*
 
 %files -n %{libname}%{libver}
 %defattr(0644,root,root,0755)
@@ -100,7 +99,7 @@ rm -rf %{buildroot}
 %{_libdir}/%{libname}_reorganize.so
 
 %changelog
-* Tue May  8 2007 Arnaldo Carvalho de Melo <acme@redhat.com>
+* Tue May  8 2007 Arnaldo Carvalho de Melo <acme@redhat.com> - 1.0-1
 * 161c6712f4ae1b7e2ea50df3a0d5c28310905cec
 - handle --help, -? --usage on with_executable_option()