On Friday 09 November 2007 09:48:46 pm Eric Noulard wrote:
> 2007/11/9, Robert de Vries <[EMAIL PROTECTED]>:
> > Hi all,
> >
> > When I was checking the contents of the current RPM package, I noticed a
> > couple of things.
> > The profile files for tsp are no longer necessary, now that the TSP
> > libraries are in /usr/lib, the binaries in /usr/bin. I also removed them
> > from /usr/share/tsp/scripts.
>
> I think it would be better to keep them in /usr/share/tsp/scripts
> while removing thing from /etc/profile.d
> this way one may install tsp at unusual location
> (may be with rpm -i --prefix=/unsual/path)
> and eventually use those scripts files.
>
OK, I'll leave that in. I have not yet created relocatable packages yet, so
I'll leave those files in for now, until someone figures out what to do to
make a package actually relocatable.
>
> > Maybe we should rename tsp-apidoc to tsp-devel-doc to better indicate the
> > intended audience.
I renamed it to tsp-doc for now.
If we could integrate the documentation in the tsp_docs directory into this
package that would be useful.
>
> This package is ill-named in the first place since you may find
> developer documentation AND user doc for example for the
> tsp applications;
>
> see for examples sub-modules of TSP_Applications:
> http://www.ts2p.org/tsp/API_doc/html/group__TSP__Applications.html
> (this generated doc is oudated but the idea is here)
>
>
> Seems Ok with the 2 remarks:
>
> 1) keep scripts in /usr/share/tsp/scripts
> 2) may be tsp-apidoc should be renamed as tsp-doc?
> (but the doxygen content is not finished [yet])
>
> You are very active on TSP those days keep going :=)
If you are fine with the attached patch I will commit it.
I think we should add version numbers to the .so files and also add version
scripts to the link lines of the .so files.
I also would like to see that some of the .so files to be combined.
To link a consumer application you have to link against 3 tsp libraries:
tsp_consumer tsp_common and tsp_services.
The sizes of these libraries are:
175236 /usr/lib/libtsp_consumer.so
10546 /usr/lib/libtsp_services.so
12173 /usr/lib/libtsp_util.so
For a provider the same libraries are needed (replace consumer lib with
provider lib)
Robert
Index: src/consumers/gdisp/CMakeLists.txt
===================================================================
RCS file: /sources/tsp/tsp/src/consumers/gdisp/CMakeLists.txt,v
retrieving revision 1.6
diff -u -r1.6 CMakeLists.txt
--- src/consumers/gdisp/CMakeLists.txt 27 Feb 2007 05:52:22 -0000 1.6
+++ src/consumers/gdisp/CMakeLists.txt 11 Nov 2007 12:58:49 -0000
@@ -1,6 +1,7 @@
-TSP_XSCRIPT(
- stub_gdisp_config.xml
- )
+INSTALL(
+ FILES
+ stub_gdisp_config.xml
+ DESTINATION ${TSP_SHARE_BASEDIR}/example)
SET(GDISP_SRC interface
support gdispmain
Index: src/consumers/gdisp+/CMakeLists.txt
===================================================================
RCS file: /sources/tsp/tsp/src/consumers/gdisp+/CMakeLists.txt,v
retrieving revision 1.6
diff -u -r1.6 CMakeLists.txt
--- src/consumers/gdisp+/CMakeLists.txt 18 Oct 2006 14:11:57 -0000 1.6
+++ src/consumers/gdisp+/CMakeLists.txt 11 Nov 2007 12:58:49 -0000
@@ -1,6 +1,8 @@
-TSP_XSCRIPT(
- stub_targa_config.xml
- )
+INSTALL(
+ FILES
+ stub_targa_config.xml
+ DESTINATION ${TSP_SHARE_BASEDIR}/example)
+
SET(TARGA_SRC
gdisp_main gdisp_kernel
gdisp_preferences gdisp_configuration
Index: src/scripts/tsp.spec.in
===================================================================
RCS file: /sources/tsp/tsp/src/scripts/tsp.spec.in,v
retrieving revision 1.10
diff -u -r1.10 tsp.spec.in
--- src/scripts/tsp.spec.in 6 Nov 2007 20:52:15 -0000 1.10
+++ src/scripts/tsp.spec.in 11 Nov 2007 12:58:49 -0000
@@ -1,10 +1,10 @@
# -*- rpm-spec -*-
-Summary: TSP : library for a generic Transport Sampling Protocol
+Summary: TSP: library for a generic Transport Sample Protocol
Name: tsp
Version: @PACKAGE_VERSION@
Release: 1
Group: Applications/Communications
-URL: https://savannah.nongnu.org/projects/tsp
+URL: http://savannah.nongnu.org/projects/tsp
License: LGPL
Vendor: The TSP Team Worldwide
Source: %{name}-%{version}-Source.tar.gz
@@ -15,19 +15,34 @@
%define make_apidoc @RPM_MAKE_APIDOC@
+%package devel
+Group: Development/Libraries
+Summary: Libraries, includes, etc. to develop TSP applications.
+%description devel
+Libraries, includes, etc. to develop TSP applications.
+TSP: library for a generic Transport Sample Protocol
+TSP is both a protocol and a library available in C and Java
+that may be used to observe evolutionary data.
+Main applications of TSP are test beds and simulator
+be it realtime or not.
-%package apidoc
+%package doc
Group: Documentation
-Summary: The TSP API Documentation
-%description apidoc
-The TSP API documentation as generated by doxygen
+Summary: The TSP Documentation
+%description doc
+The TSP documentation as generated by doxygen
+TSP: library for a generic Transport Sample Protocol
+TSP is both a protocol and a library available in C and Java
+that may be used to observe evolutionary data.
+Main applications of TSP are test beds and simulator
+be it realtime or not.
%define prefix @CMAKE_INSTALL_PREFIX@
%define rpmprefix $RPM_BUILD_ROOT%{prefix}
%define tspsrcdirname %{name}-%{version}-Source
%description
-TSP : library for a generic Transport Sampling Protocol
+TSP: library for a generic Transport Sample Protocol
TSP is both a protocol and a library available in C and Java
that may be used to observe evolutionary data.
Main applications of TSP are test beds and simulator
@@ -46,7 +61,7 @@
%else
cmake -DCMAKE_INSTALL_PREFIX=%{rpmprefix} ../%{tspsrcdirname}
%endif
-make
+make %{?_smp_mflags}
%if %{make_apidoc}
make apidoc
%endif
@@ -54,9 +69,6 @@
%install
cd ../build_tree
make install
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-cp %{rpmprefix}/share/tsp/scripts/tsp.profile.sh $RPM_BUILD_ROOT/etc/profile.d/tsp.sh
-cp %{rpmprefix}/share/tsp/scripts/tsp.profile.csh $RPM_BUILD_ROOT/etc/profile.d/tsp.csh
%if %{make_apidoc}
rm -rf %{rpmprefix}/share/doc/tsp
mkdir -p %{rpmprefix}/share/doc/tsp
@@ -72,23 +84,26 @@
%files
%defattr(-,root,root,-)
-%dir %{prefix}
-%dir %{prefix}/bin
-%{prefix}/lib
+%{prefix}/bin/*
+%{prefix}/lib/lib*
+%{prefix}/share/tsp
+%{prefix}/lib/pkgconfig/*
+
+%files devel
%{prefix}/include/tsp
-%dir %{prefix}/share/tsp
-%attr(0755, root, root) %{prefix}/bin/*
-%attr(0755, root, root) %{prefix}/share/tsp/*
-%attr(0755, root, root) %{prefix}/lib/pkgconfig/*
-%attr(0755, root, root) /etc/profile.d/*
%if %{make_apidoc}
-%files apidoc
+%files doc
%defattr(-,root,root,-)
%{prefix}/share/doc/tsp
%endif
%changelog
+* Sun Nov 11 2007 Robert de Vries <[EMAIL PROTECTED]>
+ - Move include files into separate package tsp-devel
+ - Rename tsp-apidoc package to tsp-doc
+ - Do not install profile shell scripts in /etc/profile.d
+ - Do not set x bits for config files
* Mon Jun 25 2007 Erk <[EMAIL PROTECTED]>
- late update for apidoc subpackage
as noticed by Olivier.
_______________________________________________
Tsp-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/tsp-devel
