Ignore:
Timestamp:
May 25, 2014, 3:55:57 PM (10 years ago)
Author:
achernya
Message:
Merge r2487-r2521 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

    r2487 r2522  
    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 python-moira python-hesiod athena-aclocal discuss
     24gems            = pony:1.8
     25upstream_gems   = rubygem-pony
     26upstream        = openafs $(upstream_yum) $(upstream_hackage) $(upstream_gems) moira zephyr zephyr.i686 python-zephyr python-afs python-moira python-hesiod athena-aclocal discuss
    2527oursrc          = 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
    2628allsrc          = $(upstream) $(oursrc)
     
    7274        cabal fetch --no-dependencies $(hackage)
    7375        cp -a $(hackage:%=~/.cabal/packages/*/*/*/%.tar.gz) $(tmp_src)
     76        $(foreach gem, $(gems), gem fetch $(firstword $(subst :, ,$(gem))) -v $(lastword $(subst :, ,$(gem)));)
    7477        spectool -g -R $(specs)/python-zephyr.spec
    7578        spectool -g -R $(specs)/python-afs.spec
     
    9194        cp ${specs}/*.spec $(tmp_specs)
    9295
    93 # Remove old .orig files so we're not mislead
     96# Remove old .orig files so we're not misled
    9497patch-specs: install-srpms
    9598        @set -ex; \
     
    157160$(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
    158161
     162kernel: rpmbuild_args += --define 'buildid .scripts.%{scriptsversion}' --without debug --without doc
     163
    159164$(filter %.i686,$(upstream)): %.i686: setup patch-specs
    160165        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
Note: See TracChangeset for help on using the changeset viewer.