Changeset 250 in MondoRescue

Timestamp:

Dec 20, 2005, 7:38:11 PM (18 years ago)

Author:

bcornec

Message:

merge -r243:249 $SVN_M/branches/2.05

Location:

trunk

Files:

• mindi/install.sh (modified) (3 diffs)
• mindi/mindi.spec (modified) (3 diffs)
• mondo/configure.in (modified) (1 diff)
• mondo/mondo.spec (modified) (3 diffs)
• mondo/mondo/Makefile.am (modified) (1 diff)
• mondo/mondo/post-nuke.sample/Makefile.am (copied) (copied from branches/2.05/mondo/mondo/post-nuke.sample/Makefile.am )
• mondo/mondo/post-nuke.sample/usr/Makefile.am (copied) (copied from branches/2.05/mondo/mondo/post-nuke.sample/usr/Makefile.am )
• mondo/mondo/post-nuke.sample/usr/bin/Makefile.am (copied) (copied from branches/2.05/mondo/mondo/post-nuke.sample/usr/bin/Makefile.am )

trunk/mindi/install.sh

@@ -31 +31 @@
 echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
 
-if [ "_$DOCDIR" = "_" ]; then
-    DOCDIR=$local/share/doc/mindi-$MINDIVER
-fi
+DOCDIR=$local/share/doc/mindi-$MINDIVER
+MANDIR=$local/share/man/man8
 
 echo "Creating target directories ..."
-install -m 755 -d $conf $local/lib/mindi $local/share/man/man8 $local/sbin $DOCDIR
+install -m 755 -d $conf $local/lib/mindi $MANDIR $local/sbin $DOCDIR
 
 echo "Copying files ..."
@@ -55 +54 @@
 install -m 755 analyze-my-lvm parted2fdisk.pl $local/sbin
 
-install -m 644 mindi.8 $local/share/man/man8
+install -m 644 mindi.8 $MANDIR
 install -m 644 CHANGES COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $DOCDIR
 
@@ -104 +103 @@
 if [ "$RPMBUILDMINDI" != "true" ]; then
     chown -R root:root $local/lib/mindi $conf/mindi $conf $DOCDIR
-    chown root:root $local/sbin/mindi $local/share/man/man8/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl 
+    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl 
     if [ "$ARCH" = "ia64" ] ; then
         chown root:root $local/sbin/parted2fdisk

trunk/mindi/mindi.spec

@@ -11 +11 @@
 %define version VVV
 %define mrel    1
-%define docname     %{name}-%{version}
 %define src     %{name}-%{version}.tgz
 
@@ -33 +32 @@
 %if %is_suse
 Group:          Archiving/Backup
-%define docname     %{name}
 %endif
 
@@ -72 +70 @@
 export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
 export RPMBUILDMINDI="true"
-export DOCDIR=${RPM_BUILD_ROOT}${RPM_DOC_DIR}/%{docname}
 
 ./install.sh
+
+%if %is_suse
+%{__rm} -rf $RPM_BUILD_ROOT/%{_datadir}/doc/%name-%{version}
+%endif
 
 %clean

trunk/mondo/configure.in

@@ -126 +126 @@
 AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr getline asprintf trunc vasprintf])
 
-AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/docs/Makefile mondo/docs/en/Makefile mondo/docs/en/1.6x-howto/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile])
+AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/docs/Makefile mondo/docs/en/Makefile mondo/docs/en/1.6x-howto/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/xmondo/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile])

trunk/mondo/mondo.spec

@@ -11 +11 @@
 %define version VVV
 %define mrel    1
+%define src     %{name}-%{version}.tgz
 
 %if %is_redhat
-%define src     %{name}-%{version}.tgz
 Group:          Applications/Archiving
 Autoreq:        0
@@ -31 +31 @@
 
 %if %is_suse
-%define src     %{name}-%{version}.tgz
 Group:          Archiving/Backup
 %endif
@@ -101 +100 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 %makeinstall
+%if %is_suse
+%{__rm} -rf $RPM_BUILD_ROOT/%{_datadir}/doc/%name-%{version}
+%endif
 
 %post

trunk/mondo/mondo/Makefile.am

@@ -1 @@
-SUBDIRS        = common mondoarchive mondorestore docs restore-scripts
+SUBDIRS        = common mondoarchive mondorestore docs restore-scripts post-nuke.sample
+DIST_SUBDIRS   = common mondoarchive mondorestore xmondo docs restore-scripts post-nuke.sample
 
 pkglib_DATA   = do-not-compress-these
-
-install-data-hook: post-nuke.sample
-    cp -R post-nuke.sample $(pkglibdir)/