rpms/rpmfusion-nonfree-remix-kickstarts/devel rpmfusion-nonfree-live-base.ks, 1.5, 1.6 rpmfusion-nonfree-remix-kickstarts.spec, 1.5, 1.6

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/rpmfusion-nonfree-remix-kickstarts/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7824/devel

Modified Files:
	rpmfusion-nonfree-live-base.ks 
	rpmfusion-nonfree-remix-kickstarts.spec 
Log Message:
Update to 0.19.0 and 0.20.0



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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmfusion-nonfree-live-base.ks	1 May 2012 20:44:44 -0000	1.5
+++ rpmfusion-nonfree-live-base.ks	28 Apr 2013 18:57:52 -0000	1.6
@@ -13,9 +13,9 @@
 ## the repos match what is configured in fedora-live-base.ks
 
 # To compose against the current release tree, use the following "repo"
-#repo --name=rpmfusion-nonfree --mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-18&arch=$basearch --includepkgs=rpmfusion-nonfree-release
+#repo --name=rpmfusion-nonfree --mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-20&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-18&arch=$basearch --includepkgs=rpmfusion-nonfree-release
+#repo --name=rpmfusion-nonfree-updates --mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-20&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
@@ -36,9 +36,9 @@
 echo "Importing RPM Fusion keys"
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
 echo "List of packages from RPM Fusion Nonree:"
-rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 0dd634bdd2382b83 -e 90ce094be31b30ca | awk ' { print $1 } ' | sort
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 00166716cd30c86b -e 63c0de8cb5f29883 | awk ' { print $1 } ' | sort
 echo "List of incuded RPM Fusion packages with their size:"
-rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 0dd634bdd2382b83 -e 90ce094be31b30ca | awk ' { print $1 } ') | sort -n
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 00166716cd30c86b -e 63c0de8cb5f29883 | awk ' { print $1 } ') | sort -n
 echo
 %end
 


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmfusion-nonfree-remix-kickstarts.spec	1 May 2012 20:44:44 -0000	1.5
+++ rpmfusion-nonfree-remix-kickstarts.spec	28 Apr 2013 18:57:52 -0000	1.6
@@ -1,7 +1,7 @@
 Name:       rpmfusion-nonfree-remix-kickstarts
 # we follow the spin-kickstarts version scheme as the files in this 
 # package highly depend on them anyway
-Version:    0.18.0
+Version:    0.20.0
 Release:    0.1%{?dist}
 Summary:    Kickstart files for creating distributions with packages RPM Fusion nonfree
 
@@ -13,7 +13,6 @@
 Source10:   rpmfusion-nonfree-live-base.ks
 Source11:   rpmfusion-nonfree-livecd-desktop.ks
 Source12:   rpmfusion-nonfree-livecd-kde.ks
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
 Requires:   spin-kickstarts >= %{version}
@@ -32,7 +31,6 @@
 echo "nothing to build"
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
 install -p -m644 %{SOURCE1} README
 install -p -m644 %{SOURCE2} COPYING
@@ -42,33 +40,35 @@
   %{SOURCE12}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING README
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Apr 28 2013 Nicolas Chauvet <kwizart at gmail.com> - 0.20.0-0.1
+- Update to 0.20.0
+- Spec file clean-up
+
 * Tue May 01 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.18.0-0.1
 - Update to 0.18.0
 
 * Tue May 01 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.17.0-1
 - Update to 0.17.0
 
-* Thu Feb 09 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.16.0-0.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
 * Sat Oct 08 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.16.0-0.1
-- Update to pre 16.0
+- Update to 0.16.0
 
 * 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
+* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis dot info > 0.11.1-3
+- rename to rpmfusion-free-remix-kickstarts and only include free bits
+
+* Wed May 13 2009 Thorsten Leemhuis <fedora at leemhuis dot info > 0.11.1-2
+- package is GPLv3, not v2+
+- s/remixes/remix/
+- add a note about the version scheme
 
-* Fri May 22 2009 Thorsten Leemhuis <fedora at leemhuis dot info> - 0.11.1-3
-- initial version, based on rpmfusion-free-remix-kickstarts
+* Fri May 01 2009 Thorsten Leemhuis <fedora at leemhuis dot info > 0.11.1-1
+- initial version, based on spin-kickstarts from Fedora