[spin-kickstarts/f19: 4/4] Merge remote-tracking branch 'origin/f19' into f19
by Bruno Wolff III
commit 3cfde69cd0ee06f70b8b06fbd77538e6d78cd3d1
Merge: 4c054d7 96833b7
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Thu Jun 27 23:39:25 2013 -0500
Merge remote-tracking branch 'origin/f19' into f19
Conflicts:
configure.ac
spin-kickstarts.spec.in
fedora-live-jam-kde.ks | 3 +--
fedora-livedvd-scientific-kde.ks | 2 --
2 files changed, 1 insertions(+), 4 deletions(-)
---
10 years, 10 months
[spin-kickstarts/f19: 3/4] Redo getting the correct ks file contents to match RC2
by Bruno Wolff III
commit 4c054d7a11d897db0fdbd0c557a4dded64202c20
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Thu Jun 27 23:31:56 2013 -0500
Redo getting the correct ks file contents to match RC2
I didn't use --hard on the git reset in the previous attempt
and didn't notice the working files didn't get adjusted to
the contents I was expecting.
configure.ac | 2 +-
spin-kickstarts.spec.in | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e6143fc..dd96842 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([spin-kickstarts], 0.19.7)
+AC_INIT([spin-kickstarts], 0.19.8)
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 7570e3a..c659953 100644
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@ -76,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/%{name}/l10n/README
%changelog
+* Thu Jun 27 2013 Bruno Wolff III <bruno(a)wolff.to> 0.19.8-1
+- I screwed up git reset the first time and got the wrong ks file contents
+- Use the correct git command to get the right versions of the ks files
+
* Wed Jun 26 2013 Bruno Wolff III <bruno(a)wolff.to> 0.19.7-1
- Build for f19 rc2
- Only config.ac and spin-kickstarts.spec.in changed from
10 years, 10 months
[spin-kickstarts/f19: 2/4] Build release that corresponds to f19 rc2
by Bruno Wolff III
commit 4dcbcd3d49436a52ce7503aa3125c8edf48343ee
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Wed Jun 26 09:56:46 2013 -0500
Build release that corresponds to f19 rc2
I reset the branch to commit 15305b2c82c04090452fdd86da1b38884f9010ec
and then modified config.ac and spin-kickstarts.spec.in for the new
rpm release. The parts used to build the release didn't change.
configure.ac | 2 +-
spin-kickstarts.spec.in | 5 +++++
2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5f10d45..e6143fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([spin-kickstarts], 0.19.6)
+AC_INIT([spin-kickstarts], 0.19.7)
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 a056983..7570e3a 100644
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@ -76,6 +76,11 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/%{name}/l10n/README
%changelog
+* Wed Jun 26 2013 Bruno Wolff III <bruno(a)wolff.to> 0.19.7-1
+- Build for f19 rc2
+- Only config.ac and spin-kickstarts.spec.in changed from
+- commit 15305b2c82c04090452fdd86da1b38884f9010ec
+
* Thu May 23 2013 Bruno Wolff III <bruno(a)wolff.to> 0.19.6-1
- Pick up last minute changes for beta
- Lots of size changes
10 years, 10 months
[spin-kickstarts/f19: 1/4] Fix Makefile.am for missing .ks in file name
by Bruno Wolff III
commit 171003f0f79d6229f574dc0adb96a824a2b6356d
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Wed Jun 26 09:57:39 2013 -0500
Fix Makefile.am for missing .ks in file name
This also doesn't change anything actually used for the f19 rc2 build.
It does affect being able to build the rpm.
Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d014cf9..4557d2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ fedora_DATA = \
fedora-livedvd-scientific-kde.ks \
fedora-livecd-security.ks \
fedora-live-jam-kde.ks \
- fedora-mate-packages
+ fedora-mate-packages.ks
customdir = ${pkgdatadir}/custom/
custom_DATA = \
10 years, 10 months
F19 final (hopefully) spin-kickstarts package build
by Adam Williamson
Hey folks - can someone please kick off a build of spin-kickstarts
package, using git commit 15305b2c82c04090452fdd86da1b38884f9010ec ?
That's what RC2 was built from, and there's a reasonable chance RC2 is
what we'll ship, so we should get a spin-kickstarts package build
matching it. thanks!
--
Adam Williamson
Fedora QA Community Monkey
IRC: adamw | Twitter: AdamW_Fedora | identi.ca: adamwfedora
http://www.happyassassin.net
10 years, 10 months
[spin-kickstarts/f19: 5/5] Merge remote-tracking branch 'origin/f19' into f19
by Bruno Wolff III
commit 96833b75f97d270a6057771f1b4a9da636350a83
Merge: 69a35d1 19f6649
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Wed Jun 26 10:03:43 2013 -0500
Merge remote-tracking branch 'origin/f19' into f19
I needed to to a build that used ks files as of commit
15305b2c82c04090452fdd86da1b38884f9010ec and a few commits
added after that, but before I did the build needed to be
added after changes I needed to do that build.
---
10 years, 10 months
[spin-kickstarts/f19: 4/5] Scientific: Remove non-existence packages
by Bruno Wolff III
commit 69a35d1fa583b94eb10e63ac8280235671c9692d
Author: Amit Saha <asaha(a)redhat.com>
Date: Wed Jun 26 18:15:07 2013 +1000
Scientific: Remove non-existence packages
Remove netbeans and scite which no longer exist.
fedora-livedvd-scientific-kde.ks | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific-kde.ks
index 8bb659e..97ead30 100644
--- a/fedora-livedvd-scientific-kde.ks
+++ b/fedora-livedvd-scientific-kde.ks
@@ -54,7 +54,6 @@ rkward
qtoctave
# IDEs for the IDE folks
-netbeans
eclipse
spyder
@@ -63,7 +62,6 @@ emacs
emacs-color-theme
vim
scribus
-scite
lyx
kile
10 years, 10 months
[spin-kickstarts/f19: 3/5] Jam: Remove slv2 and dssi-vst
by Bruno Wolff III
commit 834e2937b4294b5557b3e67da7ce219d152804e5
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Wed Jun 26 07:26:12 2013 +0200
Jam: Remove slv2 and dssi-vst
fedora-live-jam-kde.ks | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/fedora-live-jam-kde.ks b/fedora-live-jam-kde.ks
index e874e22..9ea1612 100644
--- a/fedora-live-jam-kde.ks
+++ b/fedora-live-jam-kde.ks
@@ -85,7 +85,6 @@ non-session-manager
# audio-plugins
calf
dssi
-dssi-vst
jack-rack
ladspa
@@ -117,7 +116,7 @@ lv2-c++-tools
lv2-samplv1
lv2-synthv1
lv2-drumkv1
-slv2
+
#dssi
nekobee-dssi
10 years, 10 months
[spin-kickstarts/f19: 2/5] Fix Makefile.am for missing .ks in file name
by Bruno Wolff III
commit f52d093b9e3798b534696ad60378c5a1286b437a
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Wed Jun 26 09:57:39 2013 -0500
Fix Makefile.am for missing .ks in file name
This also doesn't change anything actually used for the f19 rc2 build.
It does affect being able to build the rpm.
Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d014cf9..4557d2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ fedora_DATA = \
fedora-livedvd-scientific-kde.ks \
fedora-livecd-security.ks \
fedora-live-jam-kde.ks \
- fedora-mate-packages
+ fedora-mate-packages.ks
customdir = ${pkgdatadir}/custom/
custom_DATA = \
10 years, 10 months