[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5178: cosmetics: misc comment cleanups, whitespace shell syntax changes
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Tue, 23 Nov 2010 18:01:29 -0000
------------------------------------------------------------
revno: 5178
committer: Diego Biurrun <diego@xxxxxxxxxx>
branch nick: packaging2
timestamp: Tue 2010-11-16 14:50:25 +0100
message:
cosmetics: misc comment cleanups, whitespace shell syntax changes
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-16 13:44:09 +0000
+++ packaging/hipl-deb.spec 2010-11-16 13:50:25 +0000
@@ -60,9 +60,6 @@
# debbuild. Currently they include some files to get the binaries compiled.
# Fix this workaround.
#
-# Note:
-# - 64-bit binaries should go to lib64
-#
# Note: the post rules used to be like this (does not work anymore)
# - update-rc.d hipfw start 20 S . stop 80 0 6 .
# - invoke-rc.d --quiet hipdnsproxy start
=== modified file 'packaging/hipl-rpm.spec'
--- packaging/hipl-rpm.spec 2010-11-16 13:44:09 +0000
+++ packaging/hipl-rpm.spec 2010-11-16 13:50:25 +0000
@@ -25,7 +25,6 @@
%setup
# Note: in subsequent releases me may want to use --disable-debugging
-# Note: CentOS 5.5 requires special cpp flags (see bug id #620327)
%build
autoreconf --install
%configure --prefix=/usr --sysconfdir=/etc
@@ -48,8 +47,6 @@
# create subpackage
# list of files with the name of subpackage
-# XX TODO: copy descriptions from hipl-deb.spec and make sure rpm still builds
-
%package all
Summary: Full HIPL software bundle. This virtual package is suitable e.g. for
client machines.
Group: System Environment/Kernel
@@ -93,8 +90,6 @@
install -d %{buildroot}%{prefix}/share/pixmaps
#end CentOS add
-# XX FIXME: add more python stuff from tools directory
-
make install-strip DESTDIR=%{buildroot}
install -d %{buildroot}/etc/rc.d/init.d
install -m 755 packaging/fedora-init.d/hipfw %{buildroot}/etc/rc.d/init.d/hipfw
@@ -113,8 +108,7 @@
/sbin/ldconfig
%post daemon
-if [ "$1" = "2" ]
-then
+if [ "$1" = "2" ]; then
# upgrade
/sbin/service hipd restart
else
@@ -125,16 +119,14 @@
fi
%preun daemon
-if [ "$1" = "0" ]
-then
- # removing package completely
+if [ "$1" = "0" ]; then
+ # remove daemon completely
/sbin/service hipd stop
/sbin/chkconfig --del hipd
fi
%post dnsproxy
-if [ "$1" = "2" ]
-then
+if [ "$1" = "2" ]; then
# upgrade
/sbin/service hipdnsproxy restart
else
@@ -145,16 +137,14 @@
fi
%preun dnsproxy
-if [ "$1" = "0" ]
-then
- # removing package completely
+if [ "$1" = "0" ]; then
+ # remove daemon completely
/sbin/service hipdnsproxy stop
/sbin/chkconfig --del hipdnsproxy
fi
%post firewall
-if [ "$1" = "2" ]
-then
+if [ "$1" = "2" ]; then
# upgrade
/sbin/service hipfw restart
else
@@ -165,9 +155,8 @@
fi
%preun firewall
-if [ "$1" = "0" ]
-then
- # removing package completely
+if [ "$1" = "0" ]; then
+ # remove daemon completely
/sbin/service hipfw stop
/sbin/chkconfig --del hipfw
fi
@@ -175,7 +164,6 @@
%clean
rm -rf %{buildroot}
-# XX TODO: 64-bit binaries should go to lib64 not lib
%files lib
%{_libdir}
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5178: cosmetics: misc comment cleanups, whitespace shell syntax changes - noreply
