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.
There are two configuration files in /usr/bin (stub_gdisp_config.xml and
stub_targa_config.xml). I moved them to the example directory
in /usr/share/tsp.
I split the base tsp package into tsp and tsp-devel (classic division).
In tsp-devel contains all the files needed for development of tsp
applications, in our case only include files.
I removed the attr statements to make everything executable. This is not
needed and wrong for the files in /usr/share/tsp and in /usr/lib/pkgconfig
Maybe we should rename tsp-apidoc to tsp-devel-doc to better indicate the
intended audience.
The resulting packages (on Fedora 7) are with this patch with sizes in bytes:
995159 tsp-0.8.4cvs-1.i386.rpm
819600 tsp-apidoc-0.8.4cvs-1.i386.rpm
618278 tsp-debuginfo-0.8.4cvs-1.i386.rpm
64213 tsp-devel-0.8.4cvs-1.i386.rpm
Comments?
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 9 Nov 2007 19:02:53 -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 9 Nov 2007 19:02:53 -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 9 Nov 2007 19:02:54 -0000
@@ -4,7 +4,7 @@
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
Group: Documentation
Summary: The TSP API Documentation
%description apidoc
The TSP API 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,7 @@
%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
+rm -rf %{rpmprefix}/share/tsp/scripts
%if %{make_apidoc}
rm -rf %{rpmprefix}/share/doc/tsp
mkdir -p %{rpmprefix}/share/doc/tsp
@@ -72,15 +85,13 @@
%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
@@ -89,6 +100,10 @@
%endif
%changelog
+* Fri Nov 9 2007 Robert de Vries <[EMAIL PROTECTED]>
+ - Move include files into separate package tsp-devel
+ - Do not install profile shell scripts
+ - 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
