rpms/rpmfusion-nonfree-release/F-17 rpmfusion-nonfree-rawhide.repo, 1.17, 1.18 rpmfusion-nonfree-release.spec, 1.26, 1.27 rpmfusion-nonfree-updates.repo, 1.16, 1.17 rpmfusion-nonfree.repo, 1.17, 1.18

Nicolas Chauvet kwizart at rpmfusion.org
Mon Feb 27 23:04:21 CET 2012 

Author: kwizart

Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8335/F-17

Modified Files:
	rpmfusion-nonfree-rawhide.repo rpmfusion-nonfree-release.spec 
	rpmfusion-nonfree-updates.repo rpmfusion-nonfree.repo 
Log Message:
Update to pre F-17



Index: rpmfusion-nonfree-rawhide.repo
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-17/rpmfusion-nonfree-rawhide.repo,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpmfusion-nonfree-rawhide.repo	11 Feb 2012 12:49:10 -0000	1.17
+++ rpmfusion-nonfree-rawhide.repo	27 Feb 2012 22:03:51 -0000	1.18
@@ -1,6 +1,6 @@
 [rpmfusion-nonfree-rawhide]
 name=RPM Fusion for Fedora Rawhide - Nonfree
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$basearch/os/
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/rawhide/$basearch/os/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-rawhide&arch=$basearch
 enabled=0
 gpgcheck=1
@@ -8,7 +8,7 @@
 
 [rpmfusion-nonfree-rawhide-debuginfo]
 name=RPM Fusion for Fedora Rawhide - Nonfree - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$basearch/os/debug/
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/fedora/development/rawhide/$basearch/os/debug/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-rawhide-debug&arch=$basearch
 enabled=0
 gpgcheck=1
@@ -16,7 +16,7 @@
 
 [rpmfusion-nonfree-rawhide-source]
 name=RPM Fusion for Fedora Rawhide - Nonfree - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/source/SRPMS/
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/fedora/development/rawhide/source/SRPMS/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-rawhide-source&arch=$basearch
 enabled=0
 gpgcheck=1


Index: rpmfusion-nonfree-release.spec
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-17/rpmfusion-nonfree-release.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rpmfusion-nonfree-release.spec	11 Feb 2012 12:49:14 -0000	1.26
+++ rpmfusion-nonfree-release.spec	27 Feb 2012 22:03:51 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name:           rpmfusion-%{repo}-release
 Version:        17
-Release:        0.3
+Release:        0.4
 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
-Source16:       RPM-GPG-KEY-rpmfusion-%{repo}-fedora-16-primary
 Source17:       RPM-GPG-KEY-rpmfusion-%{repo}-fedora-17-primary
 Source18:       RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-primary
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,19 +61,17 @@
 
 # GPG Key
 %{__install} -Dp -m644 \
-    %{SOURCE16} \
     %{SOURCE17} \
     %{SOURCE18} \
     $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
 
 # compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE15}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
+ln -s $(basename %{SOURCE17}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
 
 # Links for the keys
 for i in i386 x86_64; do
-  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}
+  ln -s $(basename %{SOURCE17}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest-${i}
   ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide-${i}
 done
 
@@ -93,6 +90,10 @@
 %config(noreplace) %{_sysconfdir}/yum.repos.d/*
 
 %changelog
+* Mon Feb 27 2012 Nicolas Chauvet <kwizart at gmail.com> - 17-0.4
+- Split to development/17
+- Enable rpmfusion*-updates-testing
+
 * Sat Feb 11 2012 Nicolas Chauvet <kwizart at gmail.com> - 17-0.3
 - Bump for branched F-17
 


Index: rpmfusion-nonfree-updates.repo
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-17/rpmfusion-nonfree-updates.repo,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rpmfusion-nonfree-updates.repo	19 Nov 2011 19:23:18 -0000	1.16
+++ rpmfusion-nonfree-updates.repo	27 Feb 2012 22:03:51 -0000	1.17
@@ -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=0
+enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch
 


Index: rpmfusion-nonfree.repo
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-17/rpmfusion-nonfree.repo,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpmfusion-nonfree.repo	11 Feb 2012 12:49:14 -0000	1.17
+++ rpmfusion-nonfree.repo	27 Feb 2012 22:03:51 -0000	1.18
@@ -1,6 +1,6 @@
 [rpmfusion-nonfree]
 name=RPM Fusion for Fedora $releasever - Nonfree
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$releasever/$basearch/os/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch
 enabled=1
 #metadata_expire=7d
@@ -9,7 +9,7 @@
 
 [rpmfusion-nonfree-debuginfo]
 name=RPM Fusion for Fedora $releasever - Nonfree - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/debug/
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$releasever/$basearch/debug/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
@@ -18,7 +18,7 @@
 
 [rpmfusion-nonfree-source]
 name=RPM Fusion for Fedora $releasever - Nonfree - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/source/SRPMS/
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$releasever/source/SRPMS/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d

More information about the rpmfusion-commits mailing list