From e2a4d704856b89c756c728a4ebcd258bef95dde7 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Fedora Unity)" Date: Sat, 31 May 2008 13:55:15 +0200 Subject: [PATCH] Add new files to the spin-kickstarts repo: - automake and specfile - german localized Desktop Spin --- AUTHORS | 0 COPYING | 1 + INSTALL | 1 + Makefile.am | 120 +++++++++++++++++++++++++++++++++ NEWS | 0 configure.ac | 26 +++++++ fedora-live-base.ks | 14 +++- fedora-livecd-desktop-de_DE.ks | 27 ++++++++ spin-kickstarts.spec.in | 37 ++++++++++ 9 files changed, 223 insertions(+), 3 deletions(-) create mode 100644 AUTHORS create mode 120000 COPYING create mode 120000 INSTALL create mode 100644 Makefile.am create mode 100644 NEWS create mode 100644 configure.ac create mode 100644 fedora-livecd-desktop-de_DE.ks create mode 100644 spin-kickstarts.spec.in diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..e69de29 diff --git a/COPYING b/COPYING new file mode 120000 index 0000000..0b6cbf8 --- /dev/null +++ b/COPYING @@ -0,0 +1 @@ +/usr/share/automake-1.10/COPYING \ No newline at end of file diff --git a/INSTALL b/INSTALL new file mode 120000 index 0000000..5bb6e7b --- /dev/null +++ b/INSTALL @@ -0,0 +1 @@ +/usr/share/automake-1.10/INSTALL \ No newline at end of file diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..14ab2d0 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,120 @@ +# Automake Automagic + +kickstartdir = $(pkgdatadir)/ +kickstart_DATA = \ + fedora-live-base.ks \ + fedora-livecd-desktop-default.ks \ + fedora-livecd-desktop-en_US.ks \ + fedora-livecd-desktop.ks \ + fedora-livecd-desktop-nl_NL.ks \ + fedora-livecd-electronic-lab.ks \ + fedora-livecd-electronic-lab-nl_NL.ks \ + fedora-livecd-kde-de_DE.ks \ + fedora-livecd-kde.ks \ + fedora-livecd-kde-nl_NL.ks \ + fedora-livecd-xfce.ks \ + fedora-livecd-xfce-nl_NL.ks \ + fedora-livedvd-developer.ks \ + fedora-livedvd-developer-nl_NL.ks \ + fedora-livedvd-games.ks \ + fedora-livedvd-games-nl_NL.ks + +EXTRA_DIST = \ + $(kickstart_DATA) \ + spin-kickstarts.spec.in\ + spin-kickstarts.spec \ + ChangeLog \ + COPYING \ + AUTHORS \ + README + +DISTCLEANFILES = \ + intltool-extract \ + intltool-merge \ + intltool-update + +install-exec-local: + +uninstall-local: + rm -f $(DESTDIR)$(pkgdatadir) + +clean: + rm -f ChangeLog + rm -f *~ + rm -f spin-kickstarts.spec + rm -f config.status config.log + rm -rf autom4te.cache/ + find -type f -name "Makefile" -exec rm -f {} \; + find -type f -name "*.rpmnew" -exec rm -f {} \; + find -type f -name "*.rpmsave" -exec rm -f {} \; + find -type f -name "Makefile.in" -exec rm -f {} \; + find -type f -name "*.log" -exec rm -f {} \; + find -type f -name "spin-kickstarts-*.tar.gz" -exec mv -f {} .. \; + 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) + +rpm: ChangeLog dist + @(rpmbuild -ta ${PACKAGE}-$(PACKAGE_VERSION).tar.gz) + +srpm: ChangeLog dist + @(rpmbuild -ts ${PACKAGE}-$(PACKAGE_VERSION).tar.gz) + +CVS_PKGVERSION=`echo $(PACKAGE_VERSION) | sed -e 's/\./_/g'` +CVSTAG=$(PACKAGE_NAME)-$(CVS_PACKAGEVERSION) +tag: + @cvs tag -F $(CVSTAG) + +RELEASE=`rpm -q --qf="%{RELEASE}\n" --specfile ${PACKAGE}.spec | head -n 1` + +F-7: srpm + @(mock -v -r fedora-7-i386 rebuild ~/rpmbuild/SRPMS/${PACKAGE}-$(PACKAGE_VERSION)-$(RELEASE).src.rpm) + +F-8: srpm + @(mock -v -r fedora-8-i386 rebuild ~/rpmbuild/SRPMS/${PACKAGE}-$(PACKAGE_VERSION)-$(RELEASE).src.rpm) + +F-9: srpm + @(mock -v -r fedora-9-i386 rebuild ~/rpmbuild/SRPMS/${PACKAGE}-$(PACKAGE_VERSION)-$(RELEASE).src.rpm) + +devel: srpm + @(mock -v -r fedora-devel-i386 rebuild ~/rpmbuild/SRPMS/${PACKAGE}-$(PACKAGE_VERSION)-$(RELEASE).src.rpm) + +EL-5: srpm + @(mock -v -r epel-5-i386 rebuild ~/rpmbuild/SRPMS/${PACKAGE}-$(PACKAGE_VERSION)-$(RELEASE).src.rpm) + +mock: srpm F-7 F-8 F-9 devel EL-5 + +RELEASE_NUM=`rpm -q --qf="%{RELEASE}\n" --specfile ${PACKAGE}.spec | head -n 1 | cut -d'.' -f 1` + +fpeople: mock + rm -rf public_html + mkdir -p public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/{el5,fc7,fc8,fc9} + cp ${PACKAGE}-$(PACKAGE_VERSION).tar.gz public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/. + cp ${PACKAGE}.spec public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/. + cp /var/lib/mock/epel-5-i386/result/* public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/el5/. + cp /var/lib/mock/fedora-7-i386/result/* public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/fc7/. + cp /var/lib/mock/fedora-8-i386/result/* public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/fc8/. + cp /var/lib/mock/fedora-development-i386/result/* public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/fc9/. + scp -r public_html fedorapeople.org:. + +custom: mock + rm -rf custom + mkdir -p custom/{el5,f7,f8,f9}/{i386,x86_64,ppc,SRPMS}/ + cp /var/lib/mock/epel-5-i386/result/*.noarch.rpm custom/el5/i386/. + cp /var/lib/mock/epel-5-i386/result/*.noarch.rpm custom/el5/x86_64/. + cp /var/lib/mock/epel-5-i386/result/*.noarch.rpm custom/el5/ppc/. + cp /var/lib/mock/epel-5-i386/result/*.src.rpm custom/el5/SRPMS/. + cp /var/lib/mock/fedora-7-i386/result/*.noarch.rpm custom/f7/i386/. + cp /var/lib/mock/fedora-7-i386/result/*.noarch.rpm custom/f7/x86_64/. + cp /var/lib/mock/fedora-7-i386/result/*.noarch.rpm custom/f7/ppc/. + cp /var/lib/mock/fedora-7-i386/result/*.src.rpm custom/f7/SRPMS/. + cp /var/lib/mock/fedora-8-i386/result/*.noarch.rpm custom/f8/i386/. + cp /var/lib/mock/fedora-8-i386/result/*.noarch.rpm custom/f8/x86_64/. + cp /var/lib/mock/fedora-8-i386/result/*.noarch.rpm custom/f8/ppc/. + cp /var/lib/mock/fedora-8-i386/result/*.src.rpm custom/f8/SRPMS/. + cp /var/lib/mock/fedora-development-i386/result/*.noarch.rpm custom/f9/i386/. + cp /var/lib/mock/fedora-development-i386/result/*.noarch.rpm custom/f9/x86_64/. + cp /var/lib/mock/fedora-development-i386/result/*.noarch.rpm custom/f9/ppc/. + cp /var/lib/mock/fedora-development-i386/result/*.src.rpm custom/f9/SRPMS/. + scp -r custom elwood.kanarip.com:/data/os/repos/. diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..943cc75 --- /dev/null +++ b/configure.ac @@ -0,0 +1,26 @@ +AC_INIT([spin-kickstarts], 0.01) +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" + +AM_INIT_AUTOMAKE +AM_MAINTAINER_MODE +AM_PATH_PYTHON + +#dnl prevent to copy po/Makefile.in.in +#GETTEXT_PACKAGE=revisor +#AC_SUBST(GETTEXT_PACKAGE) +#AM_GLIB_GNU_GETTEXT +#AC_PROG_INTLTOOL +#AC_PROG_LN_S + +AC_SUBST(DATESTAMP,`date +"%a %b %d %Y"`) + +#AM_PATH_PYTHON + +AC_CONFIG_FILES([ +Makefile +spin-kickstarts.spec +]) + +AC_OUTPUT diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 51a1e3d..4929444 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -19,9 +19,17 @@ xconfig --startxonboot part / --size 4096 services --enabled=NetworkManager --disabled=network,sshd -#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=$basearch -#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f8&arch=$basearch -repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch +# To compose against the current release tree, use the following "repo" (enabled by default) +repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch +# To include updates, use the following "repo" (enabled by default) +repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch + +# To compose against rawhide, use the following "repo" (disabled by default) +#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 + +# To compose against local trees, use: +#repo --name=f9 --baseurl=http://localrepo/fedora/releases/9/Everything/$basearch/os/ +#repo --name=f9-updates --baseurl=http://localrepo/fedora/updates/9/$basearch/ %packages @base-x diff --git a/fedora-livecd-desktop-de_DE.ks b/fedora-livecd-desktop-de_DE.ks new file mode 100644 index 0000000..2f67742 --- /dev/null +++ b/fedora-livecd-desktop-de_DE.ks @@ -0,0 +1,27 @@ +# fedora-livecd-desktop-de_DE.ks +# +# Maintainer(s): +# - Jeroen van Meeuwen + +%include fedora-livecd-desktop.ks + +lang de_DE.UTF-8 +keyboard de-latin1-nodeadkeys +timezone Europe/Berlin + +%packages +-gnome-blog +@german-support +%end + +%post +# system-config-keyboard doesn't really work (missing xorg.conf etc) +cat >>/etc/X11/xorg.conf << EOF +Section "InputDevice" + Identifier "Keyboard0" + Driver "kbd" + Option "XkbLayout" "de-latin1-nodeadkeys" +EndSection +EOF +%end + diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in new file mode 100644 index 0000000..edf2f5a --- /dev/null +++ b/spin-kickstarts.spec.in @@ -0,0 +1,37 @@ + +Name: spin-kickstarts +Version: @VERSION@ +Release: @RELEASE@%{?dist} +License: GPLv2+ +Summary: Kickstart files and templates for creating your own Fedora Spins +Group: Applications/System +URL: http://fedorahosted.org/spin-kickstarts +Source0: http://fedorahosted.org/releases/s/p/%{name}/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildArch: noarch + +%description +A number of kickstarts you can use to create customized (Fedora) Spins + +%prep +%setup -q + +%build +%configure +make + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/* + +%changelog +* @DATESTAMP@ Jeroen van Meeuwen @VERSION@-@RELEASE@ +- Initial packaging