rpms/rpmfusion-nonfree-release/devel rpmfusion-nonfree-rawhide.repo, 1.15, 1.16 rpmfusion-nonfree.repo, 1.15, 1.16 rpmfusion-nonfree-updates.repo, 1.15, 1.16 rpmfusion-nonfree-release.spec, 1.23, 1.24

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30412

Modified Files:
	rpmfusion-nonfree-rawhide.repo rpmfusion-nonfree.repo 
	rpmfusion-nonfree-updates.repo rpmfusion-nonfree-release.spec 
Log Message:
- build for rawhide/F-17
- Drop key for F-15



Index: rpmfusion-nonfree-rawhide.repo
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-rawhide.repo,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpmfusion-nonfree-rawhide.repo	28 Oct 2011 20:04:39 -0000	1.15
+++ rpmfusion-nonfree-rawhide.repo	19 Nov 2011 19:23:18 -0000	1.16
@@ -2,7 +2,7 @@
 name=RPM Fusion for Fedora Rawhide - Nonfree
 #baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$basearch/os/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-rawhide&arch=$basearch
-enabled=0
+enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-latest-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-rawhide-$basearch
 


Index: rpmfusion-nonfree.repo
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree.repo,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpmfusion-nonfree.repo	28 Oct 2011 20:04:39 -0000	1.15
+++ rpmfusion-nonfree.repo	19 Nov 2011 19:23:18 -0000	1.16
@@ -2,7 +2,7 @@
 name=RPM Fusion for Fedora $releasever - Nonfree
 #baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch
-enabled=1
+enabled=0
 metadata_expire=7d
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch


Index: rpmfusion-nonfree-updates.repo
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-updates.repo,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpmfusion-nonfree-updates.repo	28 Oct 2011 20:04:39 -0000	1.15
+++ rpmfusion-nonfree-updates.repo	19 Nov 2011 19:23:18 -0000	1.16
@@ -2,7 +2,7 @@
 name=RPM Fusion for Fedora $releasever - Nonfree - Updates
 #baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
-enabled=1
+enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch
 


Index: rpmfusion-nonfree-release.spec
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-release.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rpmfusion-nonfree-release.spec	2 Nov 2011 22:13:27 -0000	1.23
+++ rpmfusion-nonfree-release.spec	19 Nov 2011 19:23:18 -0000	1.24
@@ -2,8 +2,8 @@
 %define repo nonfree
 
 Name:           rpmfusion-%{repo}-release
-Version:        16
-Release:        1.1
+Version:        17
+Release:        0.1
 Summary:        RPM Fusion (%{repo}) Repository Configuration
 
 Group:          System Environment/Base
@@ -13,7 +13,6 @@
 Source2:        rpmfusion-%{repo}-updates.repo
 Source3:        rpmfusion-%{repo}-updates-testing.repo
 Source4:        rpmfusion-%{repo}-rawhide.repo
-Source15:       RPM-GPG-KEY-rpmfusion-%{repo}-fedora-15-primary
 Source16:       RPM-GPG-KEY-rpmfusion-%{repo}-fedora-16-primary
 Source17:       RPM-GPG-KEY-rpmfusion-%{repo}-fedora-17-primary
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,7 +61,6 @@
 
 # GPG Key
 %{__install} -Dp -m644 \
-    %{SOURCE15} \
     %{SOURCE16} \
     %{SOURCE17} \
     $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
@@ -72,7 +70,6 @@
 
 # Links for the keys
 for i in i386 x86_64; do
-  ln -s $(basename %{SOURCE15}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-15-${i}
   ln -s $(basename %{SOURCE16}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-16-${i}
   ln -s $(basename %{SOURCE17}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-17-${i}
   ln -s $(basename %{SOURCE16}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest-${i}
@@ -94,8 +91,13 @@
 %config(noreplace) %{_sysconfdir}/yum.repos.d/*
 
 %changelog
-* Wed Nov 02 2011 Nicolas Chauvet <kwizart at gmail.com> - 16-1.1
+* Sat Nov 19 2011 Nicolas Chauvet <kwizart at gmail.com> - 17-0.1
+- build for rawhide/F-17
+- Drop key for F-15
+
+* Wed Nov 02 2011 Nicolas Chauvet <kwizart at gmail.com> - 16-1.2
 - Fix compat key for F-15
+- Fix Installation of F-17 key
 
 * Thu Oct 27 2011 Nicolas Chauvet <kwizart at gmail.com> - 16-1
 - Add keys for Rawhide/F-17