Branch 'F-11' - 7 commits - configure.ac fedora-install-fedora.ks Makefile.am spin-kickstarts.spec.in

[Jeroen van Meeuwen]

 Makefile.am              |    2 +-
 configure.ac             |    2 +-
 fedora-install-fedora.ks |    4 ++--
 spin-kickstarts.spec.in  |    4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit a7ae23d07fda2f52558d6fab2843f53e5aa75418
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Sat Jun 20 19:36:40 2009 +0200

    Update spec and bump version

diff --git a/configure.ac b/configure.ac
index a5439f0..a6e9a8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([spin-kickstarts], 0.11.3)
+AC_INIT([spin-kickstarts], 0.11.4)
 AC_SUBST([RELEASE], 1)
 
 ALL_LINGUAS="bn_IN bn ca cs da de el es fi fr gl gu hi hr hu is it ja ko ml ms nb nl
or pa pl pt pt_BR ru sk sl sr@latin sr sv ta tr uk zh_CN zh_TW"
diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in
index 932580f..4906ec3 100644
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
+- Fix repos in fedora-install-fedora.ks (#505262)
+
+* Sun May 31 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.3-1
 - New release
 - Removed developer spin from the mix
 


commit 82849f7f153976aefcd3a3611e3139a4aba76769
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Sat Jun 20 19:29:28 2009 +0200

    Fix repos still pointing at rawhide (#505262)

diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index f9c1ccd..a2f5040 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -10,8 +10,8 @@
 #part iso --size=4998
 
 # Add the repos you wish to use to compose here.  At least one of them needs group data.
-repo --name=rawhide
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
--exclude kernel*debug* --exclude kernel-kdump* --exclude syslog-ng --exclude
java-1.5.0-gcj-devel --exclude astronomy-bookmarks --exclude generic* --exclude
java-1.5.0-gcj-javadoc --exclude btanks --exclude GConf2-dbus --exclude bluez-gnome
-repo --name=rawhide-source 
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+repo --name=release
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=$basearch
--exclude kernel*debug* --exclude kernel-kdump* --exclude syslog-ng --exclude
java-1.5.0-gcj-devel --exclude astronomy-bookmarks --exclude generic* --exclude
java-1.5.0-gcj-javadoc --exclude btanks --exclude GConf2-dbus --exclude bluez-gnome
+repo --name=release-source 
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11-source&arch=$basearch
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (@base is added by default unless you add --nobase to %packages)


commit a6755187bc8769f4b6c64369d631a85abf63b5a3
Merge: 62f2938... bc87e4a...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Wed Jun 17 03:01:00 2009 +0200

    Merge branch 'F-11' of ssh://git.fedorahosted.org/git/spin-kickstarts into
F-11



commit 62f2938847a4f58b474d625312313699e6497b00
Merge: d6dada6... a569c14...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Wed May 20 20:53:46 2009 +0200

    Merge branch 'F-11' of ssh://git.fedorahosted.org/git/spin-kickstarts into
F-11



commit d6dada676b497f75798e96125d7b38f21a9f572b
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Sat May 16 13:59:51 2009 +0200

    ChangeLog in rpm spec

diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in
index b2d8a62..932580f 100644
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@ -34,6 +34,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
+- New release
 - Removed developer spin from the mix
 
 * Wed Mar 04 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.1-1


commit c12ab51657851218dfafec9bf327c041c19ede47
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Sat May 16 13:58:00 2009 +0200

    Update Makefile (git-log becomes git log)

diff --git a/Makefile.am b/Makefile.am
index 1d11330..d5b6d2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,7 +66,7 @@ clean:
 	rm -f aclocal.m4 configure
 
 ChangeLog:
-	(GIT_DIR=.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f
.changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing
possibly empty changelog.' >&2)
+	(GIT_DIR=.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f
.changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing
possibly empty changelog.' >&2)
 
 rpm: ChangeLog dist
 	@(rpmbuild -ta ${PACKAGE}-$(PACKAGE_VERSION).tar.gz)


commit 733e51d9b50f512e973c32d14a0748f9dfd55760
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Sat May 16 13:55:11 2009 +0200

    Bump release number for final F-11 release

diff --git a/configure.ac b/configure.ac
index 336bf5e..a5439f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([spin-kickstarts], 0.11.2)
+AC_INIT([spin-kickstarts], 0.11.3)
 AC_SUBST([RELEASE], 1)
 
 ALL_LINGUAS="bn_IN bn ca cs da de el es fi fr gl gu hi hr hu is it ja ko ml ms nb nl
or pa pl pt pt_BR ru sk sl sr@latin sr sv ta tr uk zh_CN zh_TW"