Merge branch 'master' of ssh://mebrown@git.fedorahosted.org/git/mock

* 'master' of ssh://mebrown@git.fedorahosted.org/git/mock:
  version bump
  Update the spec changelog with interesting changes
  Update the spec file with compat symlinks for devel/rawhide.
  Move "devel" to "rawhide" to match current Fedora naming schemes.

6 files changed, 17 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index c17471c..9bfbef4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,12 +4,12 @@
 
 ####################################
 # change version here. --> BOTH PLACES PLEASE!
-AC_INIT([mock],[0.9.7])
+AC_INIT([mock],[0.9.8])
 
 temp_RELEASE_NAME=mock
 temp_RELEASE_MAJOR=0
 temp_RELEASE_MINOR=9
-temp_RELEASE_SUBLEVEL=7
+temp_RELEASE_SUBLEVEL=8
 temp_RELEASE_EXTRALEVEL=
 ####################################
 
diff --git a/etc/mock/fedora-devel-i386.cfg b/etc/mock/fedora-rawhide-i386.cfg
index e05acd9..93e4f52 100644
--- a/etc/mock/fedora-devel-i386.cfg
+++ b/etc/mock/fedora-rawhide-i386.cfg
@@ -1,4 +1,4 @@
-config_opts['root'] = 'fedora-development-i386'
+config_opts['root'] = 'fedora-rawhide-i386'
 config_opts['target_arch'] = 'i386'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'  # only useful for --resultdir variable subst
diff --git a/etc/mock/fedora-devel-ppc.cfg b/etc/mock/fedora-rawhide-ppc.cfg
index d293f8d..e676d66 100644
--- a/etc/mock/fedora-devel-ppc.cfg
+++ b/etc/mock/fedora-rawhide-ppc.cfg
@@ -1,4 +1,4 @@
-config_opts['root'] = 'fedora-development-ppc'
+config_opts['root'] = 'fedora-rawhide-ppc'
 config_opts['target_arch'] = 'ppc'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'  # only useful for --resultdir variable subst
diff --git a/etc/mock/fedora-devel-ppc64.cfg b/etc/mock/fedora-rawhide-ppc64.cfg
index d8a2ff7..0cd8bb1 100644
--- a/etc/mock/fedora-devel-ppc64.cfg
+++ b/etc/mock/fedora-rawhide-ppc64.cfg
@@ -1,4 +1,4 @@
-config_opts['root'] = 'fedora-development-ppc64'
+config_opts['root'] = 'fedora-rawhide-ppc64'
 config_opts['target_arch'] = 'ppc64'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'  # only useful for --resultdir variable subst
diff --git a/etc/mock/fedora-devel-x86_64.cfg b/etc/mock/fedora-rawhide-x86_64.cfg
index d3fc66f..9dd5074 100644
--- a/etc/mock/fedora-devel-x86_64.cfg
+++ b/etc/mock/fedora-rawhide-x86_64.cfg
@@ -1,4 +1,4 @@
-config_opts['root'] = 'fedora-development-x86_64'
+config_opts['root'] = 'fedora-rawhide-x86_64'
 config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'  # only useful for --resultdir variable subst
diff --git a/mock.spec.in b/mock.spec.in
index 36d4abb..8d5a1d0 100644
--- a/mock.spec.in
+++ b/mock.spec.in
@@ -47,6 +47,11 @@ ln -s epel-4-x86_64.cfg fedora-4-x86_64-epel.cfg
 ln -s epel-5-i386.cfg   fedora-5-i386-epel.cfg
 ln -s epel-5-ppc.cfg    fedora-5-ppc-epel.cfg
 ln -s epel-5-x86_64.cfg fedora-5-x86_64-epel.cfg
+# more compat, from devel/rawhide rename
+ln -s fedora-rawhide-i386.cfg fedora-devel-i386.cfg
+ln -s fedora-rawhide-x86_64.cfg fedora-devel-x86_64.cfg
+ln -s fedora-rawhide-ppc.cfg fedora-devel-ppc.cfg
+ln -s fedora-rawhide-ppc64.cfg fedora-devel-ppc64.cfg
 popd
 
 %clean
@@ -82,6 +87,12 @@ fi
 %attr(02775, root, mock) %dir /var/lib/mock
 
 %changelog
+* Mon Mar 31 2008 Jesse Keating <jkeating@redhat.com> - 0.9.8-1
+- modify rootcache logic to rebuild cache if config files have newer timestamp
+- For Fedora 8 and higher, use priority failover method
+- Point to the correct static-repo for rawhide stuff.
+- Move "devel" to "rawhide" to match current Fedora naming schemes.
+
 * Thu Jan 31 2008 Michael Brown <mebrown@michaels-house.net> - 0.9.7-1
 - redo mock.util.do() to use python subprocess module, which should be
   much more maintainable than our old homegrown code.