Ignore:
Timestamp:
Nov 15, 2013, 11:35:17 PM (9 years ago)
Author:
achernya
Message:
Merge r2435-2485 from trunk to branches/fc19-dev
Location:
branches/fc19-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fc19-dev

  • branches/fc19-dev/server/fedora/Makefile

    r2486 r2487  
    2222hackage         = cgi-3001.1.8.2 unix-handle-0.0.0
    2323upstream_hackage = ghc-cgi ghc-unix-handle
    24 upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr python-afs athena-aclocal discuss
     24upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr python-afs python-moira python-hesiod 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 scripts-munin-plugins
    2626allsrc          = $(upstream) $(oursrc)
     
    3838
    3939dload           = ${PWD}/.dload
    40 server_url      = "http://web.mit.edu/scripts/src"
    41 server_arch     = "fedora.stable"
    42 openafs_url     = "http://www.openafs.org/dl/openafs/1.6.5.1/openafs-1.6.5.1-1.src.rpm"
     40openafs_url     = "https://www.openafs.org/dl/openafs/1.6.5.1/openafs-1.6.5.1-1.src.rpm"
    4341zephyr_url      = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
    4442
     
    6765download_stamp:
    6866        mkdir -p $(dload)
    69         #wget -qO- -nv $(server_url)/$(server_arch) | xargs make
    7067        cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum)
    7168        wget -P $(dload) $(openafs_url)
    7269        wget -P $(dload) $(zephyr_url)
    73         cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
     70        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
    7471        cabal update
    7572        cabal fetch --no-dependencies $(hackage)
     
    7774        spectool -g -R $(specs)/python-zephyr.spec
    7875        spectool -g -R $(specs)/python-afs.spec
     76        spectool -g -R $(specs)/python-moira.spec
     77        spectool -g -R $(specs)/python-hesiod.spec
    7978        touch download_stamp
    8079
    81         cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
    82         cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
     80        cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
     81        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
    8382        cp $(oursrcdir)/discuss/* $(tmp_src)
    84 %.src.rpm:
    85         wget -q -nv -N -B $(server_url) -nd -nH -P $(dload) $(server_url)/$*.src.rpm
    8683
    8784copy-patches: mkdir-tree
     
    190187        fi
    191188
    192 # XXX: We need to figure out what's going on with compat-readline43
    193 #       rpm -ivh http://kojipkgs.fedoraproject.org/packages/compat-readline43/4.3/3/i386/compat-readline43-4.3-3.i386.rpm
    194 #       rpm -ivh http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/Fedora/RPMS/compat-readline43-4.3-3.i386.rpm
    195 
    196189fedora:
    197190        make upstream
Note: See TracChangeset for help on using the changeset viewer.