10 commits - custom/fedora-live-base.ks custom/fedora-livecd-desktop.ks custom/fedora-livecd-kde.ks custom/fedora-live-desktop.ks custom/fedora-livedvd-haskell.ks custom/fedora-live-mini.ks custom/fedora-live-minimization.ks custom/qa-test-day.ks custom/README Makefile.am README spin-kickstarts.spec.in

[Bruno Wolff III]

Makefile.am                        |   10 +++-------
 README                             |   19 ++++++++++++++++---
 custom/README                      |    4 ++--
 custom/fedora-live-base.ks         |    1 -
 custom/fedora-live-desktop.ks      |    1 -
 custom/fedora-live-mini.ks         |    1 -
 custom/fedora-live-minimization.ks |    1 -
 custom/fedora-livecd-desktop.ks    |    1 -
 custom/fedora-livecd-kde.ks        |    1 -
 custom/fedora-livedvd-haskell.ks   |    2 +-
 custom/qa-test-day.ks              |    2 +-
 spin-kickstarts.spec.in            |   12 +++++++-----
 12 files changed, 30 insertions(+), 25 deletions(-)

New commits:
commit 73405b1cb6aca6ab16f861a83e1e6b3dd3c9d5bb
Author: Bruno Wolff III 
Date:   Mon Jun 7 01:34:39 2010 -0500

Add some reminders about how to do the package update on the Fedora side.

diff --git a/README b/README
index 2f1a9cf..384b815 100644
--- a/README
+++ b/README
@@ -33,3 +33,9 @@ rpmbuild -ba ~/rpmbuild/SPECS/spin-kickstarts.spec
 scp spin-kickstarts-*.tar.gz fedorahosted.org:spin-kickstarts
 # Clean up the generated files:
 git clean
+# To update a branch of spin-kickstarts
+#   Make sure the branch is current (cvs up)
+#   Copy over the new spec file
+#   In each branch run make new-sources FILES=/pathto/spin-kickstarts-*.tar.gz
+#   Make a new tag with make tag
+#   Do the build with make build

commit 73ae813d3589ede02ee7ed6497c98e1f168b7318
Author: Bruno Wolff III 
Date:   Mon Jun 7 01:10:47 2010 -0500

The example install commands shouldn't set execute bits.

diff --git a/README b/README
index 2714271..2f1a9cf 100644
--- a/README
+++ b/README
@@ -25,9 +25,9 @@ automake
 autoconf
 ./configure
 make dist
-install -D spin-kickstarts-*.tar.gz ~/rpmbuild/SOURCES
+install -D -m 644 spin-kickstarts-*.tar.gz ~/rpmbuild/SOURCES
 # Edit spin-kickstarts.spec if some changelog history needs to be included
-install -D spin-kickstarts.spec ~/rpmbuild/SPECS
+install -D -m 644 spin-kickstarts.spec ~/rpmbuild/SPECS
 rpmbuild -ba ~/rpmbuild/SPECS/spin-kickstarts.spec
 # If the sprm gets published then publish the tar.gz file on fedorahosted
 scp spin-kickstarts-*.tar.gz fedorahosted.org:spin-kickstarts

commit ef6ca3858ce348f83eeadc66adf0cbece7bc42ac
Author: Bruno Wolff III 
Date:   Mon Jun 7 01:07:46 2010 -0500

custom-kickstarts needs fedora-kickstarts if we aren't going to package dupes.

diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in
index 3f0d881..3e47186 100644
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@ -26,6 +26,7 @@ http://spins.fedoraproject.org/ for a full list)
 Summary:    Kickstart files for Custom Spins (not official)
 Group:      Applications/System
 Requires:   spin-kickstarts = %{version}-%{release}
+Requires:   fedora-kickstarts = %{version}-%{release}

%description -n custom-kickstarts
 Unofficial spins (remixes) brought to us by several contributors

commit da407432cd8d8290610203fd051dec4e23b58bd1
Author: Bruno Wolff III 
Date:   Mon Jun 7 01:05:54 2010 -0500

The README files for custom and l10n should be in %doc sections.

diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in
index 9d5d564..3f0d881 100644
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@ -64,11 +64,15 @@ rm -rf $RPM_BUILD_ROOT

%files -n custom-kickstarts
 %defattr(-,root,root,-)
-%{_datadir}/%{name}/custom/
+%dir %{_datadir}/%{name}/custom/
+%{_datadir}/%{name}/custom/*.ks
+%doc %{_datadir}/%{name}/custom/README

%files -n l10n-kickstarts
 %defattr(-,root,root,-)
-%{_datadir}/%{name}/l10n/
+%dir %{_datadir}/%{name}/l10n/
+%{_datadir}/%{name}/l10n/*.ks
+%doc %{_datadir}/%{name}/l10n/README

%changelog
 * @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@

commit d836f1b7c08e2c87106708ccf212bbdf7dcb10be
Author: Bruno Wolff III 
Date:   Mon Jun 7 00:24:13 2010 -0500

Fix example rpmbuild command.

diff --git a/README b/README
index e0747bb..2714271 100644
--- a/README
+++ b/README
@@ -28,7 +28,7 @@ make dist
 install -D spin-kickstarts-*.tar.gz ~/rpmbuild/SOURCES
 # Edit spin-kickstarts.spec if some changelog history needs to be included
 install -D spin-kickstarts.spec ~/rpmbuild/SPECS
-rpmbuild -ba ~/rpmbuild/SPECS
+rpmbuild -ba ~/rpmbuild/SPECS/spin-kickstarts.spec
 # If the sprm gets published then publish the tar.gz file on fedorahosted
 scp spin-kickstarts-*.tar.gz fedorahosted.org:spin-kickstarts
 # Clean up the generated files:

commit b4659098a441da788b19884ff05448e8fa55db45
Author: Bruno Wolff III 
Date:   Mon Jun 7 00:19:47 2010 -0500

Add running configure to the instructions

diff --git a/README b/README
index 43a5be1..e0747bb 100644
--- a/README
+++ b/README
@@ -23,6 +23,7 @@ git checkout BRANCHNAME
 aclocal
 automake
 autoconf
+./configure
 make dist
 install -D spin-kickstarts-*.tar.gz ~/rpmbuild/SOURCES
 # Edit spin-kickstarts.spec if some changelog history needs to be included

commit 907bcf70e037b7edddabde6d99567958f7025ebe
Author: Bruno Wolff III 
Date:   Mon Jun 7 00:18:25 2010 -0500

Missed a \ when removing sym linked files.

diff --git a/Makefile.am b/Makefile.am
index f841005..4aa1edf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ customdir = ${pkgdatadir}/custom/
 custom_DATA = \
     custom/README \
     custom/fedora-livedvd-haskell.ks \
-    custom/qa-test-day.ks \
+    custom/qa-test-day.ks

l10ndir = ${pkgdatadir}/l10n/
 l10n_DATA = \

commit e74698336f1d86ba734cd39bfdb555cac02c0326
Author: Bruno Wolff III 
Date:   Mon Jun 7 00:17:19 2010 -0500

Tweak documentation

diff --git a/README b/README
index 8bd6d79..43a5be1 100644
--- a/README
+++ b/README
@@ -9,6 +9,9 @@ The release specific branches contain spin concepts that:
  - are approved (both by Board and Spin SIG)
  - maintained for the remainder of the release cycle

+When kickstart files are added or removed, Makefile.am should be updated to
+reflect the change.
+
 To rebuild the srpm for a new version or a new release without patches:

git clone ssh://git.fedorahosted.org/git/spin-kickstarts.git spin-kickstarts
@@ -22,7 +25,10 @@ automake
 autoconf
 make dist
 install -D spin-kickstarts-*.tar.gz ~/rpmbuild/SOURCES
+# Edit spin-kickstarts.spec if some changelog history needs to be included
 install -D spin-kickstarts.spec ~/rpmbuild/SPECS
 rpmbuild -ba ~/rpmbuild/SPECS
 # If the sprm gets published then publish the tar.gz file on fedorahosted
 scp spin-kickstarts-*.tar.gz fedorahosted.org:spin-kickstarts
+# Clean up the generated files:
+git clean

commit dc84eda507bfa6a4bf76d8392ca92ff50c53fefb
Author: Bruno Wolff III 
Date:   Mon Jun 7 00:02:00 2010 -0500

Get rid of the sym linked files.

The building block spins were getting included twice. But rather than change
    them to sym links have the ks files use ../ so they can just be dropped.

diff --git a/Makefile.am b/Makefile.am
index 456df60..f841005 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,13 +21,9 @@ fedora_DATA = \

customdir = ${pkgdatadir}/custom/
 custom_DATA = \
-	custom/README \
-	custom/fedora-livedvd-haskell.ks \
-	custom/qa-test-day.ks \
-    fedora-live-base.ks \
-    fedora-live-mini.ks \
-    fedora-livecd-desktop.ks \
-    fedora-livecd-kde.ks
+    custom/README \
+    custom/fedora-livedvd-haskell.ks \
+    custom/qa-test-day.ks \

l10ndir = ${pkgdatadir}/l10n/
 l10n_DATA = \
diff --git a/custom/README b/custom/README
index d13cf88..dfa621b 100644
--- a/custom/README
+++ b/custom/README
@@ -3,5 +3,5 @@
 This directory contains unofficial kickstarts. These have been technically
 approved by the Fedora Spins SIG, but have no trademark approval.

-Included in this directory is also a few symbolic links to official Fedora
-kickstarts, used by the other kickstarts in this directory.
+If these kickstart files include standard kickstarts (such as live-base),
+they should use ../ for the directory name.
diff --git a/custom/fedora-live-base.ks b/custom/fedora-live-base.ks
deleted file mode 120000
index f283971..0000000
--- a/custom/fedora-live-base.ks
+++ /dev/null
@@ -1 +0,0 @@
-../fedora-live-base.ks
\ No newline at end of file
diff --git a/custom/fedora-live-desktop.ks b/custom/fedora-live-desktop.ks
deleted file mode 120000
index 077ea4b..0000000
--- a/custom/fedora-live-desktop.ks
+++ /dev/null
@@ -1 +0,0 @@
-../fedora-live-desktop.ks
\ No newline at end of file
diff --git a/custom/fedora-live-mini.ks b/custom/fedora-live-mini.ks
deleted file mode 120000
index 656fcdd..0000000
--- a/custom/fedora-live-mini.ks
+++ /dev/null
@@ -1 +0,0 @@
-../fedora-live-mini.ks
\ No newline at end of file
diff --git a/custom/fedora-live-minimization.ks b/custom/fedora-live-minimization.ks
deleted file mode 120000
index aa6adeb..0000000
--- a/custom/fedora-live-minimization.ks
+++ /dev/null
@@ -1 +0,0 @@
-../fedora-live-minimization.ks
\ No newline at end of file
diff --git a/custom/fedora-livecd-desktop.ks b/custom/fedora-livecd-desktop.ks
deleted file mode 120000
index 5466f3f..0000000
--- a/custom/fedora-livecd-desktop.ks
+++ /dev/null
@@ -1 +0,0 @@
-../fedora-livecd-desktop.ks
\ No newline at end of file
diff --git a/custom/fedora-livecd-kde.ks b/custom/fedora-livecd-kde.ks
deleted file mode 120000
index 77a5924..0000000
--- a/custom/fedora-livecd-kde.ks
+++ /dev/null
@@ -1 +0,0 @@
-../fedora-livecd-kde.ks
\ No newline at end of file
diff --git a/custom/fedora-livedvd-haskell.ks b/custom/fedora-livedvd-haskell.ks
index 173f896..4b29e96 100644
--- a/custom/fedora-livedvd-haskell.ks
+++ b/custom/fedora-livedvd-haskell.ks
@@ -1,4 +1,4 @@
-%include fedora-live-base.ks
+%include ../fedora-live-base.ks

part / --size 6000

diff --git a/custom/qa-test-day.ks b/custom/qa-test-day.ks
index fc8e4e9..8ec8118 100644
--- a/custom/qa-test-day.ks
+++ b/custom/qa-test-day.ks
@@ -1,4 +1,4 @@
-%include fedora-livecd-desktop.ks
+%include ../fedora-livecd-desktop.ks

%packages
 gdb

commit 01689a4bec6b859b2d5ef81a5a07d46d38e42ae8
Author: Bruno Wolff III 
Date:   Sun Jun 6 23:46:26 2010 -0500

Remove duplicate docs.

Since the various subpackages require spin-kickstarts, there is no need to
    have them all own the doc files. Just once in spin-kickstarts will do.

diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in
index ce69393..9d5d564 100644
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@ -60,17 +60,14 @@ rm -rf $RPM_BUILD_ROOT

%files -n fedora-kickstarts
 %defattr(-,root,root,-)
-%doc COPYING README AUTHORS NEWS
 %{_datadir}/%{name}/*.ks

%files -n custom-kickstarts
 %defattr(-,root,root,-)
-%doc COPYING README AUTHORS NEWS
 %{_datadir}/%{name}/custom/

%files -n l10n-kickstarts
 %defattr(-,root,root,-)
-%doc COPYING README AUTHORS NEWS
 %{_datadir}/%{name}/l10n/

%changelog