Changeset 403


Ignore:
Timestamp:
Feb 18, 2006, 2:42:20 PM (14 years ago)
Author:
bcornec
Message:

merge -r397:402 $SVN_M/branches/stable

Location:
trunk
Files:
3 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/distributions/rpm/mindi.spec

    r388 r403  
    3737verify packages, etc.
    3838
     39%debug_package
    3940%prep
    4041%{__rm}  -rf $RPM_BUILD_ROOT
     
    7980
    8081%changelog
     82* Fri Feb 16 2006 Bruno Cornec <bcornec@users.berlios.de> 1.0.7
     83- Updated to 1.0.7
     84- RPMS spec are now generated instead of using '%' variables
     85
    8186* Fri Nov 05 2005 Bruno Cornec <bcornec@users.berlios.de> 1.05
    8287- ia64 is now working
  • trunk/mindi/distributions/suse/spec.m4

    r388 r403  
    44define(`SSS', %{name}-%{version}.tgz)dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    6 define(`DDD', %{addreqb})dnl
     6define(`DDD', %{addreqb}, syslinux)dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Archiving/Backup)dnl
     8define(`GRP', Productivity/Archiving/Backup)dnl
  • trunk/mindi/mindi

    r384 r403  
    1616export ARCH=`/bin/arch`
    1717
    18 ADDITIONAL_BOOT_PARAMS="acpi=off apm=off devfs=nomount exec-shield=0"
     18ADDITIONAL_BOOT_PARAMS="acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier=off"
    1919
    2020RUN_AFTER_INITIAL_BOOT_PHASE="echo \"Who lives in a pineapple under the sea?\" > /tmp/spongebob.squarepants.txt"
  • trunk/mondo/Makefile.am

    r30 r403  
    11AUTOMAKE_OPTIONS = 1.7
    22SUBDIRS   = mondo
    3 man8_MANS = mondo/mondoarchive/mondoarchive.8 mondo/mondorestore/mondorestore.8
     3man8_MANS = docs/man/mondoarchive.8 docs/man/mondorestore.8
  • trunk/mondo/distributions/rpm/mondo.spec

    r388 r403  
    3232%endif
    3333
    34 #%package xmondo
    35 #Summary:   A QT based graphical front end for %{name}
    36 #Group:     Applications/Archiving
    37 #Requires:  %{name} = %{version}-${release}, qt, kdelibs
    38 #
    39 #%package %{name}-devel
    40 #Summary:   Header files for building against Mondo
    41 #%if %is_mandrake
    42 #Group:     Development/Libraries
    43 #%endif
    44 #if %is_redhat
    45 #Group:     Development/Other
    46 #%endif
    47 #Provides: libmondo-devel mondo-devel
    48 #Obsoletes: libmondo-devel
    49 #
    50 #%description -n %{name}-devel
    51 #Mondo libraries and includes
    52 
    5334%description
    5435Mondo 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.
     
    7455con cintas y NFS, tambien.
    7556
    76 #%description xmondo
    77 #Xmondo is a QT based graphical frontend to mondoarchive.  It can help you
    78 #set up a backup by following onscreen prompts.
    79 
     57%debug_package
    8058%prep
    8159%setup -q -n %name-%{version}
    8260
    8361%build
    84 %configure %{!?_without_xmondo:--with-x11}
     62%configure
    8563%{__make} VERSION=%{version} CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
    8664
     
    10684%doc ChangeLog svn.log
    10785%doc INSTALL COPYING README TODO AUTHORS NEWS
     86%doc docs/en/mondorescue-howto.html docs/en/mondorescue-howto.pdf
    10887
    10988%attr(755,root,root) %{_sbindir}/*
     
    11291%{_mandir}
    11392
    114 #%{!?_without_xmondo:%files xmondo}
    115 #%{!?_without_xmondo:%{_sbindir}/xmondo}
    116 #%{!?_without_xmondo:%{_libdir}/libXmondo-%{libversion}.so}
    117 #%{!?_without_xmondo:%{_libdir}/libXmondo.so}
    118 #%{!?_without_xmondo:%{_datadir}/mondo/mondo.png}
    119 
    12093%changelog
     94* Fri Feb 17 2006 Bruno Cornec <bcornec@users.berlios.de> 2.0.7
     95- Updated to 2.0.7
     96- RPM sepc files are now generated
     97
    12198* Fri Nov 05 2005 Bruno Cornec <bcornec@users.berlios.de> 1.05
    12299- ia64 is now working
  • trunk/mondo/distributions/suse/spec.m4

    r388 r403  
    44define(`SSS', %{name}-%{version}.tgz)dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    6 define(`DDD', %{addreqb})dnl
     6define(`DDD', %{addreqb}, buffer, cdrecord)dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Archiving/Backup)dnl
     8define(`GRP', Productivity/Archiving/Backup)dnl
  • trunk/mondo/mondo/common/my-stuff.h

    r300 r403  
    314314 * Malloc @p x to be MAX_STR_LEN bytes and call fatal_error() if we're out of memory.
    315315 */
    316 #define malloc_string(x) { x = malloc(MAX_STR_LEN); if (!x) { fatal_error("Unable to malloc"); } x[0] = x[1] = '\0'; }
     316#define malloc_string(x) { x = (char *)malloc(MAX_STR_LEN); if (!x) { fatal_error("Unable to malloc"); } x[0] = x[1] = '\0'; }
    317317
    318318/**
Note: See TracChangeset for help on using the changeset viewer.