summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-11-02 14:10:36 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-11-02 14:10:36 +0000
commitc12d704ff03e0d183149a37724d341b90d42a4c3 (patch)
tree098e357939d1aa69a749927dd2865f0c39e70a69
parent44af80804e5d5e6d8254e7ca714a3df340d7dd2e (diff)
downloadbcfg2-c12d704ff03e0d183149a37724d341b90d42a4c3.tar.gz
bcfg2-c12d704ff03e0d183149a37724d341b90d42a4c3.tar.bz2
bcfg2-c12d704ff03e0d183149a37724d341b90d42a4c3.zip
Fix paths in RPM spec files
Signed-off-by: Sol Jerome <solj@ices.utexas.edu> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5521 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--misc/bcfg2.spec4
-rw-r--r--redhat/bcfg2.spec.in6
2 files changed, 5 insertions, 5 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index d3ea44e4a..0d69fa13f 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -106,8 +106,8 @@ deployment strategies.
%{__install} -d %{buildroot}%{_sysconfdir}/cron.hourly
%{__install} -d %{buildroot}%{_prefix}/lib/bcfg2
%{__mv} %{buildroot}/usr/bin/bcfg2* %{buildroot}%{_sbindir}
-%{__install} -m 755 debian/buildsys/common/bcfg2.init %{buildroot}%{_initrddir}/bcfg2
-%{__install} -m 755 debian/buildsys/common/bcfg2-server.init %{buildroot}%{_initrddir}/bcfg2-server
+%{__install} -m 755 debian/bcfg2.init %{buildroot}%{_initrddir}/bcfg2
+%{__install} -m 755 debian/bcfg2-server.init %{buildroot}%{_initrddir}/bcfg2-server
%{__install} -m 755 debian/bcfg2.default %{buildroot}%{_sysconfdir}/default/bcfg2
%{__install} -m 755 debian/bcfg2.cron.daily %{buildroot}%{_sysconfdir}/cron.daily/bcfg2
%{__install} -m 755 debian/bcfg2.cron.hourly %{buildroot}%{_sysconfdir}/cron.hourly/bcfg2
diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in
index 447e06dac..31351b174 100644
--- a/redhat/bcfg2.spec.in
+++ b/redhat/bcfg2.spec.in
@@ -85,15 +85,15 @@ Configuration management server
%setup -q -n %{name}-%{version}-%{release}
# fixup some paths
-%{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig@g' debian/buildsys/common/bcfg2.init
+%{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig@g' debian/bcfg2.init
%{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig@g' tools/bcfg2-cron
%{__perl} -pi -e 's@/usr/lib/bcfg2@%{_libexecdir}@g' debian/bcfg2.cron.daily
%{__perl} -pi -e 's@/usr/lib/bcfg2@%{_libexecdir}@g' debian/bcfg2.cron.hourly
# don't start servers by default
-%{__perl} -pi -e 's@chkconfig: (\d+)@chkconfig: -@' debian/buildsys/common/bcfg2.init
-%{__perl} -pi -e 's@chkconfig: (\d+)@chkconfig: -@' debian/buildsys/common/bcfg2-server.init
+%{__perl} -pi -e 's@chkconfig: (\d+)@chkconfig: -@' debian/bcfg2.init
+%{__perl} -pi -e 's@chkconfig: (\d+)@chkconfig: -@' debian/bcfg2-server.init
# get rid of extraneous shebangs
for f in `find src/lib -name \*.py`