Changeset 423


Ignore:
Timestamp:
Feb 21, 2006, 6:27:48 PM (13 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
Files:
1 deleted
17 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/distributions/rpm/mindi.spec

    r401 r423  
    99%define addreqb bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools
    1010%define addreq  DDD
    11 
    12 # if mandriva official build (rpm --with is_official)
    13 %{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
    14 
    15 # define the mkrel macro if it is not already defined if mandriva offical build
    16 %if is_official
    17 %{?!mkrel:%define mkrel(c:) %{-c:0.%{-c*}.}%{!?_with_unstable:%(perl -e '$_="%{1}";m/(.\*)(\\d+)$/;$rel=${2}-1;re;print "$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo $[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}}
    18 %endif
     11%define rel     %{mrel}
    1912
    2013Summary:    Mindi creates emergency boot disks/CDs using your kernel, tools and modules
     
    3730verify packages, etc.
    3831
    39 %debug_package
    4032%prep
    4133%{__rm}  -rf $RPM_BUILD_ROOT
     
    6254
    6355%post
    64 for i in %{_libdir}/mindi/aux-tools/sbin/* %{_libdir}/mindi/rootfs/bin/* %{_libdir}/mindi/rootfs/sbin/* ; do
    65     if [ ! -h $i ]; then
    66         %{__chmod} 755 $i
    67     fi
    68 done
    6956if [ -f /usr/local/sbin/mindi ]; then
    7057    echo "WARNING: /usr/local/sbin/mindi exists. You should probably remove your manual mindi installation !"
     
    7562%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
    7663%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
    77 %{_mandir}
     64%{_mandir}/man8/*
    7865%{_libdir}/mindi
    7966%attr(755,root,root) %{_sbindir}/*
     67%attr(755,root,root) %{_libdir}/mindi/aux-tools/sbin/*
     68%attr(755,root,root) %{_libdir}/mindi/rootfs/bin/*
     69%attr(755,root,root) %{_libdir}/mindi/rootfs/sbin/*
    8070
    8171%changelog
  • branches/stable/mindi/mindi

    r401 r423  
    28112811        [ "$USE_LZO" = "yes" ] && echo -en "Pras 4 Pres 2004" >> $mountpoint/tmp/USING-LZO
    28122812        [ "$USE_COMP" = "yes" ] && echo -en "Compression, yep" >> $mountpoint/tmp/USING-COMP
    2813     [ "$USE_STAR" = "yes" ] && echo =en "Using star. Hooray." >> $mountpoint/tmp/USING-STAR
     2813        [ "$USE_STAR" = "yes" ] && echo -en "Using star. Hooray." >> $mountpoint/tmp/USING-STAR
    28142814    fi
    28152815    mkdir -p $mountpoint/tmp
  • branches/stable/mindi/rootfs/proc/.keep

    r1 r423  
     1 
  • branches/stable/mindi/rootfs/tmp/mondo-restore.cfg

    r30 r423  
     1 
  • branches/stable/mindi/rootfs/var/log/wtmp

    r1 r423  
     1 
  • branches/stable/mindi/rootfs/var/run/utmp

    r1 r423  
     1 
  • branches/stable/mondo/Makefile.am

    r402 r423  
    11AUTOMAKE_OPTIONS = 1.7
    2 SUBDIRS   = mondo
    3 man8_MANS = docs/man/mondoarchive.8 docs/man/mondorestore.8
     2SUBDIRS        = mondo
     3man8_MANS      = docs/man/mondoarchive.8 docs/man/mondorestore.8
  • branches/stable/mondo/configure.in

    r415 r423  
    2121AM_MAINTAINER_MODE
    2222
    23 AM_PROG_LIBTOOL
    2423AC_PROG_CXX
    2524AC_PROG_AWK
    2625AC_PROG_CC
     26AC_PROG_RANLIB
    2727AC_PROG_CPP
    2828AC_PROG_INSTALL
     
    3333dnl --with/--enable stuff
    3434do_static_mr=
    35 AC_ARG_ENABLE(x11, AS_HELP_STRING(--enable-x11,Create libXmondo and XMondo for X11/KDE support), do_x=$withval, do_x= )
    3635AC_ARG_ENABLE(static-mr, AS_HELP_STRING(--enable-static-mr,Link mondorestore statically), do_static_mr=$withval, do_static_mr= )
    3736AC_ARG_ENABLE(debug, AS_HELP_STRING(--enable-debug,Add debugging flags), CFLAGS="$CFLAGS -g", )
     
    4645AC_DEFINE_UNQUOTED(MAX_NOOF_MEDIA, $max_noof_media, [Maximum number of media])
    4746AC_DEFINE_UNQUOTED(EXTTAPE, $exttape, [Tape blocksize])
    48 if test x$do_x = xyes; then
    49     AC_DEFINE(WITH_X, 1, [Define if compiled with X support])
    50 else
    51     AC_DEFINE(WITH_X, 0, [Define if compiled with X support])
    52 fi
    53 AM_CONDITIONAL(XWIN, test x$do_x = xyes)
    5447
    5548# ( 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]) ) )
    5649
    5750# Checks for libraries.
    58 AC_CHECK_LIB([dl], [main])
     51dnl AC_CHECK_LIB([dl], [main])
    5952AC_CHECK_LIB([newt], [newtInit])
    6053standardthread=0;
     
    108101AC_SUBST(LIBS)
    109102
    110 if test x$do_x = xyes ; then
    111     XMONDO=xmondo
    112     QT_LIBRARY=-lqt
    113     AC_PATH_XTRA
    114     dnl AC_PATH_KDE
    115     dnl KDE_USE_QT(3)
    116 else
    117     dnl Automake requires all conditionals to be done sometime; if they're not being
    118     dnl done by the KDE checks, they're done here.
    119     AM_CONDITIONAL(include_ARTS, false)
    120     dnl AC_FIND_BZIP2
    121     dnl KDE_CHECK_BINUTILS
    122     XMONDO=
    123     QT_LIBRARY=
    124 fi
    125 AC_SUBST(XMONDO)
    126 AC_SUBST(QT_LIBRARY)
    127 
    128103# Checks for header files.
    129104AC_HEADER_STDC
     
    146121AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr])
    147122
    148 if test -n "$qt_includes"; then
    149     my_qt_includes="-I$qt_includes"
    150 else
    151     my_qt_includes=""
    152 fi
    153 AC_SUBST(my_qt_includes)
    154 
    155 if test -n "$qt_libraries"; then
    156     my_qt_libraries="-L$qt_libraries"
    157 else
    158     my_qt_libraries=""
    159 fi
    160 AC_SUBST(my_qt_libraries)
    161 
    162 if test -n "$kde_includes"; then
    163     my_kde_includes="-I$kde_includes"
    164 else
    165     my_kde_includes=""
    166 fi
    167 AC_SUBST(my_kde_includes)
    168 
    169 if test -n "$kde_libraries"; then
    170     my_kde_libraries="-L$kde_libraries"
    171 else
    172     my_kde_libraries=""
    173 fi
    174 AC_SUBST(my_kde_libraries)
    175 
    176 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])
     123AC_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

    r415 r423  
    1212%define addreqb mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
    1313%define addreq  DDD
     14%define rel     %{mrel}
    1415
    1516Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
     
    2021Name:       %{name}
    2122Version:    %{version}
    22 Release:    %{mrel}
     23Release:    %{rel}
    2324License:    GPL
    2425Group:      %{grp}
     
    3435
    3536%description
    36 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.
     37Mondo is a GPL disaster recovery solution to create backup media
     38(CD, DVD, tape, network images) that can be used to redeploy the
     39damaged system, as well as deploy similar or less similar systems.
    3740
    3841%description -l fr
    3942Objectif
    4043""""""""
    41 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.
     44Mondo est une solution GPL de sauvegarde en cas de désastre pour
     45créer des médias (CD, DVD, bande, images réseau) qui peuvent être
     46utilisés pour redéployer le système endomangé, aussi bien que des
     47systèmes similaires, ou moins similaires.
    4248
    4349%description -l it
     
    5662con cintas y NFS, tambien.
    5763
    58 %debug_package
    5964%prep
    6065%setup -q -n %name-%{version}
     
    6772%{__rm} -rf $RPM_BUILD_ROOT
    6873%makeinstall
    69 
    70 %post
    71 /sbin/ldconfig
    72 %{__chmod} 755 %{_libdir}/%{name}/restore-scripts/%{name}/*
    73 
    74 %postun
    75 /sbin/ldconfig
    7674
    7775%clean
     
    8583
    8684%attr(755,root,root) %{_sbindir}/*
    87 #%attr(755,root,root) %{_libdir}/%{name}/restore-scripts/%{name}/*
    88 %{_libdir}
    89 %{_mandir}
     85%attr(755,root,root) %{_libdir}/%{name}/restore-scripts/%{name}/*
     86%attr(755,root,root) %{_libdir}/%{name}/autorun
     87%attr(755,root,root) %{_libdir}/%{name}/post-nuke.sample/usr/bin/post-nuke
     88%{_libdir}/*
     89%{_mandir}/man8/*
    9090
    9191%changelog
  • branches/stable/mondo/mondo/Makefile.am

    r341 r423  
    1 # Note that configure will define @XMONDO@ to be "xmondo" if X support
    2 # is enabled, "" if not
    3 SUBDIRS        = common mondoarchive mondorestore @XMONDO@ restore-scripts post-nuke.sample
    4 DIST_SUBDIRS   = common mondoarchive mondorestore xmondo restore-scripts post-nuke.sample
     1SUBDIRS        = common mondoarchive mondorestore restore-scripts post-nuke.sample
     2DIST_SUBDIRS   = ${SUBDIRS}
    53
    64pkglib_DATA   = do-not-compress-these autorun
  • branches/stable/mondo/mondo/common/Makefile.am

    r182 r423  
    22## Process this file with Automake to generate `Makefile.in'
    33##
     4AM_CPPFLAGS = -DMONDO_LIB=\"$(pkglibdir)\"
    45
    5 AM_CPPFLAGS = -DMONDO_LIB=\"$(pkglibdir)\"
    6 ## Headers
     6## libmondo
     7noinst_LIBRARIES = libmondo.a
    78
    8 noinst_HEADERS       = libmondo-archive.h libmondo-devices.h \
     9libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
     10                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
     11                       libmondo-mountlist.c libmondo-raid.c \
     12                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
     13                       libmondo-verify.c newt-specific.c \
     14                       libmondo-archive.h libmondo-devices.h \
    915                       libmondo-filelist.h libmondo-files.h libmondo-fork.h \
    1016                       libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
     
    1218                       libmondo-verify.h libmondo-fifo.h \
    1319                       libmondo-archive-EXT.h my-stuff.h mondostructures.h \
    14                        libmondo-devices-EXT.h libmondo-fifo-EXT.h libmondo-filelist-EXT.h \
    15                        libmondo-files-EXT.h libmondo-fork-EXT.h libmondo-gui-EXT.h \
    16                        libmondo-mountlist-EXT.h libmondo-raid-EXT.h libmondo-stream-EXT.h \
    17                        libmondo-string-EXT.h libmondo-tools-EXT.h libmondo-verify-EXT.h \
    18                        X-specific.h newt-specific.h
    19 
    20 ## Libraries
    21 if XWIN
    22  XMONDOLIB           = libXmondo.la
    23 endif XWIN
    24 lib_LTLIBRARIES      = libmondo.la libmondo-newt.la $(XMONDOLIB)
    25 
    26 ## libmondo
    27 libmondo_la_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
    28                        libmondo-filelist.c libmondo-files.c libmondo-fork.c \
    29                        libmondo-mountlist.c libmondo-raid.c \
    30                        libmondo-stream.c libmondo-string.c libmondo-tools.c \
    31                        libmondo-verify.c
    32 libmondo_la_LDFLAGS  = -version-info 2:3:0 -shrext .so
    33 libmondo_la_LIBADD   = @LIBS@
    34 
    35 ## libmondo-newt
    36 libmondo_newt_la_SOURCES = newt-specific.c
    37 libmondo_newt_la_LDFLAGS = -version-info 1:0:0 -shrext .so
    38 libmondo_newt_la_LIBADD  = -lnewt
    39 
    40 ## libXmondo
    41 libXmondo_la_SOURCES = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
    42                        libmondo-filelist.c libmondo-files.c libmondo-fork.c \
    43                        X-specific.cpp libmondo-mountlist.c libmondo-raid.c \
    44                        libmondo-stream.c libmondo-string.c libmondo-tools.c \
    45                        libmondo-verify.c
    46 libXmondo_la_LDFLAGS = -version-info 1:0:0 -shrext .so
    47 libXmondo_la_LIBADD  = -L/usr/X11R6/lib -L/usr/local/lib @QT_LIBRARY@ @LIBS@ @my_qt_libraries@ @my_kde_libraries@
    48 libXmondo_la_CFLAGS  = -D_XWIN
    49 libXmondo_la_CXXFLAGS= -D_XWIN @my_qt_includes@ @my_kde_includes@
     20                       libmondo-devices-EXT.h libmondo-fifo-EXT.h \
     21                       libmondo-files-EXT.h libmondo-fork-EXT.h \
     22                       libmondo-gui-EXT.h libmondo-filelist-EXT.h \
     23                       libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
     24                       libmondo-string-EXT.h libmondo-tools-EXT.h \
     25                       libmondo-verify-EXT.h  libmondo-stream-EXT.h \
     26                       newt-specific.h
  • branches/stable/mondo/mondo/mondoarchive/Makefile.am

    r30 r423  
    99sbin_PROGRAMS        = mondoarchive
    1010mondoarchive_SOURCES = main.c mondo-cli.c
    11 mondoarchive_LDADD   = ../common/libmondo.la ../common/libmondo-newt.la
    12 
    13 ### Man page
    14 #man1_MANS            = mondoarchive.1
     11mondoarchive_LDADD   = ${top_builddir}/mondo/common/libmondo.a
  • branches/stable/mondo/mondo/mondorestore/Makefile.am

    r30 r423  
    1212mondorestore_SOURCES  = mondo-prep.c mondo-restore.c mondo-rstr-newt.c \
    1313                        mondo-rstr-compare.c mondo-rstr-tools.c
    14 mondorestore_LDADD    = ../common/libmondo.la ../common/libmondo-newt.la @MONDORESTORE_STATIC@
     14mondorestore_LDADD    = ${top_builddir}/mondo/common/libmondo.a @MONDORESTORE_STATIC@
  • branches/stable/tools/mkcommon

    r402 r423  
    5555    svn export ${VER}/mondo mondo-${MONDO_VER}
    5656    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
    57     mkdir -p mondo-${MONDO_VER}/docs/man
    58     cp -a ${VER}/documentation/mondo*.8 mondo-${MONDO_VER}/docs/man
    5957    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
    6058    rm -rf documentation-${MONDO_VER}
  • branches/stable/tools/mkrpm

    r388 r423  
    2929    mkdir -p ${TOPDIR}/SOURCES
    3030    $TOOLHOME/mkspec ${MINDI_VER} mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
    31     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
     31    pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
     32    pkg="$pkg $pkg1"
     33    rm -f $pkg1
    3234fi
    3335if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     
    3739    mkdir -p ${TOPDIR}/SOURCES
    3840
    39     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
     41    pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
     42    pkg="$pkg $pkg1"
     43    rm -f $pkg1
    4044    # ATTENTION: This could be dangerous for your setup
    4145    opt="rm -rf /usr/lib/mindi ;"
     
    4650    rm -rf mondo-${MONDO_VER}/distributions
    4751
    48     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
     52    pkg1="${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
     53    pkg="$pkg $pkg1"
     54    rm -f $pkg1
    4955fi
    5056
  • branches/stable/website/download.shtml

    r369 r423  
    1        <B><A HREF="isos/mondo-install-cd.iso">NEW! Installer CD</A></B> - if
    2        you have the time or bandwidth, please try this CD (image). It is
    3        updated on Sundays and Mondays.</P>
    4       <P ALIGN=JUSTIFY>
    51       <B><A HREF="isos/mindi.iso">Test CD</A></B> - if you think your
    62       hardware is faulty, please download <A HREF="mindi.iso">this ISO</A>,
  • branches/stable/website/downloads.shtml

    r396 r423  
    5050      <h2>Downloads</h2>
    5151    </div>
     52    <p>Mondo's FTP site is available at <a href="ftp://ftp.mondorescue.org">ftp://ftp.mondorescue.org</a></p>
    5253<h3>Source code</h3>
    5354<ul>
    54     <li>tarball available under <a href="ftp://ftp.mondorescue.org/src">ftp://ftp.mondorescue.org/src</a></li>
     55    <li>tarballs are available under <a href="ftp://ftp.mondorescue.org/src">ftp://ftp.mondorescue.org/src</a></li>
    5556    <li>Subversion browing available at <a href="http://svn.berlios.de/viewcvs/mondorescue">http://svn.berlios.de/viewcvs/mondorescue</a></li>
    5657    <li>Anonymous HTTP Subversion check out of the project available with the following instruction set: <pre><tt>svn checkout http://svn.berlios.de/svnroot/repos/mondorescue/branches/stable</tt></pre></li>
Note: See TracChangeset for help on using the changeset viewer.