Merge remote branch 'revisor/master'
* revisor/master: Local repository has the lowest cost - overrides other repos Moved Revisor configs to subdirectory Moved Revisor package to subdirectory Imported Qubes Revisor package source Change file paths to be a bit more generic Removed unneded packages Add knetworkmanager needed for dom0 networking Removed unneded packages Use comps on CD Put template on CD Cleanup by /usr/share/revisor/comps-cleanup.xsl Initial import of configuration files
This commit is contained in:
Tomasz Sterna
commit
c92684d27f
11534
conf/comps-qubes1.xml
Normal file
11534
conf/comps-qubes1.xml
Normal file
File diff suppressed because it is too large
Load Diff
151
conf/qubes-1-respin.cfg
Normal file
151
conf/qubes-1-respin.cfg
Normal file
@ -0,0 +1,151 @@
|
|||||||
|
# Kickstart file for composing the "Qubes" spin of Fedora
|
||||||
|
|
||||||
|
# Package manifest for the compose. Uses repo group metadata to translate groups.
|
||||||
|
# (@base is added by default unless you add --nobase to %packages)
|
||||||
|
# (default groups for the configured repos are added by --default)
|
||||||
|
#%packages --default
|
||||||
|
%packages
|
||||||
|
# core
|
||||||
|
tcsh
|
||||||
|
dracut-*
|
||||||
|
# X and drivers
|
||||||
|
@base-x
|
||||||
|
@fonts
|
||||||
|
@hardware-support
|
||||||
|
# Desktop Packages
|
||||||
|
@kde-desktop --nodefaults
|
||||||
|
-kde*
|
||||||
|
oxygen-icon-theme
|
||||||
|
# Qubes Spin
|
||||||
|
kernel-qubes-dom0
|
||||||
|
qubes-kde-dom0
|
||||||
|
qubes-core-dom0
|
||||||
|
qubes-gui-dom0
|
||||||
|
qubes-manager
|
||||||
|
qubes-template-linux-x64
|
||||||
|
knetworkmanager
|
||||||
|
-smolt-firstboot
|
||||||
|
-smolt
|
||||||
|
# Keep dap off the install media, makes Eng & Sci show up
|
||||||
|
-dap-server-cgi
|
||||||
|
# filesystem stuff
|
||||||
|
@filesystems
|
||||||
|
# Languages
|
||||||
|
@afrikaans-support
|
||||||
|
@albanian-support
|
||||||
|
@arabic-support
|
||||||
|
@armenian-support
|
||||||
|
@assamese-support
|
||||||
|
@basque-support
|
||||||
|
@belarusian-support
|
||||||
|
@bengali-support
|
||||||
|
@bhutanese-support
|
||||||
|
@burmese-support
|
||||||
|
@bosnian-support
|
||||||
|
@brazilian-support
|
||||||
|
@breton-support
|
||||||
|
@british-support
|
||||||
|
@bulgarian-support
|
||||||
|
@catalan-support
|
||||||
|
@chinese-support
|
||||||
|
@croatian-support
|
||||||
|
@czech-support
|
||||||
|
@danish-support
|
||||||
|
@dutch-support
|
||||||
|
@esperanto-support
|
||||||
|
@estonian-support
|
||||||
|
@ethiopic-support
|
||||||
|
@faeroese-support
|
||||||
|
@filipino-support
|
||||||
|
@finnish-support
|
||||||
|
@french-support
|
||||||
|
@gaelic-support
|
||||||
|
@galician-support
|
||||||
|
@georgian-support
|
||||||
|
@german-support
|
||||||
|
@greek-support
|
||||||
|
@gujarati-support
|
||||||
|
@hebrew-support
|
||||||
|
@hindi-support
|
||||||
|
@hungarian-support
|
||||||
|
@icelandic-support
|
||||||
|
@indonesian-support
|
||||||
|
@inuktitut-support
|
||||||
|
@irish-support
|
||||||
|
@italian-support
|
||||||
|
@japanese-support
|
||||||
|
@kannada-support
|
||||||
|
@kashmiri-support
|
||||||
|
@kashubian-support
|
||||||
|
@khmer-support
|
||||||
|
@konkani-support
|
||||||
|
@korean-support
|
||||||
|
@lao-support
|
||||||
|
@latvian-support
|
||||||
|
@lithuanian-support
|
||||||
|
@low-saxon-support
|
||||||
|
@macedonian-support
|
||||||
|
@malay-support
|
||||||
|
@malayalam-support
|
||||||
|
@maori-support
|
||||||
|
@marathi-support
|
||||||
|
@mongolian-support
|
||||||
|
@nepali-support
|
||||||
|
@northern-sotho-support
|
||||||
|
@norwegian-support
|
||||||
|
@oriya-support
|
||||||
|
@persian-support
|
||||||
|
@polish-support
|
||||||
|
@portuguese-support
|
||||||
|
@punjabi-support
|
||||||
|
@romanian-support
|
||||||
|
@russian-support
|
||||||
|
@samoan-support
|
||||||
|
@serbian-support
|
||||||
|
@sindhi-support
|
||||||
|
@sinhala-support
|
||||||
|
@slovak-support
|
||||||
|
@slovenian-support
|
||||||
|
@somali-support
|
||||||
|
@southern-ndebele-support
|
||||||
|
@southern-sotho-support
|
||||||
|
@spanish-support
|
||||||
|
@swati-support
|
||||||
|
@swedish-support
|
||||||
|
@tagalog-support
|
||||||
|
@tamil-support
|
||||||
|
@telugu-support
|
||||||
|
@thai-support
|
||||||
|
@tibetan-support
|
||||||
|
@tonga-support
|
||||||
|
@tsonga-support
|
||||||
|
@tswana-support
|
||||||
|
@turkish-support
|
||||||
|
@ukrainian-support
|
||||||
|
@urdu-support
|
||||||
|
@venda-support
|
||||||
|
@vietnamese-support
|
||||||
|
@walloon-support
|
||||||
|
@welsh-support
|
||||||
|
@xhosa-support
|
||||||
|
@zulu-support
|
||||||
|
# Size removals
|
||||||
|
-gimp-help
|
||||||
|
-java-1.6.0-openjdk-src
|
||||||
|
-xorg-x11-docs
|
||||||
|
-kernel-doc
|
||||||
|
-java-1.5.0-gcj-src
|
||||||
|
-java-1.5.0-gcj-devel
|
||||||
|
-libgcj-src
|
||||||
|
-*javadoc*
|
||||||
|
-frysk
|
||||||
|
-*gcj*
|
||||||
|
-akonadi
|
||||||
|
-kdepimlibs*
|
||||||
|
-boost-*
|
||||||
|
-enblend
|
||||||
|
-hugin-base
|
||||||
|
-report*
|
||||||
|
-wxBase
|
||||||
|
-wxGTK*
|
||||||
|
%end
|
||||||
51
conf/qubes-install-respin.conf
Normal file
51
conf/qubes-install-respin.conf
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
# Revisor base config file
|
||||||
|
|
||||||
|
[revisor]
|
||||||
|
media_installation_dvd = 1
|
||||||
|
media_installation_cd = 0
|
||||||
|
media_installation_tree = 0
|
||||||
|
media_utility_rescue = 0
|
||||||
|
media_live_optical = 0
|
||||||
|
media_live_thumb = 0
|
||||||
|
|
||||||
|
# Set these to the absolute minimum
|
||||||
|
dependency_resolve_allow_conflicts = 0
|
||||||
|
mode_respin = 1
|
||||||
|
|
||||||
|
kickstart_manifest = 1
|
||||||
|
kickstart_file = /Devel/Qubes/revisor/qubes-1-respin.cfg
|
||||||
|
kickstart_include = 0
|
||||||
|
kickstart_default = 1
|
||||||
|
|
||||||
|
copy_local = 1
|
||||||
|
|
||||||
|
answer_yes = 1
|
||||||
|
getsource = 0
|
||||||
|
|
||||||
|
bugurl = http://qubes-os.org/trac/
|
||||||
|
|
||||||
|
include_bootiso = 0
|
||||||
|
|
||||||
|
# Defaults for all models in this file
|
||||||
|
product_name = Qubes
|
||||||
|
product_path = Packages
|
||||||
|
iso_basename = Qubes
|
||||||
|
iso_label = Qubes
|
||||||
|
version = R1
|
||||||
|
version_from = F13
|
||||||
|
comps_filter = 0
|
||||||
|
revisor_comps = 1
|
||||||
|
comps = /Devel/Qubes/revisor/comps-qubes1.xml
|
||||||
|
|
||||||
|
#isolinux_cfg = /Devel/Qubes/revisor/qubes-1_isolinux.cfg
|
||||||
|
|
||||||
|
destination_directory = /Devel/Qubes/ISO
|
||||||
|
working_directory = /Devel/Qubes/work
|
||||||
|
|
||||||
|
## Models
|
||||||
|
|
||||||
|
[qubes1-x86_64]
|
||||||
|
description = Qubes R1 for x86_64
|
||||||
|
main = /Devel/Qubes/revisor/qubes1-x86_64-respin.conf
|
||||||
|
iso_basename = Qubes
|
||||||
|
architecture = x86_64
|
||||||
81
conf/qubes1-x86_64-respin.conf
Normal file
81
conf/qubes1-x86_64-respin.conf
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
[main]
|
||||||
|
exclude=*.i?86
|
||||||
|
cachedir=-yumcache
|
||||||
|
reposdir=
|
||||||
|
keepcache=1
|
||||||
|
debuglevel=1
|
||||||
|
logfile=-yum.log
|
||||||
|
pkgpolicy=newest
|
||||||
|
distroverpkg=qubes-release
|
||||||
|
tolerant=1
|
||||||
|
exactarch=1
|
||||||
|
obsoletes=1
|
||||||
|
gpgcheck=0
|
||||||
|
plugins=1
|
||||||
|
metadata_expire=1800
|
||||||
|
installroot=/Devel/Qubes/work/revisor
|
||||||
|
failovermethod=priority
|
||||||
|
|
||||||
|
[fedora]
|
||||||
|
name=Fedora 13 - x86_64
|
||||||
|
baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/x86_64/os/
|
||||||
|
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=x86_64
|
||||||
|
enabled=1
|
||||||
|
gpgcheck=0
|
||||||
|
|
||||||
|
[fedora-source]
|
||||||
|
name=Fedora 13 - Source
|
||||||
|
baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/source/SRPMS/
|
||||||
|
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-13&arch=src
|
||||||
|
enabled=0
|
||||||
|
gpgcheck=0
|
||||||
|
|
||||||
|
[updates]
|
||||||
|
name=Fedora 13 - x86_64 - Updates
|
||||||
|
baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/13/x86_64/
|
||||||
|
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=x86_64
|
||||||
|
enabled=0
|
||||||
|
gpgcheck=0
|
||||||
|
|
||||||
|
[updates-source]
|
||||||
|
name=Fedora 13 - Source - Updates
|
||||||
|
baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/13/SRPMS/
|
||||||
|
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f13&arch=src
|
||||||
|
enabled=0
|
||||||
|
gpgcheck=0
|
||||||
|
|
||||||
|
[updates-testing]
|
||||||
|
name=Fedora 13 - x86_64 - Test Updates
|
||||||
|
baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/13/x86_64/
|
||||||
|
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f13&arch=x86_64
|
||||||
|
enabled=0
|
||||||
|
gpgcheck=0
|
||||||
|
|
||||||
|
[updates-testing-source]
|
||||||
|
name=Fedora 13 - Source - Test Updates
|
||||||
|
baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/13/SRPMS/
|
||||||
|
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f13&arch=src
|
||||||
|
enabled=0
|
||||||
|
gpgcheck=0
|
||||||
|
|
||||||
|
[qubes]
|
||||||
|
name = Qubes OS R1 Repository
|
||||||
|
baseurl = http://qubes-os.org/yum/r1/dom0/rpm
|
||||||
|
enabled = 1
|
||||||
|
gpgcheck = 1
|
||||||
|
gpgkey = http://qubes-os.org/keys/qubes-release-1-signing-key.asc
|
||||||
|
|
||||||
|
[qubes-testing]
|
||||||
|
name = Qubes OS R1 Testing Repository
|
||||||
|
baseurl = http://qubes-os.org/yum/r1-testing/dom0/rpm
|
||||||
|
enabled = 0
|
||||||
|
gpgcheck = 1
|
||||||
|
gpgkey = http://qubes-os.org/keys/qubes-release-1-signing-key.asc
|
||||||
|
|
||||||
|
[local]
|
||||||
|
name=Qubes Local Repository
|
||||||
|
baseurl=file:///Devel/Qubes/rpmbuild/RPMS/
|
||||||
|
enabled=1
|
||||||
|
gpgcheck=0
|
||||||
|
cost=1
|
||||||
|
|
||||||
260
revisor/F13-buildinstall
Executable file
260
revisor/F13-buildinstall
Executable file
@ -0,0 +1,260 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# buildinstall
|
||||||
|
#
|
||||||
|
# Copyright (C) 2007 Red Hat, Inc. All rights reserved.
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
die() {
|
||||||
|
[ -n "$TREEDIR" ] && rm -rf $TREEDIR
|
||||||
|
[ -n "$BUILDINSTDIR" ] && rm -rf $BUILDINSTDIR
|
||||||
|
[ -n "$yumconf" ] && rm -rf $yumconf
|
||||||
|
echo "Aborting buildinstall"
|
||||||
|
echo "$@"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
usage() {
|
||||||
|
echo "Usage: buildinstall --version <version> --brand <brand> --product <product> --release <comment> [--output outputdir] [--discs <discstring>] <root>" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
CWD="$(pwd)"
|
||||||
|
PRODUCTPATH="anaconda"
|
||||||
|
|
||||||
|
while [ $# -gt 0 ]; do
|
||||||
|
case $1 in
|
||||||
|
# general options affecting how we build things
|
||||||
|
--nogr)
|
||||||
|
NOGRSTR="--nogr"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
--debug)
|
||||||
|
DEBUGSTR="--debug"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
--localscripts)
|
||||||
|
LOCALSCRIPTS="yes"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
|
||||||
|
# release information
|
||||||
|
--version)
|
||||||
|
VERSION=$2
|
||||||
|
shift; shift
|
||||||
|
;;
|
||||||
|
--release)
|
||||||
|
RELEASESTR=$2
|
||||||
|
shift; shift
|
||||||
|
;;
|
||||||
|
--product)
|
||||||
|
PRODUCTSTR=$2
|
||||||
|
shift; shift
|
||||||
|
;;
|
||||||
|
--brand)
|
||||||
|
BRANDSTR=$2
|
||||||
|
shift; shift
|
||||||
|
;;
|
||||||
|
--variant)
|
||||||
|
VARIANT=$2
|
||||||
|
shift; shift
|
||||||
|
;;
|
||||||
|
--bugurl)
|
||||||
|
BUGURL=$2
|
||||||
|
shift; shift
|
||||||
|
;;
|
||||||
|
--output)
|
||||||
|
OUTPUT=$2
|
||||||
|
shift; shift
|
||||||
|
;;
|
||||||
|
--updates)
|
||||||
|
UPDATES=$2
|
||||||
|
shift; shift
|
||||||
|
;;
|
||||||
|
--mirrorlist)
|
||||||
|
MIRRORLIST="$MIRRORLIST $2"
|
||||||
|
shift; shift
|
||||||
|
;;
|
||||||
|
|
||||||
|
--yumconf)
|
||||||
|
yumconf="$2"
|
||||||
|
shift; shift
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
if [ -z "$REPO" ]; then
|
||||||
|
REPO=$1
|
||||||
|
else
|
||||||
|
EXTRA_REPOS="$EXTRA_REPOS $1"
|
||||||
|
fi
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -z "$PRODUCTSTR" ]; then
|
||||||
|
usage
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "$VERSION" ]; then
|
||||||
|
usage
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "$REPO" ]; then
|
||||||
|
usage
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "$RELEASESTR" ]; then
|
||||||
|
usage
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "$BUGURL" ]; then
|
||||||
|
BUGURL="your distribution provided bug reporting tool."
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$REPO" =~ ^/ ]]; then
|
||||||
|
[ -n "$OUTPUT" ] || OUTPUT=$REPO
|
||||||
|
REPO="file://$REPO"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "$OUTPUT" ]; then
|
||||||
|
usage
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -d "$OUTPUT" ]; then
|
||||||
|
mkdir -p $OUTPUT
|
||||||
|
fi
|
||||||
|
|
||||||
|
# The first -release and -logos package we are going to look for is the lowercase
|
||||||
|
if [ -z "$BRANDSTR" ]; then
|
||||||
|
BRANDSTR="`echo $PRODUCTSTR | tr '[:upper:]' '[:lower:]'`"
|
||||||
|
fi
|
||||||
|
export brandpkgname="$BRANDSTR"
|
||||||
|
|
||||||
|
BUILDINSTDIR=$(mktemp -d ${TMPDIR:-/tmp}/buildinstall.tree.XXXXXX)
|
||||||
|
TREEDIR=$(mktemp -d ${TMPDIR:-/tmp}/treedir.XXXXXX)
|
||||||
|
CACHEDIR=$(mktemp -d ${TMPDIR:-/tmp}/yumcache.XXXXXX)
|
||||||
|
|
||||||
|
if [ -z "$yumconf" ]; then
|
||||||
|
yumconf=$(mktemp ${TMPDIR:-/tmp}/yum.conf.XXXXXX)
|
||||||
|
cat > $yumconf <<EOF
|
||||||
|
[main]
|
||||||
|
cachedir=$CACHEDIR
|
||||||
|
keepcache=0
|
||||||
|
gpgcheck=0
|
||||||
|
plugins=0
|
||||||
|
reposdir=
|
||||||
|
tsflags=nodocs
|
||||||
|
|
||||||
|
[anacondarepo]
|
||||||
|
name=anaconda repo
|
||||||
|
baseurl=$REPO
|
||||||
|
enabled=1
|
||||||
|
EOF
|
||||||
|
|
||||||
|
n=1
|
||||||
|
for r in $EXTRA_REPOS; do
|
||||||
|
if [[ $r =~ ^/ ]]; then
|
||||||
|
r="file://$r"
|
||||||
|
fi
|
||||||
|
cat >> $yumconf <<EOF
|
||||||
|
|
||||||
|
[anaconda-extrarepo-$n]
|
||||||
|
name=anaconda extra repo $n
|
||||||
|
baseurl=$r
|
||||||
|
enabled=1
|
||||||
|
EOF
|
||||||
|
let n++
|
||||||
|
done
|
||||||
|
|
||||||
|
n=1
|
||||||
|
for l in $MIRRORLIST; do
|
||||||
|
cat >> $yumconf <<EOF
|
||||||
|
|
||||||
|
[anaconda-mirrorlistrepo-$n]
|
||||||
|
name=anaconda mirrorlist repo $n
|
||||||
|
mirrorlist=$l
|
||||||
|
enabled=1
|
||||||
|
EOF
|
||||||
|
let n++
|
||||||
|
done
|
||||||
|
else
|
||||||
|
newyumconf=$(mktemp ${TMPDIR:-/tmp}/yum.conf.XXXXXX)
|
||||||
|
cp $yumconf $newyumconf
|
||||||
|
yumconf=$newyumconf
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Running buildinstall..."
|
||||||
|
|
||||||
|
if [ "$LOCALSCRIPTS" = "yes" ]; then
|
||||||
|
UPD_INSTROOT="$CWD/upd-instroot"
|
||||||
|
MK_IMAGES="$CWD/mk-images"
|
||||||
|
MK_TREEINFO="$CWD/maketreeinfo.py"
|
||||||
|
MK_STAMP="$CWD/makestamp.py"
|
||||||
|
BUILDINSTALL="$CWD/buildinstall"
|
||||||
|
else
|
||||||
|
pushd $BUILDINSTDIR
|
||||||
|
BUILDARCH=`repoquery -c $yumconf --qf "%{ARCH}\n" anaconda`
|
||||||
|
# lets use rpmutils to make sure we have the canonical basearch
|
||||||
|
# BUILDARCH != BASEARCH (e.g. i586 != i386, sparcv9 != sparc)
|
||||||
|
BASEARCH=`python -c "import rpmUtils.arch; \
|
||||||
|
print rpmUtils.arch.getBaseArch(myarch=rpmUtils.arch.getCanonArch(skipRpmPlatform = True));"`
|
||||||
|
yumdownloader -c $yumconf anaconda || exit 1
|
||||||
|
rpm2cpio anaconda*rpm | cpio --quiet -iumd './usr*'
|
||||||
|
rm -f anaconda*rpm
|
||||||
|
popd
|
||||||
|
|
||||||
|
UPD_INSTROOT=./upd-instroot
|
||||||
|
MK_IMAGES=./mk-images
|
||||||
|
MK_TREEINFO=./maketreeinfo.py
|
||||||
|
MK_STAMP=./makestamp.py
|
||||||
|
BUILDINSTALL=./buildinstall
|
||||||
|
|
||||||
|
for f in $UPD_INSTROOT $MK_IMAGES $MK_STAMP $MK_TREEINFO $BUILDINSTALL; do
|
||||||
|
if [ -n "$UPDATES" -a -f $UPDATES/usr/lib/anaconda-runtime/$f ]; then
|
||||||
|
cp -a $UPDATES/usr/lib/anaconda-runtime/$f* $BUILDINSTDIR/
|
||||||
|
elif [ ! -f $f ]; then
|
||||||
|
cp -a $BUILDINSTDIR/usr/lib/anaconda-runtime/$f* $BUILDINSTDIR/
|
||||||
|
else
|
||||||
|
cp -a $f* $BUILDINSTDIR/
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
UPD_INSTROOT=$BUILDINSTDIR/upd-instroot
|
||||||
|
MK_IMAGES=$BUILDINSTDIR/mk-images
|
||||||
|
MK_TREEINFO=$BUILDINSTDIR/maketreeinfo.py
|
||||||
|
MK_STAMP=$BUILDINSTDIR/makestamp.py
|
||||||
|
BUILDINSTALL=$BUILDINSTDIR/buildinstall
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$UPDATES" ]; then UPDATES="--updates $UPDATES"; fi
|
||||||
|
|
||||||
|
echo "Building images..."
|
||||||
|
$UPD_INSTROOT $DEBUGSTR $NOGRSTR --arch $BUILDARCH $UPDATES --imgdir $TREEDIR/install $yumconf || die "upd-instroot failed"
|
||||||
|
|
||||||
|
echo "Writing .treeinfo file..."
|
||||||
|
# NOTE --arch must match MK_IMAGES or the resulting treeinfo will be invalid
|
||||||
|
$MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BASEARCH --outfile=$OUTPUT/.treeinfo
|
||||||
|
|
||||||
|
# FIXME: need to update mk-images to take the yumconf
|
||||||
|
echo "Making images: $PWD"
|
||||||
|
$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BASEARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf || die "image creation failed"
|
||||||
|
|
||||||
|
echo "Writing .discinfo file"
|
||||||
|
$MK_STAMP --releasestr="$RELEASESTR" --arch=$BASEARCH --discNum="ALL" --outfile=$OUTPUT/.discinfo
|
||||||
|
|
||||||
|
rm -rf $TREEDIR $BUILDINSTDIR
|
||||||
|
rm -f $yumconf
|
||||||
18
revisor/revisor-2.2-comps.patch
Normal file
18
revisor/revisor-2.2-comps.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
diff -ur a/revisor/pungi.py b/revisor/pungi.py
|
||||||
|
--- a/revisor/pungi.py 2011-02-05 00:07:18.000000000 +0100
|
||||||
|
+++ b/revisor/pungi.py 2011-01-19 20:25:04.000000000 +0100
|
||||||
|
@@ -173,10 +173,10 @@
|
||||||
|
|
||||||
|
if comps:
|
||||||
|
# FIXME: Watch for https://bugzilla.redhat.com/show_bug.cgi?id=429509
|
||||||
|
- if hasattr(self.cfg.yumobj.comps,"xml"):
|
||||||
|
- ourcomps = open(comps, 'w')
|
||||||
|
- ourcomps.write(self.cfg.yumobj.comps.xml())
|
||||||
|
- ourcomps.close()
|
||||||
|
+ #if hasattr(self.cfg.yumobj.comps,"xml"):
|
||||||
|
+ # ourcomps = open(comps, 'w')
|
||||||
|
+ # ourcomps.write(self.cfg.yumobj.comps.xml())
|
||||||
|
+ # ourcomps.close()
|
||||||
|
|
||||||
|
# Let's clean up the comps file before moving anything around
|
||||||
|
# Run the xslt filter over our comps file
|
||||||
BIN
revisor/revisor-2.2.tar.gz
Normal file
BIN
revisor/revisor-2.2.tar.gz
Normal file
Binary file not shown.
799
revisor/revisor.spec
Normal file
799
revisor/revisor.spec
Normal file
@ -0,0 +1,799 @@
|
|||||||
|
%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
||||||
|
|
||||||
|
%define pkg_cobbler 1
|
||||||
|
%define pkg_comps 1
|
||||||
|
%define pkg_composer 0
|
||||||
|
%define pkg_delta 0
|
||||||
|
%define pkg_hub 0
|
||||||
|
%define pkg_isolinux 1
|
||||||
|
%define pkg_jigdo 0
|
||||||
|
%define pkg_mock 1
|
||||||
|
%define pkg_rebrand 0
|
||||||
|
%define pkg_reuseinstaller 1
|
||||||
|
%define pkg_server 0
|
||||||
|
%define pkg_unity 1
|
||||||
|
%define pkg_unity_scripts 1
|
||||||
|
%define pkg_virt 0
|
||||||
|
%define pkg_wui 0
|
||||||
|
|
||||||
|
Summary: Fedora "Spin" Graphical User Interface
|
||||||
|
Name: revisor
|
||||||
|
Version: 2.2
|
||||||
|
Release: 2%{?dist}
|
||||||
|
License: GPLv2
|
||||||
|
Group: Applications/System
|
||||||
|
URL: http://fedorahosted.org/revisor
|
||||||
|
Source0: http://fedorahosted.org/releases/r/e/revisor/%{name}-%{version}.tar.gz
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
|
BuildArch: noarch
|
||||||
|
Requires: revisor-gui = %{version}-%{release}
|
||||||
|
|
||||||
|
%description
|
||||||
|
Revisor provides a set of graphical tools for building customized, updated
|
||||||
|
Fedora "Spins". This tool has been built around two other projects. First
|
||||||
|
is pungi, which builds the installation media. The other is livecd-tools,
|
||||||
|
which builds the live image.
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor CLI
|
||||||
|
##
|
||||||
|
%package cli
|
||||||
|
Summary: Revisor CLI components
|
||||||
|
Group: Applications/System
|
||||||
|
BuildRequires: intltool, gettext, python, desktop-file-utils
|
||||||
|
|
||||||
|
Requires: revisor-comps = %{version}-%{release}
|
||||||
|
# Package Management Requirements
|
||||||
|
Requires: yum >= 3, yum-utils, comps-extras, createrepo
|
||||||
|
# Kickstart
|
||||||
|
Requires: pykickstart
|
||||||
|
# Compose tools
|
||||||
|
Requires: livecd-tools >= 015, anaconda-runtime, squashfs-tools
|
||||||
|
# Kickstarts for use with Revisor
|
||||||
|
Requires: spin-kickstarts
|
||||||
|
# Other
|
||||||
|
Requires: libxml2-python
|
||||||
|
Requires: notify-python
|
||||||
|
Requires: usermode
|
||||||
|
Requires: pam
|
||||||
|
Requires: python(abi) >= 2.4
|
||||||
|
Conflicts: fedora-release < 7
|
||||||
|
# Can't conflict with this one!
|
||||||
|
#Conflicts: centos-release < 5
|
||||||
|
# Can't conflict with this one!
|
||||||
|
#Conflicts: redhat-release < 5
|
||||||
|
# Or:
|
||||||
|
#Conflicts: redhat-release = 4, redhat-release = 3
|
||||||
|
Requires: fedora-kickstarts
|
||||||
|
Requires: custom-kickstarts
|
||||||
|
%if ! %{pkg_comps}
|
||||||
|
Obsoletes: revisor-comps < %{version}-%{release}
|
||||||
|
Provides: revisor-comps = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_cobbler}
|
||||||
|
Obsoletes: revisor-cobbler < %{version}-%{release}
|
||||||
|
Provides: revisor-cobbler = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_composer}
|
||||||
|
Obsoletes: revisor-composer < %{version}-%{release}
|
||||||
|
Provides: revisor-composer = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_delta}
|
||||||
|
Obsoletes: revisor-delta < %{version}-%{release}
|
||||||
|
Provides: revisor-delta = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_hub}
|
||||||
|
Obsoletes: revisor-hub < %{version}-%{release}
|
||||||
|
Provides: revisor-hub = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_isolinux}
|
||||||
|
Obsoletes: revisor-isolinux < %{version}-%{release}
|
||||||
|
Provides: revisor-isolinux = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_jigdo}
|
||||||
|
Obsoletes: revisor-jigdo < %{version}-%{release}
|
||||||
|
Provides: revisor-jigdo = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_mock}
|
||||||
|
Obsoletes: revisor-mock < %{version}-%{release}
|
||||||
|
Provides: revisor-mock = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_rebrand}
|
||||||
|
Obsoletes: revisor-rebrand < %{version}-%{release}
|
||||||
|
Provides: revisor-rebrand = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_reuseinstaller}
|
||||||
|
Obsoletes: revisor-reuseinstaller < %{version}-%{release}
|
||||||
|
Provides: revisor-reuseinstaller = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_server}
|
||||||
|
Obsoletes: revisor-server < %{version}-%{release}
|
||||||
|
Provides: revisor-server = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_unity}
|
||||||
|
Obsoletes: revisor-unity < %{version}-%{release}
|
||||||
|
Provides: revisor-unity = %{version}-%{release}
|
||||||
|
%else
|
||||||
|
Requires: revisor-unity = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_unity_scripts}
|
||||||
|
Obsoletes: revisor-unity-scripts < %{version}-%{release}
|
||||||
|
Provides: revisor-unity-scripts = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_virt}
|
||||||
|
Obsoletes: revisor-virt < %{version}-%{release}
|
||||||
|
Provides: revisor-virt = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%if ! %{pkg_wui}
|
||||||
|
Obsoletes: revisor-wui < %{version}-%{release}
|
||||||
|
Provides: revisor-wui = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
Source100: F13-buildinstall
|
||||||
|
Patch100: revisor-2.2-comps.patch
|
||||||
|
|
||||||
|
%description cli
|
||||||
|
Revisor provides a set of graphical tools for building customized, updated
|
||||||
|
Fedora "Spins". This tool has been built around two other projects. First
|
||||||
|
is pungi, which builds the installation media. The other is livecd-tools,
|
||||||
|
which builds the live image.
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor Comps
|
||||||
|
##
|
||||||
|
%if %{pkg_comps}
|
||||||
|
%package comps
|
||||||
|
Summary: Revisor Comps Files
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: revisor-cli = %{version}-%{release}
|
||||||
|
|
||||||
|
%description comps
|
||||||
|
A number of comps files, as up-to-date as possible
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor cobbler plugin
|
||||||
|
##
|
||||||
|
%if %{pkg_cobbler}
|
||||||
|
%package cobbler
|
||||||
|
Summary: Revisor Cobbler Integration
|
||||||
|
Group: Applications/System
|
||||||
|
ExcludeArch: ppc ppc64
|
||||||
|
Requires: cobbler, koan, revisor-cli = %{version}-%{release}
|
||||||
|
|
||||||
|
%description cobbler
|
||||||
|
Revisor Integration with Cobbler for having Revisor do DHCP, PXE,
|
||||||
|
Xen and KVM stuff.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor Composer plugin
|
||||||
|
##
|
||||||
|
%if %{pkg_composer}
|
||||||
|
%package composer
|
||||||
|
Summary: Revisor Composer, for use with the Hub
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: revisor-cli = %{version}-%{release}
|
||||||
|
|
||||||
|
%description composer
|
||||||
|
Revisor build farms need Composers. This is it.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor DeltaRPM/DeltaISO plugin
|
||||||
|
##
|
||||||
|
%if %{pkg_delta}
|
||||||
|
%package delta
|
||||||
|
Summary: Revisor Deltarpm Integration
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: deltarpm, revisor-cli = %{version}-%{release}
|
||||||
|
|
||||||
|
%description delta
|
||||||
|
Revisor Integration with deltarpm for generating delta ISO images.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor GUI
|
||||||
|
##
|
||||||
|
%package gui
|
||||||
|
Summary: Revisor GUI
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: revisor-cli = %{version}-%{release}, pygtk2 >= 2.9.2, pygtk2-libglade, gnome-python2-gconf
|
||||||
|
Requires: system-config-kickstart, system-config-keyboard >= 1.3.0
|
||||||
|
|
||||||
|
%description gui
|
||||||
|
This is the Revisor GUI package
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor HUB plugin
|
||||||
|
##
|
||||||
|
%if %{pkg_hub}
|
||||||
|
%package hub
|
||||||
|
Summary: Revisor Hub for build farms
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: revisor-cli = %{version}-%{release}
|
||||||
|
|
||||||
|
%description hub
|
||||||
|
Revisor build farms need a Hub. This is it.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor customize isolinux.cfg
|
||||||
|
##
|
||||||
|
%if %{pkg_isolinux}
|
||||||
|
%package isolinux
|
||||||
|
Summary: Revisor plugin for supplying a custom isolinux.cfg
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: revisor-cli = %{version}-%{release}
|
||||||
|
|
||||||
|
%description isolinux
|
||||||
|
Supply a custom isolinux.cfg to Revisor to incorporate in the installation media
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor Jigdo integration
|
||||||
|
##
|
||||||
|
%if %{pkg_jigdo}
|
||||||
|
%package jigdo
|
||||||
|
Summary: Revisor Integration with Jigdo
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: jigdo, revisor-cli = %{version}-%{release}
|
||||||
|
|
||||||
|
%description jigdo
|
||||||
|
Pre-Alpha of Revisor Integration with Jigdo for distributing your compose
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor Mock integration
|
||||||
|
##
|
||||||
|
%if %{pkg_mock}
|
||||||
|
%package mock
|
||||||
|
Summary: Revisor Integration with Mock
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: mock, revisor-cli = %{version}-%{release}
|
||||||
|
|
||||||
|
%description mock
|
||||||
|
Revisor Integration with Mock for building the installer images
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor Rebranding plugin
|
||||||
|
##
|
||||||
|
%if %{pkg_rebrand}
|
||||||
|
%package rebrand
|
||||||
|
Summary: Revisor Rebranding Fedora Utilies
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: revisor-cli = %{version}-%{release}, revisor-gui = %{version}-%{release}
|
||||||
|
|
||||||
|
%description rebrand
|
||||||
|
Utilities for Revisor to support rebranding Fedora
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor Re-Use Installer Images plugin
|
||||||
|
##
|
||||||
|
%if %{pkg_reuseinstaller}
|
||||||
|
%package reuseinstaller
|
||||||
|
Summary: Revisor Plugin to enable Reusing existing installer images
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: revisor-cli = %{version}-%{release}
|
||||||
|
|
||||||
|
%description reuseinstaller
|
||||||
|
Revisor Plugin to enable Reusing existing installer images
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor Server plugin
|
||||||
|
##
|
||||||
|
%if %{pkg_server}
|
||||||
|
%package server
|
||||||
|
Summary: Revisor Server
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: revisor-cli = %{version}-%{release}
|
||||||
|
|
||||||
|
%description server
|
||||||
|
Utilities for Revisor to support rebranding Fedora
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Fedora Unity Configuration and Scripts for Revisor
|
||||||
|
##
|
||||||
|
%if %{pkg_unity}
|
||||||
|
%package unity
|
||||||
|
Summary: Fedora Unity Configuration and Scripts for Revisor
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: revisor-cli
|
||||||
|
|
||||||
|
%description unity
|
||||||
|
The configuration files and scripts Fedora Unity uses with
|
||||||
|
Revisor to create Re-Spins and do testing.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Fedora Unity Configuration and Scripts for Revisor
|
||||||
|
##
|
||||||
|
%if %{pkg_unity_scripts}
|
||||||
|
%package unity-scripts
|
||||||
|
Summary: Fedora Unity Configuration and Scripts for Revisor
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: revisor-cli
|
||||||
|
|
||||||
|
%description unity-scripts
|
||||||
|
The configuration files and scripts Fedora Unity uses with
|
||||||
|
Revisor to create Re-Spins and do testing.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor virtualization plugin
|
||||||
|
##
|
||||||
|
%if %{pkg_virt}
|
||||||
|
%package virt
|
||||||
|
Summary: Revisor Virtualization Media Features
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: python-virtinst, revisor-cli = %{version}-%{release}
|
||||||
|
|
||||||
|
%description virt
|
||||||
|
Revisor Virtualization Media Features for provisioning virtual guests
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##
|
||||||
|
## Revisor WUI
|
||||||
|
##
|
||||||
|
%if %{pkg_wui}
|
||||||
|
%package wui
|
||||||
|
Summary: Revisor WUI
|
||||||
|
Group: Applications/System
|
||||||
|
Requires: revisor-cli = %{version}-%{release}
|
||||||
|
|
||||||
|
%description wui
|
||||||
|
This is the Revisor Web User Interface package
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
%patch100 -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
%configure
|
||||||
|
make
|
||||||
|
|
||||||
|
%install
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/usr/lib/revisor/scripts/F13-buildinstall
|
||||||
|
|
||||||
|
%if ! %{pkg_comps}
|
||||||
|
rm -rf %{buildroot}/%{_datadir}/revisor/comps
|
||||||
|
rm -rf %{buildroot}/%{_datadir}/revisor/comps-cleanup.xsl
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_cobbler}
|
||||||
|
rm -rf %{buildroot}/%{python_sitelib}/revisor/modcobbler
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_composer}
|
||||||
|
rm -rf %{buildroot}/%{python_sitelib}/revisor/modcomposer
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_delta}
|
||||||
|
rm -rf %{buildroot}/%{python_sitelib}/revisor/moddelta
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_hub}
|
||||||
|
rm -rf %{buildroot}/%{python_sitelib}/revisor/modhub
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_isolinux}
|
||||||
|
rm -rf %{buildroot}/%{python_sitelib}/revisor/modisolinux
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_jigdo}
|
||||||
|
rm -rf %{buildroot}/%{python_sitelib}/revisor/modjigdo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_mock}
|
||||||
|
rm -rf %{buildroot}/%{python_sitelib}/revisor/modmock
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_rebrand}
|
||||||
|
rm -rf %{buildroot}/%{python_sitelib}/revisor/modrebrand
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_reuseinstaller}
|
||||||
|
rm -rf %{buildroot}/%{python_sitelib}/revisor/modreuseinstaller
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_server}
|
||||||
|
rm -rf %{buildroot}/%{python_sitelib}/revisor/modserver
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_unity}
|
||||||
|
rm -rf %{buildroot}/%{_sysconfdir}/revisor-unity/
|
||||||
|
rm -rf %{buildroot}/%{_datadir}/revisor/unity/
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_unity_scripts}
|
||||||
|
rm -rf %{buildroot}/%{_datadir}/revisor/unity/scripts/
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_virt}
|
||||||
|
rm -rf %{buildroot}/%{python_sitelib}/revisor/modvirt
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if ! %{pkg_wui}
|
||||||
|
rm -rf %{buildroot}/%{python_sitelib}/revisor/modwui
|
||||||
|
%endif
|
||||||
|
|
||||||
|
desktop-file-install --vendor="fedora" \
|
||||||
|
--delete-original \
|
||||||
|
--dir=%{buildroot}%{_datadir}/applications \
|
||||||
|
%{buildroot}/%{_datadir}/applications/revisor.desktop
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
|
||||||
|
%files cli
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%doc README NEWS AUTHORS COPYING
|
||||||
|
%doc %{_mandir}/man5/*
|
||||||
|
%doc %{_mandir}/man8/*
|
||||||
|
%dir %{_datadir}/revisor
|
||||||
|
%dir %{python_sitelib}/revisor
|
||||||
|
%{python_sitelib}/revisor/*.py
|
||||||
|
%{python_sitelib}/revisor/*.pyc
|
||||||
|
%{python_sitelib}/revisor/*.pyo
|
||||||
|
%{_bindir}/*
|
||||||
|
%{_sbindir}/*
|
||||||
|
%dir %{_prefix}/lib/revisor
|
||||||
|
%dir %{_prefix}/lib/revisor/scripts
|
||||||
|
%dir %{_sysconfdir}/revisor
|
||||||
|
%dir %{_sysconfdir}/revisor/conf.d
|
||||||
|
%config(noreplace) %{_sysconfdir}/revisor/revisor.conf
|
||||||
|
%config(noreplace) %{_sysconfdir}/revisor/conf.d/*
|
||||||
|
%config(noreplace) %{_sysconfdir}/pam.d/*
|
||||||
|
%config(noreplace) %{_sysconfdir}/security/console.apps/*
|
||||||
|
%{_datadir}/locale/*/LC_MESSAGES/revisor.mo
|
||||||
|
%defattr(0755,root,root,-)
|
||||||
|
%{_prefix}/lib/revisor/scripts/*
|
||||||
|
|
||||||
|
%if %{pkg_comps}
|
||||||
|
%files comps
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{_datadir}/revisor/comps/
|
||||||
|
%{_datadir}/revisor/comps/*
|
||||||
|
%{_datadir}/revisor/comps-cleanup.xsl
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_cobbler}
|
||||||
|
%files cobbler
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/modcobbler
|
||||||
|
%{python_sitelib}/revisor/modcobbler/*.py
|
||||||
|
%{python_sitelib}/revisor/modcobbler/*.pyc
|
||||||
|
%{python_sitelib}/revisor/modcobbler/*.pyo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_composer}
|
||||||
|
%files composer
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/modcomposer
|
||||||
|
%{python_sitelib}/revisor/modcomposer/*.py
|
||||||
|
%{python_sitelib}/revisor/modcomposer/*.pyc
|
||||||
|
%{python_sitelib}/revisor/modcomposer/*.pyo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_delta}
|
||||||
|
%files delta
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/moddelta
|
||||||
|
%{python_sitelib}/revisor/moddelta/*.py
|
||||||
|
%{python_sitelib}/revisor/moddelta/*.pyc
|
||||||
|
%{python_sitelib}/revisor/moddelta/*.pyo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files gui
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/modgui
|
||||||
|
%{python_sitelib}/revisor/modgui/*.py
|
||||||
|
%{python_sitelib}/revisor/modgui/*.pyc
|
||||||
|
%{python_sitelib}/revisor/modgui/*.pyo
|
||||||
|
%dir %{_datadir}/revisor/ui
|
||||||
|
%dir %{_datadir}/revisor/pixmaps
|
||||||
|
%{_datadir}/revisor/ui/*
|
||||||
|
%{_datadir}/revisor/pixmaps/*
|
||||||
|
%{_datadir}/pixmaps/*
|
||||||
|
%{_datadir}/applications/*.desktop
|
||||||
|
|
||||||
|
%if %{pkg_hub}
|
||||||
|
%files hub
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/modhub
|
||||||
|
%{python_sitelib}/revisor/modhub/*.py
|
||||||
|
%{python_sitelib}/revisor/modhub/*.pyc
|
||||||
|
%{python_sitelib}/revisor/modhub/*.pyo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_isolinux}
|
||||||
|
%files isolinux
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/modisolinux
|
||||||
|
%{python_sitelib}/revisor/modisolinux/*.py
|
||||||
|
%{python_sitelib}/revisor/modisolinux/*.pyc
|
||||||
|
%{python_sitelib}/revisor/modisolinux/*.pyo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_jigdo}
|
||||||
|
%files jigdo
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/modjigdo
|
||||||
|
%{python_sitelib}/revisor/modjigdo/*.py
|
||||||
|
%{python_sitelib}/revisor/modjigdo/*.pyc
|
||||||
|
%{python_sitelib}/revisor/modjigdo/*.pyo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_mock}
|
||||||
|
%files mock
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/modmock
|
||||||
|
%{python_sitelib}/revisor/modmock/*.py
|
||||||
|
%{python_sitelib}/revisor/modmock/*.pyc
|
||||||
|
%{python_sitelib}/revisor/modmock/*.pyo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_rebrand}
|
||||||
|
%files rebrand
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/modrebrand
|
||||||
|
%{python_sitelib}/revisor/modrebrand/*.py
|
||||||
|
%{python_sitelib}/revisor/modrebrand/*.pyc
|
||||||
|
%{python_sitelib}/revisor/modrebrand/*.pyo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_reuseinstaller}
|
||||||
|
%files reuseinstaller
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/modreuseinstaller
|
||||||
|
%{python_sitelib}/revisor/modreuseinstaller/*.py
|
||||||
|
%{python_sitelib}/revisor/modreuseinstaller/*.pyc
|
||||||
|
%{python_sitelib}/revisor/modreuseinstaller/*.pyo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_server}
|
||||||
|
%files server
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/modserver
|
||||||
|
%{python_sitelib}/revisor/modserver/*.py
|
||||||
|
%{python_sitelib}/revisor/modserver/*.pyc
|
||||||
|
%{python_sitelib}/revisor/modserver/*.pyo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_unity}
|
||||||
|
%files unity
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{_sysconfdir}/revisor-unity
|
||||||
|
%dir %{_sysconfdir}/revisor-unity/conf.d
|
||||||
|
%config(noreplace) %{_sysconfdir}/revisor-unity/*.conf
|
||||||
|
%config(noreplace) %{_sysconfdir}/revisor-unity/conf.d/*
|
||||||
|
%dir %{_datadir}/revisor/unity/
|
||||||
|
%{_datadir}/revisor/unity/*.*
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_unity_scripts}
|
||||||
|
%files unity-scripts
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{_datadir}/revisor/unity/scripts/
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_virt}
|
||||||
|
%files virt
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/modvirt
|
||||||
|
%{python_sitelib}/revisor/modvirt/*.py
|
||||||
|
%{python_sitelib}/revisor/modvirt/*.pyc
|
||||||
|
%{python_sitelib}/revisor/modvirt/*.pyo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{pkg_wui}
|
||||||
|
%files wui
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python_sitelib}/revisor/modwui
|
||||||
|
%{python_sitelib}/revisor/modwui/*.py
|
||||||
|
%{python_sitelib}/revisor/modwui/*.pyc
|
||||||
|
%{python_sitelib}/revisor/modwui/*.pyo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 2.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||||
|
|
||||||
|
* Fri Jun 04 2010 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.2-1
|
||||||
|
- Fix os not being imported (#541443)
|
||||||
|
|
||||||
|
* Tue Nov 24 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.8-2
|
||||||
|
- Fix configuration file issues
|
||||||
|
- Better estimation for the size of a tree that is to become an iso
|
||||||
|
- Huge improvements to package ordering
|
||||||
|
- Exclude boot.iso from installation media iso files
|
||||||
|
|
||||||
|
* Mon Sep 7 2009 Jonathan Steffan <jon a fedoraunity.org> 2.1.8-2
|
||||||
|
- Remove rhpl
|
||||||
|
- Add s-c-keyboard Requires
|
||||||
|
|
||||||
|
* Thu Feb 25 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.3-1
|
||||||
|
- Add modmock, modhub, modcomposer
|
||||||
|
- Rebuild for Fedora 10
|
||||||
|
- Include modisolinux and modreuseinstaller
|
||||||
|
|
||||||
|
* Wed Oct 22 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.2-2
|
||||||
|
- Fix anaconda removing splittree.py
|
||||||
|
- Latest rebuild
|
||||||
|
- Minor bugfixes (#344 pkgorder traceback)
|
||||||
|
- Add SELinux Check
|
||||||
|
|
||||||
|
* Tue Jul 01 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.1-5
|
||||||
|
- Fix running GUI
|
||||||
|
- Add check for architecture composing
|
||||||
|
- Bugfixes in live media creation
|
||||||
|
- Add bluray disc support
|
||||||
|
- F-9 Release
|
||||||
|
|
||||||
|
* Wed Jan 30 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.0-1rc5
|
||||||
|
- Add Rescue Image capabilities
|
||||||
|
- Add modserver into package
|
||||||
|
- Remove conflicts
|
||||||
|
- Updates
|
||||||
|
- Let's not build revisor-cobbler on ppc/ppc64
|
||||||
|
|
||||||
|
* Thu Dec 20 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.0-1rc2
|
||||||
|
- Updates to many components related to plugins and kickstart
|
||||||
|
|
||||||
|
* Wed Nov 07 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.0-1rc1
|
||||||
|
- import piruterrors
|
||||||
|
- Minor fixes related to respinning Fedora for release
|
||||||
|
- Applied patch from Alexander Todorov for filtering comps
|
||||||
|
- Applied patch from Alexander Todorov to get_comps() failing when comps not tidy
|
||||||
|
- Move GUI to it's own package
|
||||||
|
- API changes!
|
||||||
|
- Point at Everything, not Fedora (from 2.0.5-13)
|
||||||
|
- Add in ignore_list for pkglist_required() (from 2.0.5-13)
|
||||||
|
- Catch a Bob Jensen Corner Case (from 2.0.5-13)
|
||||||
|
- Minor bugfixes in packaging (from 2.0.5-13)
|
||||||
|
- Other minor fixes (from 2.0.5-13)
|
||||||
|
|
||||||
|
* Sat Oct 20 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.5-5
|
||||||
|
- Update spec for release
|
||||||
|
|
||||||
|
* Tue Oct 02 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.5-3
|
||||||
|
- Bugfixes to x86_64 packageSack creation
|
||||||
|
- Bugfixes
|
||||||
|
|
||||||
|
* Fri Sep 07 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-7
|
||||||
|
- Bugfixes
|
||||||
|
- Removed pungi dependency
|
||||||
|
- Added kickstart interfacing for pykickstart API differences
|
||||||
|
- Enable Revisor to run in CLI mode on Enterprise Linux 5
|
||||||
|
- Split comps in their own package
|
||||||
|
- Add rebrand module
|
||||||
|
- Fixed pkgorder, copy_dir
|
||||||
|
- Development release
|
||||||
|
|
||||||
|
* Thu Aug 09 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.2-1
|
||||||
|
- Added Source RPM Tree for Installation Media
|
||||||
|
- Rebased livecd-tools and created/submitted the necessary patches
|
||||||
|
- Added pre-alpha jigdo sub-package
|
||||||
|
- Disable jigdo, virt and dual media compose for release
|
||||||
|
- Lots of bug fixes
|
||||||
|
- Fixed up some features
|
||||||
|
|
||||||
|
* Thu Jul 26 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.2-1rc1
|
||||||
|
- Adding a workaround fix for yum issues
|
||||||
|
|
||||||
|
* Tue Jul 10 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.4.1-2
|
||||||
|
- Trivial specfile change
|
||||||
|
- Added one for one delta suport
|
||||||
|
|
||||||
|
* Sun Jul 01 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.1-1rc2
|
||||||
|
- Adding cobbler support for CLI mode
|
||||||
|
- Fixing pkgorder issue
|
||||||
|
- Fixing inefficient pkgorder
|
||||||
|
- Adding Enterprise Linux configuration files
|
||||||
|
- Moving some packages to be suggested instead of required
|
||||||
|
- Fixed progress bar during ISO creation
|
||||||
|
- Fixed SHA1SUM file not having all ISOs
|
||||||
|
- Adding full support for installation tree and cleanup
|
||||||
|
|
||||||
|
* Wed Jun 27 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.4.0-1
|
||||||
|
- Bugfixes from 2.0.3.x
|
||||||
|
- Start of all the new features of 2.0.4
|
||||||
|
|
||||||
|
* Sun Jun 24 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.3.12-1
|
||||||
|
- Removed excludearchs ppc, ppc64 and added some logic to the spec file
|
||||||
|
including a patch to disable livecd composure.
|
||||||
|
- Fixed bug in repository configuration
|
||||||
|
- Re-enabled CLI
|
||||||
|
|
||||||
|
* Sat Jun 23 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.3.11-1
|
||||||
|
- Adding comps-f7 to our distribution
|
||||||
|
- Removing pungi configuration files
|
||||||
|
- Fixed a major bug in unlinking / unmounting the left-overs of a previous
|
||||||
|
live media run.
|
||||||
|
- Enabled translation
|
||||||
|
- Added ExcludeArch: ppc, ppc64. Our dependency livecd-tools is not available
|
||||||
|
for these archs.
|
||||||
|
|
||||||
|
* Sun Jun 17 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.3.10-1
|
||||||
|
- Final round of fixes for 2.0.3.x
|
||||||
|
- Added requirement for fedora-release >= 7
|
||||||
|
|
||||||
|
* Sun Jun 10 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.3.9-1
|
||||||
|
- Bugfixes, more bugfixes
|
||||||
|
|
||||||
|
* Thu Jun 07 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.3.8-1
|
||||||
|
- Updated to 2.0.3.8
|
||||||
|
- More major bugfixes
|
||||||
|
|
||||||
|
* Tue Jun 05 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.3.7-1
|
||||||
|
- Major bugfixes and speed improvements - tagging for reference purposes
|
||||||
|
- Added /etc/revisor/comps-fc6.xml as a %%config file
|
||||||
|
|
||||||
|
* Thu May 31 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.3.6-1
|
||||||
|
- Updated with all combined changes for release
|
||||||
|
- Fixed up configs
|
||||||
|
- Added fc6 comps data
|
||||||
|
- Bug fixes from LinuxTag
|
||||||
|
|
||||||
|
* Wed May 30 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.3-1
|
||||||
|
- Repackage for release
|
||||||
|
|
||||||
|
* Thu May 24 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.2-3
|
||||||
|
- Added desktop-file-install and needed BR
|
||||||
|
- Updated for COPYING
|
||||||
|
- Updated revisor.desktop
|
||||||
|
|
||||||
|
* Thu May 17 2007 Jeroen van meeuwen <kanarip a fedoraunity.org> 2.0.2-2
|
||||||
|
- Rebuild
|
||||||
|
|
||||||
|
* Tue May 08 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.2-1
|
||||||
|
- Final beta version for RH Summit 2007, San Diego
|
||||||
|
|
||||||
|
* Mon May 07 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.1-5
|
||||||
|
- Fixed configuration files
|
||||||
|
- New files added
|
||||||
|
|
||||||
|
* Mon Apr 30 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.1-4
|
||||||
|
- Fixed symlink to consolehelper relative path instead of absolute
|
||||||
|
path in Makefile, rather then specfile
|
||||||
|
- Added missing s-c-kickstart dep
|
||||||
|
- Fixed shipped config files to be more targeted for end users
|
||||||
|
|
||||||
|
* Tue Apr 17 2007 Jef Spaleta <jspaleta@gmail.com> 2.0.1-3
|
||||||
|
- Specfile cleanup for fedora package submission review
|
||||||
|
- remove makeinstall macro
|
||||||
|
- add usermode and pam requires
|
||||||
|
- removed desktop-update-database scriptlets and associated deps
|
||||||
|
|
||||||
|
* Mon Apr 16 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.1-2
|
||||||
|
- Corrected some file locations
|
||||||
|
- Build for F7
|
||||||
|
|
||||||
|
* Wed Apr 11 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.1-1
|
||||||
|
- Updated for the new revisor 2.x
|
||||||
|
|
||||||
|
* Sat Feb 17 2007 Jonathan Steffan <jon a fedoraunity.org> 1.0.2-1
|
||||||
|
- Updated config (in)sanity
|
||||||
|
- Added some configuration options
|
||||||
|
|
||||||
|
* Thu Feb 15 2007 Jonathan Steffan <jon a fedoraunity.org> 1.0.1-1
|
||||||
|
- Added a "Select All" button to help ease full distro Re-Spins
|
||||||
|
|
||||||
|
* Wed Feb 14 2007 Jonathan Steffan <jon a fedoraunity.org> 1.0-2
|
||||||
|
- Cleaned up code to include as little duplicate Pirut code as
|
||||||
|
possible.
|
||||||
|
- Updated config file to default to mirrorlist
|
||||||
|
|
||||||
|
* Mon Feb 12 2007 Jonathan Steffan <jon a fedoraunity.org> 1.0-1
|
||||||
|
- Initial build based on pirutspin 1.0-1
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user