Changeset 2522 for branches/fc19-dev/server/fedora/Makefile

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:

• . (modified) (1 prop)
• server/fedora/Makefile (modified) (4 diffs)

branches/fc19-dev/server/fedora/Makefile

@@ -22 +22 @@
 hackage         = cgi-3001.1.8.2 unix-handle-0.0.0
 upstream_hackage = ghc-cgi ghc-unix-handle
-upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr python-afs python-moira python-hesiod athena-aclocal discuss
+gems            = pony:1.8
+upstream_gems   = rubygem-pony
+upstream        = openafs $(upstream_yum) $(upstream_hackage) $(upstream_gems) moira zephyr zephyr.i686 python-zephyr python-afs python-moira python-hesiod athena-aclocal discuss
 oursrc          = 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
 allsrc          = $(upstream) $(oursrc)
@@ -72 +74 @@
         cabal fetch --no-dependencies $(hackage)
         cp -a $(hackage:%=~/.cabal/packages/*/*/*/%.tar.gz) $(tmp_src)
+        $(foreach gem, $(gems), gem fetch $(firstword $(subst :, ,$(gem))) -v $(lastword $(subst :, ,$(gem)));)
         spectool -g -R $(specs)/python-zephyr.spec
         spectool -g -R $(specs)/python-afs.spec
@@ -91 +94 @@
         cp ${specs}/*.spec $(tmp_specs)
 
-# Remove old .orig files so we're not mislead
+# Remove old .orig files so we're not misled
 patch-specs: install-srpms
         @set -ex; \
@@ -157 +160 @@
 $(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
 
+kernel: rpmbuild_args += --define 'buildid .scripts.%{scriptsversion}' --without debug --without doc
+
 $(filter %.i686,$(upstream)): %.i686: setup patch-specs
         rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec