Changeset 1123

Timestamp:

Nov 30, 2012, 11:08:25 AM (12 years ago)

Author:

joergs

Message:

better handling of extra files. always integrate /etc/nagios/nrpe.d/dasscm.cfg

Location:

dasscm/trunk

Files:

• dasscm.install.sh (modified) (2 diffs)
• dasscm.spec (modified) (4 diffs)

dasscm/trunk/dasscm.install.sh

@@ -10 +10 @@
 fi
 
-if ! [ -d "${DESTDIR}" ]; then
-    echo "failed: DESTDIR ${DESTDIR} is not accessable. Giving up"
-    exit 1
-fi
-
+# if ! [ -d "${DESTDIR}" ]; then
+#     echo "failed: DESTDIR ${DESTDIR} is not accessable. Giving up"
+#     exit 1
+# fi
+mkdir -p ${DESTDIR}
 
 install -d ${DESTDIR}/var/lib/dasscm/
@@ -31 +31 @@
 fi
 
-if test -d /etc/nagios/nrpe.d/; then
+#if test -d /etc/nagios/nrpe.d/; then
     mkdir -p ${DESTDIR}/etc/nagios/nrpe.d/
     install -m 644 etc/nagios/nrpe.d/nrpe-dasscm.cfg ${DESTDIR}/etc/nagios/nrpe.d/dasscm.cfg
-fi
+#fi
 
 install -d ${DESTDIR}/etc/profile.d/

dasscm/trunk/dasscm.spec

@@ -24 +24 @@
 BuildRequires:  gzip pam-modules tar
 %endif
+#BuildRequires:  nagios-nrpe
 
 # Subversion should be installed during build 
@@ -50 +51 @@
 
 # handle special files, not useful on all distributions
-%if %(test -d /etc/bash_completion.d/ && echo 1 || echo 0)
-    %define use_bash_completion 1
-%endif
-%if %(test -d /etc/nagios/nrpe.d/ && echo 1 || echo 0)
-    %define use_nagios_nrpe_d 1
-%endif
+rm -f files
+touch files
+if test -e $RPM_BUILD_ROOT/etc/bash_completion.d/dasscm.sh; then
+    echo '%config(noreplace)  /etc/bash_completion.d/dasscm.sh' >> files
+else
+    echo '%doc                etc/bash_completion.d/bash_completion_dasscm.sh' >> files
+fi
+
+if test -e $RPM_BUILD_ROOT/etc/nagios/nrpe.d/dasscm.cfg; then
+    test -d /etc/nagios        || echo '%dir /etc/nagios' >> files
+    test -d /etc/nagios/nrpe.d || echo '%dir /etc/nagios/nrpe.d' >> files
+    echo '%config(noreplace)  /etc/nagios/nrpe.d/dasscm.cfg' >> files
+else
+    echo '%doc                etc/nagios/nrpe.d/nrpe-dasscm.cfg' >> files
+fi
+
+#cat files
 
 
@@ -65 +77 @@
 #       groupadd -g 4199 dasscm
 
-%files
+%files -f files
 %defattr(-,root,root)
 %dir /var/lib/dasscm/
@@ -75 +87 @@
 %config(noreplace)  %attr(640,root,root) /etc/dasscm.conf
 %config(noreplace)  /etc/profile.d/dasscm.sh
-%if 0%{?use_bash_completion}
-%config(noreplace)  /etc/bash_completion.d/dasscm.sh
-%else
-%doc                etc/bash_completion.d/bash_completion_dasscm.sh
-%endif
-
-%if 0%{?use_nagios_nrpe_d}
-%config(noreplace)  /etc/nagios/nrpe.d/dasscm.cfg
-%else
-%doc                etc/nagios/nrpe.d/nrpe-dasscm.cfg
-%endif
 
 # /etc/sudoers.d/ should not belong to dasscm,