Ignore:
Timestamp:
Aug 27, 2014, 10:06:17 PM (8 years ago)
Author:
achernya
Message:
Reintegrate fc20-dev into trunk
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/server/fedora/Makefile

    r2558 r2591  
    1919# See /COPYRIGHT in this repository for more information.
    2020
    21 upstream_yum    = krb5 krb5.i686 httpd openssh rubygems gnutls kernel openssl openssl.i686
    22 hackage         = cgi-3001.1.8.2 unix-handle-0.0.0
     21upstream_yum    = krb5 krb5.i686 httpd openssh
     22hackage         = cgi-3001.1.8.5 unix-handle-0.0.0
    2323upstream_hackage = ghc-cgi ghc-unix-handle
    24 gems            = pony:1.8
    25 upstream_gems   = rubygem-pony
    26 upstream        = openafs $(upstream_yum) $(upstream_hackage) $(upstream_gems) moira zephyr zephyr.i686 python-zephyr python-afs python-moira python-hesiod athena-aclocal discuss
     24gems            = pony:1.8 fcgi:0.9.2.1
     25upstream_gems   = rubygem-pony rubygem-fcgi
     26upstream_eggs   = python-authkit
     27upstream        = openafs $(upstream_yum) $(upstream_hackage) $(upstream_gems) $(upstream_eggs) moira zephyr zephyr.i686 python-zephyr python-afs python-moira python-hesiod athena-aclocal discuss
    2728oursrc          = 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 scripts-munin-plugins
    2829allsrc          = $(upstream) $(oursrc)
     
    4041
    4142dload           = ${PWD}/.dload
    42 openafs_url     = "https://www.openafs.org/dl/openafs/1.6.5/openafs-1.6.5-1.src.rpm"
    43 zephyr_url      = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
    44 openssl_url     = "https://www.openssl.org/source/openssl-1.0.0n.tar.gz"
     43openafs_url     = "https://www.openafs.org/dl/openafs/1.6.8/openafs-1.6.8-1.src.rpm"
     44#zephyr_url     = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
    4545
    4646PKG             = $(patsubst %.i686,%,$@)
     
    7070        cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum)
    7171        wget -P $(dload) $(openafs_url)
    72         wget -P $(dload) $(zephyr_url)
    73         wget -P $(tmp_src) $(openssl_url)
     72        #wget -P $(dload) $(zephyr_url)
    7473        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
    7574        cabal update
     
    7776        cp -a $(hackage:%=~/.cabal/packages/*/*/*/%.tar.gz) $(tmp_src)
    7877        $(foreach gem, $(gems), gem fetch $(firstword $(subst :, ,$(gem))) -v $(lastword $(subst :, ,$(gem)));)
     78        spectool -g -R $(specs)/zephyr.spec
    7979        spectool -g -R $(specs)/python-zephyr.spec
    8080        spectool -g -R $(specs)/python-afs.spec
    8181        spectool -g -R $(specs)/python-moira.spec
    8282        spectool -g -R $(specs)/python-hesiod.spec
     83        spectool -g -R $(specs)/python-authkit.spec
    8384        touch download_stamp
    8485
     
    153154        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    154155        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    155         /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`
     156        /usr/bin/mock -r scripts-fc20-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    156157
    157158$(filter-out %.i686,$(oursrc)): %: setup
    158159        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    159160        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    160         /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     161        /usr/bin/mock -r scripts-fc20-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    161162
    162163$(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
     
    166167$(filter %.i686,$(upstream)): %.i686: setup patch-specs
    167168        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    168         /usr/bin/mock -r scripts-fc17-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     169        /usr/bin/mock -r scripts-fc20-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    169170
    170171$(filter-out %.i686,$(upstream)): %: setup patch-specs
    171172        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    172         /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     173        /usr/bin/mock -r scripts-fc20-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    173174
    174175openafs-kernel: setup
    175176        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    176177        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec
    177         /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
     178        /usr/bin/mock -r scripts-fc20-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
    178179
    179180#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.