Ignore:
Timestamp:
Jun 27, 2012, 10:29:47 PM (11 years ago)
Author:
ezyang
Message:
Reintegrate Fedora 17 development branch into trunk.
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/server/fedora/Makefile

    r2213 r2246  
    1919# See /COPYRIGHT in this repository for more information.
    2020
    21 upstream_yum    = krb5 krb5.i686 httpd openssh redland-bindings rubygems
    22 hackage         = MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0
    23 upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
     21upstream_yum    = krb5 krb5.i686 httpd openssh rubygems
     22hackage         = cgi-3001.1.8.2 unix-handle-0.0.0
     23upstream_hackage = ghc-cgi ghc-unix-handle
    2424upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr python-afs athena-aclocal discuss
    2525oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat fuse-better-mousetrapfs
     
    151151        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    152152        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    153         /usr/bin/mock -r scripts-fc15-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     153        /usr/bin/mock -r scripts-fc17-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    154154
    155155$(filter-out %.i686,$(oursrc)): %: setup
    156156        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    157157        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    158         /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     158        /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    159159
    160160$(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
     
    162162$(filter %.i686,$(upstream)): %.i686: setup patch-specs
    163163        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    164         /usr/bin/mock -r scripts-fc15-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     164        /usr/bin/mock -r scripts-fc17-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    165165
    166166$(filter-out %.i686,$(upstream)): %: setup patch-specs
    167167        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    168         /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     168        /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    169169
    170170openafs-kernel: setup
    171171        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    172172        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec
    173         /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
     173        /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
    174174
    175175#sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong
Note: See TracChangeset for help on using the changeset viewer.