[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5186: Synchronize cosmetical differences between the deb and rpm spec files.
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Tue, 23 Nov 2010 21:01:33 -0000
------------------------------------------------------------
revno: 5186
committer: Diego Biurrun <diego@xxxxxxxxxx>
branch nick: packaging
timestamp: Tue 2010-11-23 21:39:50 +0100
message:
Synchronize cosmetical differences between the deb and rpm spec files.
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-23 20:02:20 +0000
+++ packaging/hipl-deb.spec 2010-11-23 20:39:50 +0000
@@ -10,7 +10,7 @@
Vendor: InfraHIP
License: GPLv2 and MIT/Expat
Group: System Environment/Kernel
-BuildRequires: automake, autoconf, libtool, gcc, libssl-dev, xmlto,
iptables-dev, dpkg-dev, pax
+BuildRequires: gcc automake autoconf libtool xmlto libssl-dev iptables-dev
dpkg-dev pax
ExclusiveOS: linux
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Prefix: /usr
@@ -45,13 +45,13 @@
# before building the final release just to check that you have not discarded
# any essential files.
#
-#define _unpackaged_files_terminate_build 0
-#define _missing_doc_files_terminate_build 0
-#define python_sitelib __python -c 'from distutils import sysconfig; print
sysconfig.get_python_lib()')
-#
-# Note:
-# we are not distributing everything from test directory, just essentials
-#
+#%define _unpackaged_files_terminate_build 0
+#%define _missing_doc_files_terminate_build 0
+#%define python_sitelib __python -c 'from distutils import sysconfig; print
sysconfig.get_python_lib()')
+
+
+# Note: we are not distributing everything from test directory, just essentials
+
# create subpackage
# list of files with the name of subpackage
#
@@ -64,22 +64,21 @@
# - update-rc.d hipfw start 20 S . stop 80 0 6 .
# - invoke-rc.d --quiet hipdnsproxy start
-
%package all
Summary: Full HIPL software bundle. This virtual package is suitable e.g. for
client machines.
Group: System Environment/Kernel
-Requires: hipl-firewall, hipl-daemon, hipl-doc, hipl-dnsproxy
+Requires: hipl-firewall hipl-daemon hipl-doc hipl-dnsproxy
%description all
%package daemon
-Requires: openssl, iptables, libnet-ip-perl, libnet-dns-perl, libsocket6-perl,
libio-socket-inet6-perl
+Requires: openssl iptables libnet-ip-perl libnet-dns-perl libsocket6-perl
libio-socket-inet6-perl
Obsoletes: tools
Summary: HIP for Linux IPsec key management and mobility daemon
Group: System Environment/Kernel
%description daemon
%package firewall
-Requires: openssl, iptables
+Requires: openssl iptables
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.
Group: System Environment/Kernel
%description firewall
@@ -149,7 +148,6 @@
%defattr(755,root,root)
%config /etc/init.d/hipdnsproxy
-
%files firewall
/usr/sbin/hipfw
%config /etc/init.d/hipfw
=== modified file 'packaging/hipl-rpm.spec'
--- packaging/hipl-rpm.spec 2010-11-23 19:48:35 +0000
+++ packaging/hipl-rpm.spec 2010-11-23 20:39:50 +0000
@@ -8,7 +8,7 @@
Vendor: InfraHIP
License: GPLv2 and MIT/Expat
Group: System Environment/Kernel
-BuildRequires: gcc openssl-devel iptables-devel xmlto libtool autoconf
automake rpm-build
+BuildRequires: gcc autoconf automake libtool xmlto openssl-devel
iptables-devel rpm-build
ExclusiveOS: linux
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Prefix: /usr
@@ -54,7 +54,7 @@
%description all
%package daemon
-Requires: perl-Net-IP perl-Net-DNS perl-Socket6 perl-IO-Socket-INET6 openssl
iptables
+Requires: openssl iptables 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
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5186: Synchronize cosmetical differences between the deb and rpm spec files. - noreply