Changeset 55 for trunk


Ignore:
Timestamp:
Oct 8, 2005, 2:11:26 AM (14 years ago)
Author:
bcornec
Message:

Merge patches from branch 2.04_berlios (r51-r54)

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo.spec

    r41 r55  
    22# $Id$
    33#
    4 %define _prefix /usr
    5 %define libversion 2.0x_berlios
    6 %define __ln ln
     4%define is_mandriva %(test -e /etc/mandriva-release && echo 1 || echo 0)
     5%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0)
     6%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
     7%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
     8%define is_redhat %(test -e /etc/redhat-release && echo 1 || echo 0)
     9
     10%define name    mondo
     11%define version 2.04_berlios
     12%define mrel    1
     13
     14%if %is_redhat
     15%define release %{mrel}
     16%define src     %{name}-%{version}.tgz
     17Group:          Applications/Archiving
     18Autoreq:        0
     19%endif
     20
     21%if %is_mandrake
     22%define release %{mrel}mdk
     23%define src     %{name}-%{version}.tar.bz2
     24Group:          Archiving/Backup
     25Autoreqprov:    no
     26%endif
    727
    828Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
    9 Summary(fr):    Un programme pour les utilisateurs de Linux pour crr un CD/tape de sauvegarde/restauration
     29Summary(fr):    Un programme pour les utilisateurs de Linux pour cr�r un CD/tape de sauvegarde/restauration
    1030Summary(it):    Un programma per utenti Linux per creare un CD/tape di rescue
    1131Summary(sp):    Un programa para los usuarios de Linux por crear una CD/cinta de restoracion/rescate
     32<<<<<<< .working
    1233Name:       mondo
    1334Version:    2.05_berlios
    1435Release:    1
     36=======
     37
     38Name:       %{name}
     39Version:    %{version}
     40Release:    %{release}
     41>>>>>>> .merge-right.r54
    1542License:    GPL
    16 Group:      Applications/Archiving
    17 Url:        http://www.mondorescue.org
    18 Source:     %{name}-%{version}.tgz
    19 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
     43Url:        http://mondorescue.berlios.de
     44Source:     %{src}
     45BuildRoot:  %{_tmppath}/%{name}-%{version}
    2046BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
    2147%ifarch ia64
    22 Requires:   mindi >= 1.02, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
     48Requires:   mindi >= 1.04_berlios, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
    2349%{!?_without_xmondo:BuildRequires:    gcc-c++, XFree86-devel, qt-devel, kdelibs-devel, libpng-devel}
    2450%else
    25 Requires:   mindi >= 1.02, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, cdrecord, buffer
     51Requires:   mindi >= 1.04_berlios, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, cdrecord, buffer
    2652%{!?_without_xmondo:BuildRequires:    gcc-c++, XFree86-devel, qt-devel, kdelibs-devel, arts-devel, libart_lgpl-devel, libpng-devel}
    2753%endif
    28 Prefix:     %{_prefix}
    29 Autoreq:    0
    30 
    31 %package xmondo
    32 Summary:    A QT based graphical front end for %{name}
    33 Group:      Applications/Archiving
    34 Requires:   %{name} = %{version}-${release}, qt, kdelibs
    35 
    36 %package devel
    37 Summary:    Header files for building against Mondo
    38 Group:      Development/Libraries
     54
     55#%package xmondo
     56#Summary:   A QT based graphical front end for %{name}
     57#Group:     Applications/Archiving
     58#Requires:  %{name} = %{version}-${release}, qt, kdelibs
     59#
     60#%package %{name}-devel
     61#Summary:   Header files for building against Mondo
     62#%if %is_mandrake
     63#Group:     Development/Libraries
     64#%endif
     65#if %is_redhat
     66#Group:     Development/Other
     67#%endif
     68#Provides: libmondo-devel mondo-devel
     69#Obsoletes: libmondo-devel
     70#
     71#%description -n %{name}-devel
     72#Mondo libraries and includes
    3973
    4074%description
    41 Objective
    42 """""""""
    43 To produce a program which any Linux user can utilize to create
    44 a rescue/restore CD (or CDs, if their installation is >2Gb approx.). Also
    45 works for tapes and NFS.
     75Mondo 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.
    4676
    4777%description -l fr
    4878Objectif
    4979""""""""
    50 Mondo a pour but de fournir un programme utilisable par n'importe quel
    51 utilsateur de Linux pour cr�r un CD de sauvegarde/restauration
    52 (ou plusieurs CDs, si son installation d�asse les 2Go environ). Cela
    53 functionne avec des systemes d'entrainement de bande magnetique, et NFS,
    54 aussi.
     80Mondo 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.
    5581
    5682%description -l it
     
    6995con cintas y NFS, tambien.
    7096
    71 %description xmondo
    72 Xmondo is a QT based graphical frontend to mondoarchive.  It can help you
    73 set up a backup by following onscreen prompts.
    74 
    75 %description devel
    76 mondo-devel contains a few header files that are necessary for developing
    77 with mondo.
     97#%description xmondo
     98#Xmondo is a QT based graphical frontend to mondoarchive.  It can help you
     99#set up a backup by following onscreen prompts.
    78100
    79101%prep
    80 %setup -q
    81 # clear out any CVS directories if they exist
    82 for dir in `find . -name CVS`
    83 do
    84   rm -rf ${dir}
    85 done
    86 
     102%setup -q -n %name-%{version}
     103
     104%build
    87105%configure %{!?_without_xmondo:--with-x11}
    88 
    89 %build
    90106%{__make} VERSION=%{version} CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
    91107
    92108%install
    93 rm -Rf /usr/local/share/mondo
    94 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/mondo
    95 %{__mkdir} -p $RPM_BUILD_ROOT%{_includedir}/mondo
    96 %{__mkdir} -p $RPM_BUILD_ROOT%{_sbindir}
    97 %{__mkdir} -p $RPM_BUILD_ROOT%{_libdir}
    98 %{__mkdir} -p $RPM_BUILD_ROOT%{_mandir}/man8
    99 for fname in mondo/mondoarchive/.libs/mondoarchive mondo/mondorestore/.libs/mondorestore ; do
    100     %{__install} -m 755 $fname $RPM_BUILD_ROOT%{_sbindir}
    101     %{__install} -m 755 $fname $RPM_BUILD_ROOT%{_datadir}/mondo
    102 done
    103 %{!?_without_xmondo:%{__install} -m 755 mondo/xmondo/.libs/xmondo $RPM_BUILD_ROOT%{_sbindir}}
    104 
    105 for f in libmondo libmondo.so libmondo-newt libmondo-newt.so libmondo-newt.1 libmondo-newt.so.1 libmondo-newt.1.0.0 libmondo-newt.so.1.0.0 libmondo.2 libmondo.so.2 libmondo.2.0.3 libmondo.so.2.0.3 ; do
    106     fname=mondo/common/.libs/$f
    107     if [ -e "$fname" ] ; then
    108 
    109 # Hugo's way
    110 #        %{__install} -m 755 $fname $RPM_BUILD_ROOT%{_libdir}
    111 # ----------
    112 # Joshua's way
    113          %{__cp} -d $fname $RPM_BUILD_ROOT%{_libdir}
    114 # ----------
    115    
    116     fi
    117 done
    118 %{!?_without_xmondo:%{__install} -m 755 mondo/common/.libs/libXmondo-%{libversion}.so $RPM_BUILD_ROOT%{_libdir}}
    119 %{!?_without_xmondo:%{__ln} -s libXmondo-%{libversion}.so $RPM_BUILD_ROOT%{_libdir}/libXmondo.so}
    120 %{!?_without_xmondo:%{__install} -m 644 mondo/xmondo/mondo.png $RPM_BUILD_ROOT%{_datadir}/mondo}
    121 %{__install} -m 755 mondo/do-not-compress-these       $RPM_BUILD_ROOT%{_datadir}/mondo
    122 %{__install} -m 755 mondo/autorun                     $RPM_BUILD_ROOT%{_datadir}/mondo
    123 %{__install} -m 644 mondo/mondoarchive/mondoarchive.8 $RPM_BUILD_ROOT%{_mandir}/man8
    124 gzip -9 -f $RPM_BUILD_ROOT%{_mandir}/man8/mondoarchive.8
    125 %{__cp} -Rf mondo/restore-scripts  $RPM_BUILD_ROOT%{_datadir}/mondo
    126 %{__cp} -Rf mondo/post-nuke.sample $RPM_BUILD_ROOT%{_datadir}/mondo
    127 for fname in mondo/common/my-stuff.h mondo/common/mondostructures.h mondo/common/libmondo-*-EXT.h mondo/common/X-specific-EXT.h mondo/common/newt-specific-EXT.h; do
    128     %{__install} -m 644 $fname $RPM_BUILD_ROOT%{_includedir}/mondo
    129 done
     109%{__rm} -rf $RPM_BUILD_ROOT
     110%makeinstall
    130111
    131112%post
    132 ldconfig
     113/sbin/ldconfig
     114
     115%postun
     116/sbin/ldconfig
    133117
    134118%clean
     
    136120
    137121%files
    138 %defattr(-,root,root,-)
    139 %doc ChangeLog mondo/docs/en/*
    140 %dir %{_datadir}/mondo
    141 %{_sbindir}/mondorestore
    142 %{_sbindir}/mondoarchive
    143 %{_datadir}/mondo/mondorestore
    144 %{_datadir}/mondo/post-nuke.sample/*
    145 %{_datadir}/mondo/restore-scripts/*
    146 %{_datadir}/mondo/do-not-compress-these
    147 %{_datadir}/mondo/mondoarchive
    148 %{_datadir}/mondo/autorun
    149 %{_mandir}/man8/mondoarchive.8*
    150 %{_libdir}
     122%defattr(644,root,root,755)
     123%doc ChangeLog mondo/docs/en/1.6x-howto/*
     124%doc INSTALL COPYING README TODO AUTHORS NEWS
     125
     126%attr(755,root,root) %{_sbindir}/*
     127%attr(755,root,root) %{_datadir}/%{name}/restore-scripts/%{name}
     128%{_datadir}/%{name}
     129%{_mandir}/*
     130%{_libdir}/*
    151131
    152132%{!?_without_xmondo:%files xmondo}
     
    155135%{!?_without_xmondo:%{_libdir}/libXmondo.so}
    156136%{!?_without_xmondo:%{_datadir}/mondo/mondo.png}
    157 
    158 %files devel
    159 %dir %{_includedir}/mondo
    160 %{_includedir}/mondo/*
    161137
    162138%changelog
  • trunk/tools/mkdeliv

    r51 r55  
    2828if [ "`echo $c | grep mindi`" != "" ]; then
    2929    cp -a ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz
     30    cp -a ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tar.bz2
    3031    tgz="$tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tar.bz2"
    31     rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${ARCH}.rpm"
    32     srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-${rev}.src.rpm"
     32    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
     33    srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-${rev}${suf}.src.rpm"
    3334fi
    3435if [ "`echo $c | grep  mondo`" != "" ]; then
    3536    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz
     37    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2
    3638    tgz="$tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2"
    37     rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${ARCH}.rpm"
    38     srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}.src.rpm"
     39    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
     40    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
    3941fi
    4042scp -p ${tgz} ${SVNAUTH}:${DSTDIR}/TGZ
  • trunk/tools/mkrpm

    r51 r55  
    3737    sed "s/^%define mrel..*/%define mrel    ${rev}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
    3838    rm -f ${TMP}/mindi-*-root
    39     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${ARCH}.rpm"
     39    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
    4040    # ATTENTION: This could be dangerous for your setup
    4141    opt="rm -rf /usr/share/mindi ;"
     
    5757    sed "s/^%define mrel..*/%define mrel    ${rev}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    5858    rm -f ${TMP}/mondo-*-root
    59     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${ARCH}.rpm"
     59    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
    6060fi
    6161cd ${TOPDIR}/SPECS
  • trunk/tools/rpm-env

    r51 r55  
    3131export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/mindi.spec | egrep '^%define version' | awk '{print $3}' | sed "s/[  ]*//"`
    3232export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/mondo.spec | egrep '^%define version' | awk '{print $3}' | sed "s/[  ]*//"`
     33
     34if [ -e /etc/mandriva-release ]; then
     35        export suf=mdk
     36elif [ -e /etc/mandrake-release ]; then
     37        export suf=mdk
     38else
     39        export suf=""
     40fi
Note: See TracChangeset for help on using the changeset viewer.