[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5157: Merge hipl-tools package into hipl-daemon package.

------------------------------------------------------------
revno: 5157
committer: Diego Biurrun <diego@xxxxxxxxxx>
branch nick: packaging2
timestamp: Tue 2010-11-16 13:50:47 +0100
message:
  Merge hipl-tools package into hipl-daemon package.
  
  The contents of the hipl-tools package are only useful in connection with
  hipd.  Furthermore, the current aim is to reduce the number of packages,
  so it makes sense to just add the tools to the daemon package.
modified:
  packaging/hipl-deb.spec
  packaging/hipl-rpm.spec


--
lp:hipl
https://code.launchpad.net/~hipl-core/hipl/trunk

Your team HIPL core team is subscribed to branch lp:hipl.
To unsubscribe from this branch go to 
https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'packaging/hipl-deb.spec'
--- packaging/hipl-deb.spec     2010-11-05 14:17:19 +0000
+++ packaging/hipl-deb.spec     2010-11-16 12:50:47 +0000
@@ -72,13 +72,13 @@
 %package all
 Summary: Full HIPL software bundle. This virtual package is suitable e.g. for 
client machines.
 Group: System Environment/Kernel
-Requires: hipl-lib, hipl-firewall, hipl-daemon, hipl-tools, hipl-doc, 
hipl-dnsproxy
+Requires: hipl-lib, hipl-firewall, hipl-daemon, hipl-doc, hipl-dnsproxy
 %description all
 
 %package minimal
 Summary: Minimal HIPL software bundle for servers. This virtual package is 
suitable for e.g. servers.
 Group: System Environment/Kernel
-Requires: hipl-lib, hipl-daemon, hipl-tools
+Requires: hipl-lib, hipl-daemon
 %description minimal
 
 %package lib
@@ -93,12 +93,6 @@
 Group: System Environment/Kernel
 %description daemon
 
-%package tools
-Requires: hipl-lib, hipl-daemon
-Summary: Command line tools to control hipd from command line
-Group: System Environment/Kernel
-%description tools
-
 %package firewall
 Requires: hipl-lib
 Summary: HIPL multi-purpose firewall daemon. Public-key/HIT-based access 
control, Local Scope Identifier support, userspace BEET-mode IPsec (for kernels 
below < 2.6.27) and system-based opportunistic mode for HIP.
@@ -170,6 +164,10 @@
 
 %files daemon
 /usr/sbin/hipd
+/usr/sbin/hipconf
+/usr/sbin/pisacert
+/usr/sbin/nsupdate.pl
+%defattr(755,root,root)
 %config /etc/init.d/hipd
 
 %files dnsproxy
@@ -179,12 +177,6 @@
 %config /etc/init.d/hipdnsproxy
 
 
-%files tools
-/usr/sbin/hipconf
-/usr/sbin/pisacert
-/usr/sbin/nsupdate.pl
-%defattr(755,root,root)
-
 %files firewall
 /usr/sbin/hipfw
 %config /etc/init.d/hipfw

=== modified file 'packaging/hipl-rpm.spec'
--- packaging/hipl-rpm.spec     2010-11-16 10:41:03 +0000
+++ packaging/hipl-rpm.spec     2010-11-16 12:50:47 +0000
@@ -54,13 +54,13 @@
 %package all
 Summary: Full HIPL software bundle. This virtual package is suitable e.g. for 
client machines.
 Group: System Environment/Kernel
-Requires: hipl-lib hipl-firewall hipl-daemon hipl-tools hipl-doc hipl-dnsproxy
+Requires: hipl-lib hipl-firewall hipl-daemon hipl-doc hipl-dnsproxy
 %description all
 
 %package minimal
 Summary: Minimal HIPL software bundle for servers. This virtual package is 
suitable for e.g. servers.
 Group: System Environment/Kernel
-Requires: hipl-lib hipl-daemon hipl-tools
+Requires: hipl-lib hipl-daemon
 %description minimal
 
 %package lib
@@ -71,16 +71,11 @@
 
 %package daemon
 Requires: hipl-lib perl-Net-IP perl-Net-DNS perl-Socket6 perl-IO-Socket-INET6
+Obsoletes: tools
 Summary: HIP for Linux IPsec key management and mobility daemon
 Group: System Environment/Kernel
 %description daemon
 
-%package tools
-Requires: hipl-lib hipl-daemon
-Summary: Command line tools to control hipd from command line
-Group: System Environment/Kernel
-%description tools
-
 %package firewall
 Requires: hipl-lib
 Summary: HIPL multi-purpose firewall daemon. Public-key/HIT-based access 
control, Local Scope Identifier support, userspace BEET-mode IPsec (for kernels 
below < 2.6.27) and system-based opportunistic mode for HIP.
@@ -193,6 +188,9 @@
 
 %files daemon
 %{prefix}/sbin/hipd
+%{prefix}/sbin/hipconf
+%{prefix}/sbin/pisacert
+%{prefix}/sbin/nsupdate.pl
 %config /etc/rc.d/init.d/hipd
 
 %files dnsproxy
@@ -204,12 +202,6 @@
 %defattr(755,root,root)
 %config /etc/rc.d/init.d/hipdnsproxy
 
-%files tools
-%{prefix}/sbin/hipconf
-%{prefix}/sbin/pisacert
-%{prefix}/sbin/nsupdate.pl
-%defattr(755,root,root)
-
 %files firewall
 %{prefix}/sbin/hipfw
 %config /etc/rc.d/init.d/hipfw

Other related posts: