Changeset 315


Ignore:
Timestamp:
Jan 13, 2006, 8:07:06 PM (14 years ago)
Author:
bcornec
Message:
  • svn.log now part of the rpms
  • .spec factorisation continues (mkrel, requires, ...)
Location:
branches/2.06
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2.06/mindi/install.sh

    r311 r315  
    6161
    6262install -m 644 mindi.8 $MANDIR
    63 install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $DOCDIR
     63install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
    6464
    6565# Managing busybox
  • branches/2.06/mindi/mindi.spec

    r314 r315  
    1111%define version VVV
    1212%define mrel    RRR
     13%define release %{mrel}
    1314%define src     %{name}-%{version}.tgz
    1415%define grp     Archiving/Backup
    1516%define addreqb bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, afio
     17
     18# define the mkrel macro if it is not already defined
     19%{?!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}}
    1620
    1721%if %is_redhat
     
    2428%define src     %{name}-%{version}.tar.bz2
    2529%define addreq  %{addreqb}, which
     30%define release %{mkrel} %{mrel}
    2631Autoreqprov: no
    2732%endif
     
    3035%define src     %{name}-%{version}.tar.bz2
    3136%define addreq  %{addreqb}, which
     37%define release %{mkrel} %{mrel}
    3238Autoreqprov: no
    3339%endif
     
    4046Name:       %name
    4147Version:    %version
    42 Release:    %mrel
     48Release:    %release
    4349License:    GPL
    4450Group:      %{grp}
     
    96102%defattr(644,root,root,755)
    97103%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
    98 %doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox
     104%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
    99105%{_mandir}
    100106%{_libdir}/mindi
  • branches/2.06/mondo/mondo.spec

    r313 r315  
    1313%define src     %{name}-%{version}.tgz
    1414%define grp     Archiving/Backup
     15%define addreqb mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
     16
     17# define the mkrel macro if it is not already defined
     18%{?!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}}
    1519
    1620%if %is_redhat
    17 %define src     Applications/Archiving
     21%define grp     Applications/Archiving
     22%define addreq  %{addreqb}
    1823Autoreq:        0
    1924%endif
     
    2126%if %is_mandrake
    2227%define src     %{name}-%{version}.tar.bz2
     28%define addreq  %{addreqb}
    2329Autoreqprov:    no
    2430%endif
     
    2632%if %is_mandriva
    2733%define src     %{name}-%{version}.tar.bz2
     34%define addreq  %{addreqb}
    2835Autoreqprov:    no
    2936%endif
    3037
    3138%if %is_suse
     39%define addreq  %{addreqb}
    3240%endif
    3341
     
    4755BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
    4856%ifarch ia64
    49 Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
     57Requires:   %{addreq}, elilo, parted
    5058%else
    51 Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, buffer
     59Requires:   %{addreq}, syslinux >= 1.52
    5260%endif
    5361
     
    124132%files
    125133%defattr(644,root,root,755)
    126 %doc ChangeLog mondo/docs/en/1.6x-howto/*
     134%doc ChangeLog svn.log mondo/docs/en/1.6x-howto/*
    127135%doc INSTALL COPYING README TODO AUTHORS NEWS
    128136
  • branches/2.06/tools/mkrpm

    r313 r315  
    2020cd $TOOLHOME/..
    2121rev=`$TOOLHOME/mksvnversion`
     22
     23echo "Generating SVN log file ..."
    2224svn log -v > /tmp/mondorescue-svn.log
    2325
  • branches/2.06/tools/rpm-env

    r313 r315  
    3737    export ddir="mandriva"
    3838    export dver=`awk '{print $4}' /etc/mandriva-release`
    39     export suf=".${dver}mdk"
     39    export suf=" "
    4040elif [ -e /etc/mandrake-release ]; then
    4141    export ddir="mandrake"
    4242    export dver=`awk '{print $3}' /etc/mandrake-release`
    43     export suf=".${dver}mdk"
     43    export suf=" "
    4444elif [ -e /etc/redhat-release ]; then
    4545    grep -q Enterprise /etc/redhat-release
Note: See TracChangeset for help on using the changeset viewer.