rpms/livecd-tools/EL-5 import.log, NONE, 1.1 livecd-tools-013-iso-to-disk-path.patch, NONE, 1.1 livecd-tools-013-ksconfigs.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 livecd-tools.spec, 1.16, 1.17 sources, 1.8, 1.9 imgcreate-old-pykickstart.patch, 1.1, NONE imgcreate-try-finally.patch, 1.1, NONE livecd-iso-to-disk-path.patch, 1.1, NONE
Jeroen van Meeuwen (kanarip)
fedora-extras-commits at redhat.com
Sun Aug 3 17:56:07 UTC 2008
- Previous message (by thread): rpms/perl-RRD-Simple/devel .cvsignore, 1.5, 1.6 perl-RRD-Simple.spec, 1.8, 1.9 sources, 1.5, 1.6
- Next message (by thread): rpms/jd/F-8 .cvsignore, 1.267, 1.268 jd.spec, 1.300, 1.301 sources, 1.268, 1.269
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kanarip
Update of /cvs/pkgs/rpms/livecd-tools/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8578/EL-5
Modified Files:
.cvsignore livecd-tools.spec sources
Added Files:
import.log livecd-tools-013-iso-to-disk-path.patch
livecd-tools-013-ksconfigs.patch
Removed Files:
imgcreate-old-pykickstart.patch imgcreate-try-finally.patch
livecd-iso-to-disk-path.patch
Log Message:
013-6.el5
--- NEW FILE import.log ---
livecd-tools-013-6_el5:EL-5:livecd-tools-013-6.el5.src.rpm:1217786115
livecd-tools-013-iso-to-disk-path.patch:
--- NEW FILE livecd-tools-013-iso-to-disk-path.patch ---
--- livecd/tools.orig/livecd-iso-to-disk.sh 2008-01-29 14:40:58.000000000 +0530
+++ livecd/tools/livecd-iso-to-disk.sh 2008-01-29 14:42:09.000000000 +0530
@@ -176,7 +176,7 @@
if [ -z "$noverify" ]; then
# verify the image
echo "Verifying image..."
- checkisomd5 --verbose $ISO
+ /usr/lib/anaconda-runtime/checkisomd5 --verbose $ISO
if [ $? -ne 0 ]; then
echo "Are you SURE you want to continue?"
echo "Press Enter to continue or ctrl-c to abort"
livecd-tools-013-ksconfigs.patch:
--- NEW FILE livecd-tools-013-ksconfigs.patch ---
diff -u livecd-tools-013.orig/config/livecd-fedora-8-base-desktop.ks livecd-tools-013/config/livecd-fedora-8-base-desktop.ks
--- livecd-tools-013.orig/config/livecd-fedora-8-base-desktop.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livecd-fedora-8-base-desktop.ks 2008-08-03 19:44:23.000000000 +0200
@@ -62,7 +62,6 @@
# make sure debuginfo doesn't end up on the live image
-*debuginfo
-%end
%post
# FIXME: it'd be better to get this installed from a package
@@ -163,7 +162,6 @@
# make sure there aren't core files lying around
rm -f /core*
-%end
%post --nochroot
@@ -174,4 +172,3 @@
if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
fi
-%end
diff -u livecd-tools-013.orig/config/livecd-fedora-8-desktop.ks livecd-tools-013/config/livecd-fedora-8-desktop.ks
--- livecd-tools-013.orig/config/livecd-fedora-8-desktop.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livecd-fedora-8-desktop.ks 2008-08-03 19:44:23.000000000 +0200
@@ -126,7 +126,6 @@
-nss_db
-vino
-%end
%post
cat >> /etc/rc.d/init.d/fedora-live << EOF
@@ -142,4 +141,3 @@
EOF
-%end
diff -u livecd-tools-013.orig/config/livecd-fedora-8-developer.ks livecd-tools-013/config/livecd-fedora-8-developer.ks
--- livecd-tools-013.orig/config/livecd-fedora-8-developer.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livecd-fedora-8-developer.ks 2008-08-03 19:44:23.000000000 +0200
@@ -79,7 +79,6 @@
#@x-software-development
# I think this is going to be too big on x86_64
#*-devel
-%end
%post
# Enable debuginfo repository (useful for frysk, gdb, etc.)
@@ -112,4 +111,3 @@
ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos"
popd
EOF
-%end
diff -u livecd-tools-013.orig/config/livecd-fedora-8-electronic-lab.ks livecd-tools-013/config/livecd-fedora-8-electronic-lab.ks
--- livecd-tools-013.orig/config/livecd-fedora-8-electronic-lab.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livecd-fedora-8-electronic-lab.ks 2008-08-03 19:44:23.000000000 +0200
@@ -111,7 +111,6 @@
#computing
octave
-%end
%post
@@ -233,5 +232,4 @@
/sbin/chkconfig --del rpcidmapd
/sbin/chkconfig --del rpcbind
-%end
diff -u livecd-tools-013.orig/config/livecd-fedora-8-games.ks livecd-tools-013/config/livecd-fedora-8-games.ks
--- livecd-tools-013.orig/config/livecd-fedora-8-games.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livecd-fedora-8-games.ks 2008-08-03 19:44:23.000000000 +0200
@@ -152,4 +152,3 @@
games-menus
wget
-%end
diff -u livecd-tools-013.orig/config/livecd-fedora-8-kde.ks livecd-tools-013/config/livecd-fedora-8-kde.ks
--- livecd-tools-013.orig/config/livecd-fedora-8-kde.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livecd-fedora-8-kde.ks 2008-08-03 19:44:23.000000000 +0200
@@ -57,7 +57,6 @@
python-imaging
python-reportlab
-%end
%post
# create /etc/sysconfig/desktop (needed for installation)
@@ -95,4 +94,3 @@
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
EOF
-%end
diff -u livecd-tools-013.orig/config/livecd-fedora-base-desktop.ks livecd-tools-013/config/livecd-fedora-base-desktop.ks
--- livecd-tools-013.orig/config/livecd-fedora-base-desktop.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livecd-fedora-base-desktop.ks 2008-08-03 19:44:23.000000000 +0200
@@ -61,7 +61,6 @@
# make sure debuginfo doesn't end up on the live image
-*debuginfo
-%end
%post
# FIXME: it'd be better to get this installed from a package
@@ -166,7 +165,6 @@
# make sure there aren't core files lying around
rm -f /core*
-%end
%post --nochroot
@@ -178,4 +176,3 @@
if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
fi
-%end
diff -u livecd-tools-013.orig/config/livecd-fedora-desktop.ks livecd-tools-013/config/livecd-fedora-desktop.ks
--- livecd-tools-013.orig/config/livecd-fedora-desktop.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livecd-fedora-desktop.ks 2008-08-03 19:44:23.000000000 +0200
@@ -127,7 +127,6 @@
-nss_db
-vino
-%end
%post
cat >> /etc/rc.d/init.d/fedora-live << EOF
@@ -143,4 +142,3 @@
EOF
-%end
diff -u livecd-tools-013.orig/config/livecd-fedora-developer.ks livecd-tools-013/config/livecd-fedora-developer.ks
--- livecd-tools-013.orig/config/livecd-fedora-developer.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livecd-fedora-developer.ks 2008-08-03 19:44:23.000000000 +0200
@@ -80,7 +80,6 @@
#@x-software-development
# I think this is going to be too big on x86_64
#*-devel
-%end
%post
# Enable debuginfo repository (useful for frysk, gdb, etc.)
@@ -113,4 +112,3 @@
ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos"
popd
EOF
-%end
diff -u livecd-tools-013.orig/config/livecd-fedora-electronic-lab.ks livecd-tools-013/config/livecd-fedora-electronic-lab.ks
--- livecd-tools-013.orig/config/livecd-fedora-electronic-lab.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livecd-fedora-electronic-lab.ks 2008-08-03 19:44:23.000000000 +0200
@@ -111,7 +111,6 @@
#computing
octave
-%end
%post
@@ -233,5 +232,4 @@
/sbin/chkconfig --del rpcidmapd
/sbin/chkconfig --del rpcbind
-%end
diff -u livecd-tools-013.orig/config/livecd-fedora-kde.ks livecd-tools-013/config/livecd-fedora-kde.ks
--- livecd-tools-013.orig/config/livecd-fedora-kde.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livecd-fedora-kde.ks 2008-08-03 19:44:23.000000000 +0200
@@ -58,7 +58,6 @@
# save some space
-autofs
-%end
%post
@@ -104,4 +103,3 @@
# workaround to start nm-applet automatically
cp /etc/xdg/autostart/nm-applet.desktop /usr/share/autostart/
-%end
diff -u livecd-tools-013.orig/config/livecd-fedora-minimal.ks livecd-tools-013/config/livecd-fedora-minimal.ks
--- livecd-tools-013.orig/config/livecd-fedora-minimal.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livecd-fedora-minimal.ks 2008-08-03 19:44:23.000000000 +0200
@@ -19,4 +19,3 @@
authconfig
rootfiles
-%end
diff -u livecd-tools-013.orig/config/livedvd-fedora-kde.ks livecd-tools-013/config/livedvd-fedora-kde.ks
--- livecd-tools-013.orig/config/livedvd-fedora-kde.ks 2008-01-24 17:48:44.000000000 +0100
+++ livecd-tools-013/config/livedvd-fedora-kde.ks 2008-08-03 19:44:23.000000000 +0200
@@ -94,7 +94,6 @@
# and some extra packages
koffice-*
-%end
%post
@@ -106,4 +105,3 @@
#DISPLAYMANAGER="KDE"
EOF
-%end
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 28 Jan 2008 22:55:54 -0000 1.8
+++ .cvsignore 3 Aug 2008 17:55:37 -0000 1.9
@@ -1,3 +1,3 @@
+livecd-tools-013-old-pykickstart.patch
+livecd-tools-013-try-finally.patch
livecd-tools-013.tar.bz2
-imgcreate-try-finally.patch
-imgcreate-old-pykickstart.patch
Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/EL-5/livecd-tools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- livecd-tools.spec 29 Jan 2008 07:22:57 -0000 1.16
+++ livecd-tools.spec 3 Aug 2008 17:55:37 -0000 1.17
@@ -4,15 +4,16 @@
Summary: Tools for building live CD's
Name: livecd-tools
Version: 013
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://git.fedoraproject.org/?p=hosted/livecd
Source0: %{name}-%{version}.tar.bz2
#Source0: livecd.tar.bz2
-Patch0: imgcreate-old-pykickstart.patch
-Patch1: imgcreate-try-finally.patch
-Patch2: livecd-iso-to-disk-path.patch
+Patch0: livecd-tools-013-old-pykickstart.patch
+Patch1: livecd-tools-013-try-finally.patch
+Patch2: livecd-tools-013-iso-to-disk-path.patch
+Patch3: livecd-tools-013-ksconfigs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: util-linux
Requires: coreutils
@@ -43,6 +44,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
make
@@ -67,15 +69,21 @@
%{python_sitelib}/imgcreate/*
%changelog
+* Sun Aug 03 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 013-6
+- Fix ksconfigs
* Tue Jan 29 2008 Rahul Sundaram <sundaram at fedoraproject.org> - 013-5
- Patch livecd-iso-to-disk for checkisomd5 location
+- Patch livecd-iso-to-disk for checkisomd5 location
+
* Tue Jan 29 2008 Rahul Sundaram <sundaram at fedoraproject.org> - 013-4
- Use python sitelib macro properly
+
* Tue Jan 29 2008 Rahul Sundaram <sundaram at fedoraproject.org> - 013-3
- Fix build on x86_64
+- Fix build on x86_64
+
* Mon Jan 28 2008 Rahul Sundaram <sundaram at fedoraproject.org> - 013-2
- Initial build for EPEL
+
* Mon Oct 29 2007 Jeremy Katz <katzj at redhat.com> - 013-1
- Lots of config updates
- Support 'device foo' to say what modules go in the initramfs
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 28 Jan 2008 22:55:54 -0000 1.8
+++ sources 3 Aug 2008 17:55:37 -0000 1.9
@@ -1,3 +1,3 @@
+53251902c354f369e37b58eaf67dc618 livecd-tools-013-old-pykickstart.patch
+09b18795b56fa0a0a038e7267211c9e1 livecd-tools-013-try-finally.patch
55bb7b79917de9136b2e0b29966b5589 livecd-tools-013.tar.bz2
-09b18795b56fa0a0a038e7267211c9e1 imgcreate-try-finally.patch
-53251902c354f369e37b58eaf67dc618 imgcreate-old-pykickstart.patch
--- imgcreate-old-pykickstart.patch DELETED ---
--- imgcreate-try-finally.patch DELETED ---
--- livecd-iso-to-disk-path.patch DELETED ---
- Previous message (by thread): rpms/perl-RRD-Simple/devel .cvsignore, 1.5, 1.6 perl-RRD-Simple.spec, 1.8, 1.9 sources, 1.5, 1.6
- Next message (by thread): rpms/jd/F-8 .cvsignore, 1.267, 1.268 jd.spec, 1.300, 1.301 sources, 1.268, 1.269
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list