Changeset 423 in MondoRescue for branches/stable/mondo

Timestamp:

Feb 21, 2006, 6:27:48 PM (19 years ago)

Author:

bcornec

Message:

• .spec files adapted to make rpmlint happy
• no more dyn. libs in mondo
• no more the X11 part in mondo

Location:

branches/stable/mondo

Files:

• Makefile.am (modified) (1 diff)
• configure.in (modified) (5 diffs)
• distributions/rpm/mondo.spec (modified) (6 diffs)
• mondo/Makefile.am (modified) (1 diff)
• mondo/common/Makefile.am (modified) (2 diffs)
• mondo/mondoarchive/Makefile.am (modified) (1 diff)
• mondo/mondorestore/Makefile.am (modified) (1 diff)
• mondo/xmondo (deleted)

branches/stable/mondo/Makefile.am

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

branches/stable/mondo/configure.in

@@ -21 +21 @@
 AM_MAINTAINER_MODE
 
-AM_PROG_LIBTOOL
 AC_PROG_CXX
 AC_PROG_AWK
 AC_PROG_CC
+AC_PROG_RANLIB
 AC_PROG_CPP
 AC_PROG_INSTALL
@@ -33 +33 @@
 dnl --with/--enable stuff
 do_static_mr=
-AC_ARG_ENABLE(x11, AS_HELP_STRING(--enable-x11,Create libXmondo and XMondo for X11/KDE support), do_x=$withval, do_x= )
 AC_ARG_ENABLE(static-mr, AS_HELP_STRING(--enable-static-mr,Link mondorestore statically), do_static_mr=$withval, do_static_mr= )
 AC_ARG_ENABLE(debug, AS_HELP_STRING(--enable-debug,Add debugging flags), CFLAGS="$CFLAGS -g", )
@@ -46 +45 @@
 AC_DEFINE_UNQUOTED(MAX_NOOF_MEDIA, $max_noof_media, [Maximum number of media])
 AC_DEFINE_UNQUOTED(EXTTAPE, $exttape, [Tape blocksize])
-if test x$do_x = xyes; then
-    AC_DEFINE(WITH_X, 1, [Define if compiled with X support])
-else
-    AC_DEFINE(WITH_X, 0, [Define if compiled with X support])
-fi
-AM_CONDITIONAL(XWIN, test x$do_x = xyes)
 
 # ( which automake 2>/dev/null >/dev/null && ( automake --version 2>&1 | grep -q 1.5 || automake --version 2>&1 | grep -q 1.7 || AC_MSG_ERROR([Automake must be version 1.5 or 1.7, if you have it at all]) ) )
 
 # Checks for libraries.
-AC_CHECK_LIB([dl], [main])
+dnl AC_CHECK_LIB([dl], [main])
 AC_CHECK_LIB([newt], [newtInit])
 standardthread=0;
@@ -108 +101 @@
 AC_SUBST(LIBS)
 
-if test x$do_x = xyes ; then
-    XMONDO=xmondo
-    QT_LIBRARY=-lqt
-    AC_PATH_XTRA
-    dnl AC_PATH_KDE
-    dnl KDE_USE_QT(3)
-else
-    dnl Automake requires all conditionals to be done sometime; if they're not being
-    dnl done by the KDE checks, they're done here.
-    AM_CONDITIONAL(include_ARTS, false)
-    dnl AC_FIND_BZIP2
-    dnl KDE_CHECK_BINUTILS
-    XMONDO=
-    QT_LIBRARY=
-fi
-AC_SUBST(XMONDO)
-AC_SUBST(QT_LIBRARY)
-
 # Checks for header files.
 AC_HEADER_STDC
@@ -146 +121 @@
 AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr])
 
-if test -n "$qt_includes"; then
-    my_qt_includes="-I$qt_includes"
-else
-    my_qt_includes=""
-fi
-AC_SUBST(my_qt_includes)
-
-if test -n "$qt_libraries"; then
-    my_qt_libraries="-L$qt_libraries"
-else
-    my_qt_libraries=""
-fi
-AC_SUBST(my_qt_libraries)
-
-if test -n "$kde_includes"; then
-    my_kde_includes="-I$kde_includes"
-else
-    my_kde_includes=""
-fi
-AC_SUBST(my_kde_includes)
-
-if test -n "$kde_libraries"; then
-    my_kde_libraries="-L$kde_libraries"
-else
-    my_kde_libraries=""
-fi
-AC_SUBST(my_kde_libraries)
-
-AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/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])
+AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile])

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

@@ -12 +12 @@
 %define addreqb mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
 %define addreq  DDD
+%define rel     %{mrel}
 
 Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
@@ -20 +21 @@
 Name:       %{name}
 Version:    %{version}
-Release:    %{mrel}
+Release:    %{rel}
 License:    GPL
 Group:      %{grp}
@@ -34 +35 @@
 
 %description
-Mondo is a GPL disaster recovery solution to create backup media (CD, DVD, tape, network images) that can be used to redeploy the damaged system, as well as deploy similar or less similar systems.
+Mondo is a GPL disaster recovery solution to create backup media 
+(CD, DVD, tape, network images) that can be used to redeploy the 
+damaged system, as well as deploy similar or less similar systems.
 
 %description -l fr
 Objectif
 """"""""
-Mondo est une solution GPL de sauvegarde en cas de désastre pour créer des médias (CD, DVD, bande, images réseau) qui peuvent être utilisés pour redéployer le système endomangé, aussi bien que des systèmes similaires, ou moins similaires.
+Mondo est une solution GPL de sauvegarde en cas de désastre pour 
+créer des médias (CD, DVD, bande, images réseau) qui peuvent être 
+utilisés pour redéployer le système endomangé, aussi bien que des 
+systèmes similaires, ou moins similaires.
 
 %description -l it
@@ -56 +62 @@
 con cintas y NFS, tambien.
 
-%debug_package
 %prep
 %setup -q -n %name-%{version}
@@ -67 +72 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 %makeinstall
-
-%post
-/sbin/ldconfig
-%{__chmod} 755 %{_libdir}/%{name}/restore-scripts/%{name}/*
-
-%postun
-/sbin/ldconfig
 
 %clean
@@ -85 +83 @@
 
 %attr(755,root,root) %{_sbindir}/*
-#%attr(755,root,root) %{_libdir}/%{name}/restore-scripts/%{name}/*
-%{_libdir}
-%{_mandir}
+%attr(755,root,root) %{_libdir}/%{name}/restore-scripts/%{name}/*
+%attr(755,root,root) %{_libdir}/%{name}/autorun
+%attr(755,root,root) %{_libdir}/%{name}/post-nuke.sample/usr/bin/post-nuke
+%{_libdir}/*
+%{_mandir}/man8/*
 
 %changelog

branches/stable/mondo/mondo/Makefile.am

@@ -1 @@
-# Note that configure will define @XMONDO@ to be "xmondo" if X support
-# is enabled, "" if not
-SUBDIRS        = common mondoarchive mondorestore @XMONDO@ restore-scripts post-nuke.sample
-DIST_SUBDIRS   = common mondoarchive mondorestore xmondo restore-scripts post-nuke.sample
+SUBDIRS        = common mondoarchive mondorestore restore-scripts post-nuke.sample
+DIST_SUBDIRS   = ${SUBDIRS}
 
 pkglib_DATA   = do-not-compress-these autorun

branches/stable/mondo/mondo/common/Makefile.am

@@ -2 +2 @@
 ## Process this file with Automake to generate `Makefile.in'
 ##
+AM_CPPFLAGS = -DMONDO_LIB=\"$(pkglibdir)\"
 
-AM_CPPFLAGS = -DMONDO_LIB=\"$(pkglibdir)\"
-## Headers
+## libmondo
+noinst_LIBRARIES = libmondo.a
 
-noinst_HEADERS       = libmondo-archive.h libmondo-devices.h \
+libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
+                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
+                       libmondo-mountlist.c libmondo-raid.c \
+                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
+                       libmondo-verify.c newt-specific.c \
+                       libmondo-archive.h libmondo-devices.h \
                        libmondo-filelist.h libmondo-files.h libmondo-fork.h \
                        libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
@@ -12 +18 @@
                        libmondo-verify.h libmondo-fifo.h \
                        libmondo-archive-EXT.h my-stuff.h mondostructures.h \
-                       libmondo-devices-EXT.h libmondo-fifo-EXT.h libmondo-filelist-EXT.h \
-                       libmondo-files-EXT.h libmondo-fork-EXT.h libmondo-gui-EXT.h \
-                       libmondo-mountlist-EXT.h libmondo-raid-EXT.h libmondo-stream-EXT.h \
-                       libmondo-string-EXT.h libmondo-tools-EXT.h libmondo-verify-EXT.h \
-                       X-specific.h newt-specific.h
-
-## Libraries
-if XWIN
- XMONDOLIB           = libXmondo.la
-endif XWIN
-lib_LTLIBRARIES      = libmondo.la libmondo-newt.la $(XMONDOLIB)
-
-## libmondo
-libmondo_la_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
-                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
-                       libmondo-mountlist.c libmondo-raid.c \
-                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
-                       libmondo-verify.c
-libmondo_la_LDFLAGS  = -version-info 2:3:0 -shrext .so
-libmondo_la_LIBADD   = @LIBS@
-
-## libmondo-newt
-libmondo_newt_la_SOURCES = newt-specific.c
-libmondo_newt_la_LDFLAGS = -version-info 1:0:0 -shrext .so
-libmondo_newt_la_LIBADD  = -lnewt
-
-## libXmondo
-libXmondo_la_SOURCES = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
-                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
-                       X-specific.cpp libmondo-mountlist.c libmondo-raid.c \
-                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
-                       libmondo-verify.c 
-libXmondo_la_LDFLAGS = -version-info 1:0:0 -shrext .so
-libXmondo_la_LIBADD  = -L/usr/X11R6/lib -L/usr/local/lib @QT_LIBRARY@ @LIBS@ @my_qt_libraries@ @my_kde_libraries@
-libXmondo_la_CFLAGS  = -D_XWIN
-libXmondo_la_CXXFLAGS= -D_XWIN @my_qt_includes@ @my_kde_includes@
+                       libmondo-devices-EXT.h libmondo-fifo-EXT.h \
+                       libmondo-files-EXT.h libmondo-fork-EXT.h \
+                       libmondo-gui-EXT.h libmondo-filelist-EXT.h \
+                       libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
+                       libmondo-string-EXT.h libmondo-tools-EXT.h \
+                       libmondo-verify-EXT.h  libmondo-stream-EXT.h \
+                       newt-specific.h

branches/stable/mondo/mondo/mondoarchive/Makefile.am

@@ -9 +9 @@
 sbin_PROGRAMS        = mondoarchive
 mondoarchive_SOURCES = main.c mondo-cli.c
-mondoarchive_LDADD   = ../common/libmondo.la ../common/libmondo-newt.la
-
-### Man page
-#man1_MANS            = mondoarchive.1
+mondoarchive_LDADD   = ${top_builddir}/mondo/common/libmondo.a

branches/stable/mondo/mondo/mondorestore/Makefile.am

@@ -12 +12 @@
 mondorestore_SOURCES  = mondo-prep.c mondo-restore.c mondo-rstr-newt.c \
                         mondo-rstr-compare.c mondo-rstr-tools.c
-mondorestore_LDADD    = ../common/libmondo.la ../common/libmondo-newt.la @MONDORESTORE_STATIC@
+mondorestore_LDADD    = ${top_builddir}/mondo/common/libmondo.a @MONDORESTORE_STATIC@