Changeset 488 in ProjectBuilder


Ignore:
Timestamp:
Jun 9, 2008, 11:47:39 PM (16 years ago)
Author:
Bruno Cornec
Message:
  • Uses more macros for mondorescue
  • Fix Fedora packages (percent dist / License)
  • Fix Mandriva package (mkrel)
Location:
projects/mondorescue/pbconf/branches/2.2.7
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • projects/mondorescue/pbconf/branches/2.2.7/mindi-busybox/rpm/mindi-busybox.spec

    r429 r488  
    66Version:    PBVER
    77Release:    PBTAGPBSUF
    8 License:    GPL
     8License:    PBLIC
    99Group:      PBGRP
    10 Url:        http://www.mondorescue.org
     10Url:        PBURL
    1111Source:     PBREPO/PBSRC
    1212BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    … …  
    2525
    2626%install
    27 %{__rm}  -rf $RPM_BUILD_ROOT
     27rm  -rf $RPM_BUILD_ROOT
    2828
    2929DESTDIR=${RPM_BUILD_ROOT}%{_libdir}/mindi/rootfs
    … …  
    3131
    3232%clean
    33 %{__rm} -rf $RPM_BUILD_ROOT
     33rm -rf $RPM_BUILD_ROOT
    3434
    3535%files

  • projects/mondorescue/pbconf/branches/2.2.7/mindi/rpm/mindi.spec

    r429 r488  
    66Version:    PBVER
    77Release:    PBTAGPBSUF
    8 License:    GPL
     8License:    PBLIC
    99Group:      PBGRP
    10 Url:        http://www.mondorescue.org
     10Url:        PBURL
    1111Source:     PBREPO/PBSRC
    1212# Not yet possible as busybox is a binary that should go alongside
    … …  
    3030
    3131%install
    32 %{__rm}  -rf $RPM_BUILD_ROOT
     32rm  -rf $RPM_BUILD_ROOT
    3333export DONT_RELINK=1
    3434
    … …  
    4545
    4646%clean
    47 %{__rm} -rf $RPM_BUILD_ROOT
     47rm -rf $RPM_BUILD_ROOT
    4848
    4949%files

  • projects/mondorescue/pbconf/branches/2.2.7/mondo-doc/rpm/mondo-doc.spec

    r429 r488  
    99Version:    PBVER
    1010Release:    PBTAGPBSUF
    11 License:    GPL
     11License:    PBLIC
    1212Group:      PBGRP
    13 Url:        http://www.mondorescue.org
     13Url:        PBURL
    1414Source:     PBREPO/PBSRC
    1515BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    … …  
    2727
    2828%build
    29 %{__make} -f Makefile.man VERSION=%{version}
    30 %{__make} -f Makefile.howto VERSION=%{version}
     29make -f Makefile.man VERSION=%{version}
     30make -f Makefile.howto VERSION=%{version}
    3131
    3232%install
    33 %{__rm} -rf $RPM_BUILD_ROOT
    34 %{__make} -f Makefile.man install INSTALLDIR=${RPM_BUILD_ROOT}/%{_defaultdocdir}/%{name}-%{version}
    35 %{__make} -f Makefile.howto install INSTALLDIR=${RPM_BUILD_ROOT}/%{_defaultdocdir}/%{name}-%{version}
     33rm -rf $RPM_BUILD_ROOT
     34make -f Makefile.man install INSTALLDIR=${RPM_BUILD_ROOT}/%{_defaultdocdir}/%{name}-%{version}
     35make -f Makefile.howto install INSTALLDIR=${RPM_BUILD_ROOT}/%{_defaultdocdir}/%{name}-%{version}
    3636
    3737%clean
    38 %{__rm} -rf $RPM_BUILD_ROOT
     38rm -rf $RPM_BUILD_ROOT
    3939
    4040%files

  • projects/mondorescue/pbconf/branches/2.2.7/mondo/rpm/mondo.spec

    r429 r488  
    1111Version:    PBVER
    1212Release:    PBTAGPBSUF
    13 License:    GPL
     13License:    PBLIC
    1414Group:      PBGRP
    15 Url:        http://www.mondorescue.org
     15Url:        PBURL
    1616Source:     PBREPO/PBSRC
    1717BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    … …  
    1919ExcludeArch:    ppc
    2020PBOBS
    21 Requires:   mindi >= 1.2.1, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, buffer, cdrecord, PBDEP
     21Requires:   mindi >= 2.0.2, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, buffer, cdrecord, PBDEP
    2222%ifarch ia64
    2323Requires:   elilo, parted
    … …  
    6262
    6363%install
    64 %{__rm} -rf $RPM_BUILD_ROOT
     64rm -rf $RPM_BUILD_ROOT
    6565make DESTDIR=$RPM_BUILD_ROOT install
    6666mkdir -p $RPM_BUILD_ROOT/%{_var}/cache/%{name}
    6767
    6868%clean
    69 %{__rm} -rf $RPM_BUILD_ROOT
     69rm -rf $RPM_BUILD_ROOT
    7070
    7171%files

  • projects/mondorescue/pbconf/branches/2.2.7/pbfilter/all.pbf

    r431 r488  
    3030# PBPROJ is replaced by the project name ($pbproj in code)
    3131filter PBPROJ = $pbproj
     32
     33filter PBURL = http://www.mondorescue.org

  • projects/mondorescue/pbconf/branches/2.2.7/pbfilter/md.pbf

    r384 r488  
    11# Specific group for Mandriva for Mondorescue
    22filter PBGRP = Archiving/Backup
     3
     4# For official Mandriva use mkrel
     5filter PBTAG = %mkrel
     6filter PBSUF = $pbtag

  • projects/mondorescue/pbconf/branches/2.2.7/pbfilter/rpm.pbf

    r384 r488  
    1616# PBOBS is replaced by the Obsolete line
    1717filter PBOBS =
     18
     19filter PBLIC = GPL
Note: See TracChangeset for help on using the changeset viewer.