Changeset 402 in MondoRescue for branches/stable/mondo

Timestamp:

Feb 17, 2006, 7:05:06 PM (18 years ago)

Author:

bcornec

Message:

• RPM build for mondo doc recoded
• Tag for documentation, man pages
• Include a patch from SuSE RPMs for mondo

Location:

branches/stable/mondo

Files:

• Makefile.am (modified) (1 diff)
• distributions/rpm/mondo.spec (modified) (3 diffs)
• mondo/common/my-stuff.h (modified) (1 diff)
• mondo/docs (deleted)

branches/stable/mondo/Makefile.am

@@ -1 +1 @@
 AUTOMAKE_OPTIONS = 1.7
 SUBDIRS   = mondo
-man8_MANS = mondo/mondoarchive/mondoarchive.8 mondo/mondorestore/mondorestore.8
+man8_MANS = docs/man/mondoarchive.8 docs/man/mondorestore.8

branches/stable/mondo/distributions/rpm/mondo.spec

@@ -61 +61 @@
 
 %build
-%configure %{!?_without_xmondo:--with-x11}
+%configure
 %{__make} VERSION=%{version} CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
 
@@ -82 +82 @@
 %doc ChangeLog svn.log
 %doc INSTALL COPYING README TODO AUTHORS NEWS
+%doc docs/en/mondorescue-howto.html docs/en/mondorescue-howto.pdf
 
 %attr(755,root,root) %{_sbindir}/*
@@ -88 +89 @@
 %{_mandir}
 
-#%{!?_without_xmondo:%files xmondo}
-#%{!?_without_xmondo:%{_sbindir}/xmondo}
-#%{!?_without_xmondo:%{_libdir}/libXmondo-%{libversion}.so}
-#%{!?_without_xmondo:%{_libdir}/libXmondo.so}
-#%{!?_without_xmondo:%{_datadir}/mondo/mondo.png}
-
 %changelog
+* Fri Feb 17 2006 Bruno Cornec <bcornec@users.berlios.de> 2.0.7
+- Updated to 2.0.7
+- RPM sepc files are now generated
+
 * Fri Nov 05 2005 Bruno Cornec <bcornec@users.berlios.de> 1.05
 - ia64 is now working

branches/stable/mondo/mondo/common/my-stuff.h

@@ -443 +443 @@
  * Malloc @p x to be MAX_STR_LEN bytes and call fatal_error() if we're out of memory.
  */
-#define malloc_string(x) { x = malloc(MAX_STR_LEN); if (!x) { fatal_error("Unable to malloc"); } x[0] = x[1] = '\0'; }
+#define malloc_string(x) { x = (char *)malloc(MAX_STR_LEN); if (!x) { fatal_error("Unable to malloc"); } x[0] = x[1] = '\0'; }
 
 /**