Author: thl Update of /cvs/nonfree/rpms/rpmfusion-nonfree-remix-kickstarts/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv29360 Modified Files: rpmfusion-nonfree-live-base.ks rpmfusion-nonfree-livecd-desktop.ks rpmfusion-nonfree-livecd-kde.ks rpmfusion-nonfree-remix-kickstarts.spec Log Message: * Mon Jun 01 2009 Thorsten Leemhuis <fedora at leemhuis dot info > 0.11.1-5 - add disabled repo definitions for f11 release - make the base config "includepkgs=rpmfusion-nonfree-release" Index: rpmfusion-nonfree-live-base.ks =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-remix-kickstarts/devel/rpmfusion-nonfree-live-base.ks,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rpmfusion-nonfree-live-base.ks 24 May 2009 11:27:53 -0000 1.2 +++ rpmfusion-nonfree-live-base.ks 1 Jun 2009 13:51:59 -0000 1.3 @@ -5,9 +5,20 @@ # include /usr/share/rpmfusion-free-remix-kickstarts/rpmfusion-free-live-base.ks # directly or indirectly via some other "live" kickstart file from the package # rpmfusion-free-remix-kickstarts in any kickstart files that include this file. +# +# Please note that the repos are configured to just track in +# rpmfusion-nonfree-release and nothing else +# +## Reminder: enable and disable as well as modify following repos to make sure +## the repos match what is configured in fedora-live-base.ks -# enable and use RPM Fusion nonfree -repo --name=rpmfusion-nonfree-rawhide --mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-rawhide&arch=$basearch +# To compose against the current release tree, use the following "repo" +#repo --name=rpmfusion-nonfree --mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-11&arch=$basearch --includepkgs=rpmfusion-nonfree-release +# To include updates, use the following "repo" +#repo --name=rpmfusion-nonfree-updates --mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-11&arch=$basearch --includepkgs=rpmfusion-nonfree-release + +# To compose against rawhide, use the following "repo" +repo --name=rpmfusion-nonfree-rawhide --mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-rawhide&arch=$basearch --includepkgs=rpmfusion-nonfree-release %packages # unbrand; should be done by rpmfusion-free-live-base.ks, but we do it here as Index: rpmfusion-nonfree-livecd-desktop.ks =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-remix-kickstarts/devel/rpmfusion-nonfree-livecd-desktop.ks,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rpmfusion-nonfree-livecd-desktop.ks 23 May 2009 12:25:46 -0000 1.1 +++ rpmfusion-nonfree-livecd-desktop.ks 1 Jun 2009 13:52:00 -0000 1.2 @@ -3,7 +3,3 @@ # %include ../rpmfusion-free-remix-kickstarts/rpmfusion-free-livecd-desktop.ks %include rpmfusion-nonfree-live-base.ks - -# override repo definition from rpmfusion-nonfree-live-base.ks to make sure we -# get only rpmfusion-nonfree-release from the repo -repo --name=rpmfusion-nonfree-rawhide --mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-rawhide&arch=$basearch --includepkgs=rpmfusion-nonfree-release Index: rpmfusion-nonfree-livecd-kde.ks =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-remix-kickstarts/devel/rpmfusion-nonfree-livecd-kde.ks,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rpmfusion-nonfree-livecd-kde.ks 23 May 2009 12:25:46 -0000 1.1 +++ rpmfusion-nonfree-livecd-kde.ks 1 Jun 2009 13:52:00 -0000 1.2 @@ -3,7 +3,3 @@ # %include ../rpmfusion-free-remix-kickstarts/rpmfusion-free-livecd-kde.ks %include rpmfusion-nonfree-live-base.ks - -# override repo definition from rpmfusion-nonfree-live-base.ks to make sure we -# get only rpmfusion-nonfree-release from the repo -repo --name=rpmfusion-nonfree-rawhide --mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-rawhide&arch=$basearch --includepkgs=rpmfusion-nonfree-release Index: rpmfusion-nonfree-remix-kickstarts.spec =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-remix-kickstarts/devel/rpmfusion-nonfree-remix-kickstarts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rpmfusion-nonfree-remix-kickstarts.spec 23 May 2009 12:25:46 -0000 1.1 +++ rpmfusion-nonfree-remix-kickstarts.spec 1 Jun 2009 13:52:00 -0000 1.2 @@ -2,7 +2,7 @@ # we follow the spin-kickstarts version scheme as the files in this # package highly depend on them anyway Version: 0.11.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Kickstart files for creating distributions with packages RPM Fusion nonfree Group: Applications/System @@ -51,6 +51,10 @@ %{_datadir}/%{name}/ %changelog +* Mon Jun 01 2009 Thorsten Leemhuis <fedora at leemhuis dot info > 0.11.1-5 +- add disabled repo definitions for f11 release +- make the base config "includepkgs=rpmfusion-nonfree-release" + * Sat May 23 2009 Thorsten Leemhuis <fedora at leemhuis dot info> - 0.11.1-4 - fix cut'n'paste typo in require