Changeset 1220

Timestamp:

Jul 1, 2009, 11:51:05 AM (16 years ago)

Author:

mitchb

Message:

Merge r1209:1219 from trunk to branches/fc11-dev

Location:

branches/fc11-dev/server

Files:

• common/oursrc/athrun (copied) (copied from trunk/server/common/oursrc/athrun)
• fedora/Makefile (modified) (1 diff)
• fedora/config/etc/httpd/vhosts.d/tours.conf (copied) (copied from trunk/server/fedora/config/etc/httpd/vhosts.d/tours.conf)
• fedora/config/etc/pki/tls/certs/tours.pem (copied) (copied from trunk/server/fedora/config/etc/pki/tls/certs/tours.pem)
• fedora/specs/athrun.spec (copied) (copied from trunk/server/fedora/specs/athrun.spec)

branches/fc11-dev/server/fedora/Makefile

@@ -21 +21 @@
 upstream_yum    = krb5 httpd openssh php
 upstream        = openafs $(upstream_yum)
-oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr nss-ldapd nss-ldapd.i586 scripts-base
+oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr nss-ldapd nss-ldapd.i586 athrun scripts-base
 allsrc          = $(upstream) $(oursrc)
 oursrcdir       = ${PWD}/../common/oursrc