Changeset 2084


Ignore:
Timestamp:
Nov 26, 2011, 8:26:01 PM (11 years ago)
Author:
ezyang
Message:
Revert r2082 and r2083 (wrong branch).
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/Makefile

    r2083 r2084  
    1818#
    1919# See /COPYRIGHT in this repository for more information.
    20 
    21 fedora_release  = fc17
    2220
    2321upstream_yum    = krb5 krb5.i686 httpd openssh redland-bindings rubygems
     
    148146        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    149147        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    150         /usr/bin/mock -r scripts-${fedora_release}-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     148        /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`
    151149
    152150$(filter-out %.i686,$(oursrc)): %: setup
    153151        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    154152        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    155         /usr/bin/mock -r scripts-${fedora_release}-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     153        /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    156154
    157155$(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
     
    159157$(filter %.i686,$(upstream)): %.i686: setup patch-specs
    160158        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    161         /usr/bin/mock -r scripts-${fedora_release}-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     159        /usr/bin/mock -r scripts-fc15-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    162160
    163161$(filter-out %.i686,$(upstream)): %: setup patch-specs
    164162        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    165         /usr/bin/mock -r scripts-${fedora_release}-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     163        /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    166164
    167165openafs-kernel: setup
    168166        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    169167        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec
    170         /usr/bin/mock -r scripts-${fedora_release}-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
     168        /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
    171169
    172170#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.