Changeset 389 for trunk

Timestamp:

06/30/07 17:25:50 (17 years ago)

Author:

bastiaans

Message:

pkg/rpm/jobmonarch-jobmond.spec:

• install in usr/bin like deb pkg

Makefile:

• added rpm-jobmond

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• pkg/rpm/jobmonarch-jobmond.spec (modified) (1 diff)

trunk/Makefile

@@ -11 +11 @@
 debian: deb-jobmond deb-jobarchived deb-webfrontend
 
-#rpm-binary:
+rpm: rpm-jobmond
 
-#all:   tarball debian-binary rpm-binary
+all:    tarball debian rpm
 
 tarball:        tarball-gzip tarball-bzip
@@ -65 +65 @@
         cp ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}.deb .
 
+rpm-jobmond:    ${REQUIRED}
+        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}>/dev/null >/dev/null
+        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/etc/init.d >/dev/null
+        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/usr/bin >/dev/null
+        install -m 755 jobmond/jobmond.py ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/usr/bin
+        ( cd ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/usr/bin; ln -s jobmond.py jobmond || true)
+        install jobmond/jobmond.conf ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/etc
+        install pkg/init.d/jobmond ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/etc/init.d
+        cp pkg/rpm/jobmonarch-jobmond.spec \
+        ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/jobmonarch-jobmond-${VERSION}-${RELEASE}.spec
+        ( cd ${TMPDIR}/.monarch_buildroot/; \
+        cat jobmonarch-jobmond-${VERSION}-${RELEASE}/jobmonarch-jobmond-${VERSION}-${RELEASE}.spec \
+        | sed "s/^Buildroot:.*$//Buildroot: \${TMPDIR}\/\.monarch_buildroot\/jobmonarch-jobmond-${VERSION}-${RELEASE}/g" \
+        | sed "s/^Version:.*$//Version: ${VERSION}/g" \
+        | sed "s/^Release:.*$//Release: ${RELEASE}/g" \
+        >jobmonarch-jobmond-${VERSION}-${RELEASE}/jobmonarch-jobmond-${VERSION}-${RELEASE}.spec.new; \
+        mv jobmonarch-jobmond-${VERSION}-${RELEASE}/jobmonarch-jobmond-${VERSION}-${RELEASE}.spec.new \
+        jobmonarch-jobmond-${VERSION}-${RELEASE}/jobmonarch-jobmond-${VERSION}-${RELEASE}.spec )
+        ( cd ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}; \
+        fakeroot rpmbuild -bb jobmonarch-jobmond-${VERSION}-${RELEASE}.spec )
+        cp ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}.*.rpm .
+
 clean:  ${TMPDIR}/.monarch_buildroot
         rm -rf ${TMPDIR}/.monarch_buildroot

trunk/pkg/rpm/jobmonarch-jobmond.spec

@@ -48 +48 @@
 %files
 "/etc/init.d/jobmond"
-"/usr/sbin/jobmond.py"
-"/usr/sbin/jobmond"
+"/usr/bin/jobmond.py"
+"/usr/bin/jobmond"
 %config "/etc/jobmond.conf"