summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Fedora Unity) <kanarip@fedoraunity.org>2008-07-22 00:21:00 +0200
committerJeroen van Meeuwen (Fedora Unity) <kanarip@fedoraunity.org>2008-07-22 00:21:00 +0200
commit812aa0996d373f04f89d788d879da21b1e24d3f1 (patch)
treef3ce2a86dc91787fc7b540f171ca68e0bcbf70d8
parente70bb8ec1393ca1afb6c983c2895908eff5e7558 (diff)
downloadtools-812aa0996d373f04f89d788d879da21b1e24d3f1.tar.gz
tools-812aa0996d373f04f89d788d879da21b1e24d3f1.tar.xz
tools-812aa0996d373f04f89d788d879da21b1e24d3f1.zip
Other then the NODOCS warning, rpmlint is now silent for genome-bridge
-rw-r--r--genome-bridge/Makefile3
-rw-r--r--genome-bridge/genome-bridge6
-rw-r--r--genome-bridge/genome-bridge.spec10
3 files changed, 15 insertions, 4 deletions
diff --git a/genome-bridge/Makefile b/genome-bridge/Makefile
index c25cfdb..9e9dd66 100644
--- a/genome-bridge/Makefile
+++ b/genome-bridge/Makefile
@@ -22,6 +22,9 @@ _RPM_OPTS = --define "_topdir $(RPM_TOPDIR)" \
RPM_OPTS = $(strip $(_RPM_OPTS))
rpm: clean $(RPM_TOPDIR) $(SPECFILE)
+ $(RPMBUILD) $(RPM_OPTS) -ba $(SPECFILE)
+
+srpm: clean $(RPM_TOPDIR) $(SPECFILE)
$(RPMBUILD) $(RPM_OPTS) -bs $(SPECFILE)
clean:
diff --git a/genome-bridge/genome-bridge b/genome-bridge/genome-bridge
index 67f6315..e86311c 100644
--- a/genome-bridge/genome-bridge
+++ b/genome-bridge/genome-bridge
@@ -17,6 +17,7 @@ BRIDGE="genomebr0"
case "$1" in
start)
echo -n $"Starting genome-bridge: "
+ touch /var/lock/subsys/genome-bridge
/usr/bin/pkill -f "dhclient eth0"
/usr/bin/pkill -f "dhclient $BRIDGE"
/usr/sbin/brctl addbr $BRIDGE
@@ -31,8 +32,9 @@ case "$1" in
/sbin/service network restart
/usr/sbin/brctl delbr $BRIDGE
RETVAL=$?
+ rm -rf /var/lock/subsys/genome-bridge
;;
- restart)
+ restart|reload)
$0 stop
$0 start
;;
@@ -47,7 +49,7 @@ case "$1" in
exit $RETVAL
;;
*)
- echo $"Usage: $0 {start|stop|status|restart}"
+ echo $"Usage: $0 {start|stop|status|restart|reload}"
RETVAL=1
esac
diff --git a/genome-bridge/genome-bridge.spec b/genome-bridge/genome-bridge.spec
index a6a2eab..be8a3ac 100644
--- a/genome-bridge/genome-bridge.spec
+++ b/genome-bridge/genome-bridge.spec
@@ -1,5 +1,5 @@
Name: genome-bridge
-Version: 1
+Version: 1.0.0
Release: 2%{?dist}
Summary: Genome network bridge
Group: System Environment/Base
@@ -22,6 +22,12 @@ rm -rf $RPM_BUILD_ROOT
install -Dpm 755 %{SOURCE0} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/genome-bridge
+%post
+/sbin/chkconfig --add %{name}
+
+%preun
+/sbin/chkconfig --del %{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -30,5 +36,5 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/init.d/genome-bridge
%changelog
-* Wed Jul 16 2008 Brenton Leanhardt <bleanhar@redhat.com>
+* Wed Jul 16 2008 Brenton Leanhardt <bleanhar@redhat.com> - 1.0.0-2
- initial pkg