rpms/VirtualBox/devel .cvsignore, 1.45, 1.46 VirtualBox-4.1.18-strings.patch, 1.1, 1.2 VirtualBox-guest.modules, 1.1, 1.2 VirtualBox.modules, 1.1, 1.2 VirtualBox.spec, 1.44, 1.45 sources, 1.45, 1.46
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16721
Modified Files:
.cvsignore VirtualBox-4.1.18-strings.patch
VirtualBox-guest.modules VirtualBox.modules VirtualBox.spec
sources
Log Message:
* Sat Jun 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.14-1
- Change strings instructions to load modules.
- New upstream release.
- Drop gcc-4.8 patch.
* Sun May 12 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.12-2
- drop some Buildrequires as documented in https://www.virtualbox.org/wiki/Linux%20build%20instructions
- Use systemd-modules-load.service instead fedora-loadmodules.service ( Load legacy module
configuration ).
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore 15 Apr 2013 05:00:29 -0000 1.45
+++ .cvsignore 29 Jun 2013 04:58:46 -0000 1.46
@@ -1 +1 @@
-VirtualBox-4.2.12.tar.bz2
+VirtualBox-4.2.14.tar.bz2
VirtualBox-4.1.18-strings.patch:
Frontends/VirtualBox/src/main.cpp | 22 +++++++++++-----------
Installer/linux/VBox.sh | 13 ++++++++-----
VMM/VMMR3/VM.cpp | 8 ++++----
3 files changed, 23 insertions(+), 20 deletions(-)
Index: VirtualBox-4.1.18-strings.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.1.18-strings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.1.18-strings.patch 1 Sep 2012 20:00:36 -0000 1.1
+++ VirtualBox-4.1.18-strings.patch 29 Jun 2013 04:58:46 -0000 1.2
@@ -1,9 +1,9 @@
* Mon Jul 09 2012 Sérgio Basto <sergio(a)serjux.com>
-- rfbz #1826, last review of https://bugzilla.rpmfusion.org/attachment.cgi?id=888
+ rfbz #1826, last review of https://bugzilla.rpmfusion.org/attachment.cgi?id=888
by: Naveed Hasan <naveed(a)cs.columbia.edu>
* Sat Jun 16 2012 Sérgio Basto <sergio(a)serjux.com>
-- Rebased for 4.1.16 (partial rfbz #1826)
+ Rebased for 4.1.16 (partial rfbz #1826)
From: Lubomir Rintel <lkundrak(a)v3.sk>
@@ -38,7 +38,7 @@
+ "the computer for the driver to load.<br/><br/>"
+ "Alternatively, you may attempt to load the driver by issuing the "
+ "following command with system administrator (root) privileges:<br/><br/>"
-+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox.modules'</font><br/><br/>"
++ " <font color=blue>'systemctl restart systemd-modules-load.service'</font><br/><br/>"
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -47,7 +47,7 @@
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
-+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox.modules'</font> as root<br/><br/>"
++ " <font color=blue>'systemctl restart systemd-modules-load.service '</font> as root<br/><br/>"
"may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
+ "RPM Fusion version and the Oracle version of VirtualBox."
@@ -73,10 +73,10 @@
WARNING: The vboxdrv kernel module is not loaded. Either there is no module
available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
-+ load. Reboot the computer or load the kernel module by executing
++ load. Please make sure that you have kmod-VirtualBox for current kernel and load the kernel module by executing
- sudo /etc/init.d/vboxdrv setup
-+ '/etc/sysconfig/modules/VirtualBox.modules' (as root)
++ 'systemctl restart systemd-modules-load.service' (as root)
You will not be able to start VMs until this problem is fixed.
EOF
@@ -87,8 +87,8 @@
- sudo /etc/init.d/vboxdrv restart
+ '/sbin/udevadm control --reload-rules' (as root)
-+ 'systemctl restart udev-trigger.service' (as root)
-+ 'systemctl restart udev-settle.service' (as root)
++ '/sbin/udevadm trigger --subsystem-match=usb --action=add' (as root)
++ '/sbin/udevadm settle' (as root)
- and if that is not successful, try to re-install the package.
+ and if that is not successful, then you're in situation that
@@ -106,7 +106,7 @@
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "Reboot the computer or load the kernel module by executing "
-+ "'/etc/sysconfig/modules/VirtualBox.modules' as root");
++ "'systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -117,7 +117,7 @@
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "reason. Load the kernel module by executing "
-+ "'/etc/sysconfig/modules/VirtualBox.modules' as root");
++ "'systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
Index: VirtualBox-guest.modules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-guest.modules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-guest.modules 1 Sep 2012 20:00:39 -0000 1.1
+++ VirtualBox-guest.modules 29 Jun 2013 04:58:46 -0000 1.2
@@ -1,12 +1,3 @@
-#!/bin/sh
-
-# Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083
-insert_module ()
-{
- grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return
- modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL
-}
-
-insert_module vboxguest
-insert_module vboxsf
-
+vboxguest
+vboxsf
+vboxvideo
Index: VirtualBox.modules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.modules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox.modules 3 Sep 2012 01:28:08 -0000 1.1
+++ VirtualBox.modules 29 Jun 2013 04:58:46 -0000 1.2
@@ -1,17 +1,3 @@
-#!/bin/sh
-
-# User is advised to run this on upgrades
-/sbin/modprobe -r -b vboxnetflt &>/dev/null ||:
-/sbin/modprobe -r -b vboxnetadp &>/dev/null ||:
-/sbin/modprobe -r -b vboxdrv &>/dev/null ||:
-
-# Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083
-insert_module ()
-{
- grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return
- modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL
-}
-
-insert_module vboxdrv
-insert_module vboxnetflt
-insert_module vboxnetadp
+vboxdrv
+vboxnetflt
+vboxnetadp
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- VirtualBox.spec 15 Apr 2013 05:00:29 -0000 1.44
+++ VirtualBox.spec 29 Jun 2013 04:58:46 -0000 1.45
@@ -26,7 +26,7 @@
#endif
Name: VirtualBox
-Version: 4.2.12
+Version: 4.2.14
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -54,7 +54,6 @@
Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
Patch25: VirtualBox-4.2.0-xorg111.patch
Patch26: VirtualBox-4.2.4-no-bundles.patch
-Patch27: VirtualBox-4.2.6-gcc48.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -62,7 +61,7 @@
BuildRequires: SDL-devel xalan-c-devel
BuildRequires: openssl-devel
BuildRequires: libcurl-devel
-BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libIDL-devel
+BuildRequires: iasl libxslt-devel xerces-c-devel libIDL-devel
BuildRequires: yasm
BuildRequires: pulseaudio-libs-devel
BuildRequires: python-devel
@@ -70,7 +69,6 @@
BuildRequires: libcap-devel
BuildRequires: qt4-devel
BuildRequires: gsoap-devel
-BuildRequires: xz
BuildRequires: pam-devel
BuildRequires: mkisofs
BuildRequires: java-devel >= 1.6
@@ -234,17 +232,10 @@
%patch25 -p1 -b .xorg111
%endif
%patch26 -p1 -b .nobundles
-%patch27 -p1 -b .gcc48
# CRLF->LF
sed -i 's/\r//' COPYING
-# Testings
-#for S in doc/manual/fr_FR/*xml
-#do
-# sed -i 's/[&][a-zA-Z0-9]\{2,5\}[;]/ /g' $S
-#done
-
%build
./configure --disable-kmods \
%if %{enable_webservice}
@@ -424,13 +415,14 @@
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
-install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
- $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+#ancient script /usr/bin/VBoxClient-all does not exits
+#install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
+# $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
install -m 0644 -D %{SOURCE8} \
$RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+#desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
# Guest libraries
@@ -450,8 +442,8 @@
install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxguest.rules
# Install modules load script
-install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}.modules
-install -p -m 0755 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
+install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}.modules
+install -p -m 0755 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}-guest.modules
# Module Source Code
mkdir -p %{name}-kmod-%{version}
@@ -486,7 +478,7 @@
fi
# should be in kmod package, not here
-/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
+/bin/systemctl restart systemd-modules-load.service >/dev/null 2>&1 || :
%preun
if [ $1 -eq 0 ] ; then
@@ -516,7 +508,7 @@
/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
# should be in kmod package, not here
-/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
+/bin/systemctl restart systemd-modules-load.service >/dev/null 2>&1 || :
/bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
/bin/systemctl restart vboxservice.service >/dev/null 2>&1 || :
@@ -578,7 +570,7 @@
%dir %{_sysconfdir}/vbox
%config %{_sysconfdir}/vbox/vbox.cfg
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
-%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
+%config %{_sysconfdir}/modules-load.d/%{name}.modules
%doc COPYING*
%doc doc/*.*
%if %{enable_docs}
@@ -610,10 +602,10 @@
%{_libdir}/VBoxOGL*.so
#{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
-%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+#%{_sysconfdir}/xdg/autostart/vboxclient.desktop
%exclude %{_datadir}/gdm
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
-%config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
+%config %{_sysconfdir}/modules-load.d/%{name}-guest.modules
%doc COPYING
%{_unitdir}/vboxservice.service
@@ -623,6 +615,16 @@
%changelog
+* Sat Jun 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.14-1
+- Change strings instructions to load modules.
+- New upstream release.
+- Drop gcc-4.8 patch.
+
+* Sun May 12 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.12-2
+- drop some Buildrequires as documented in https://www.virtualbox.org/wiki/Linux%20build%20instructions
+- Use systemd-modules-load.service instead fedora-loadmodules.service ( Load legacy module
+ configuration ).
+
* Mon Apr 15 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.12-1
- New upstream release.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources 15 Apr 2013 05:00:29 -0000 1.45
+++ sources 29 Jun 2013 04:58:46 -0000 1.46
@@ -1 +1 @@
-654e45054ae6589452508d37403dc800 VirtualBox-4.2.12.tar.bz2
+be834de415adaf2f696f7a499f88b4e6 VirtualBox-4.2.14.tar.bz2
10 years, 9 months
rpms/rpmfusion-free-release/devel RPM-GPG-KEY-rpmfusion-free-fedora-21-primary, NONE, 1.1 rpmfusion-free-release.spec, 1.38, 1.39 RPM-GPG-KEY-rpmfusion-free-fedora-18-primary, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/rpmfusion-free-release/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7541/devel
Modified Files:
rpmfusion-free-release.spec
Added Files:
RPM-GPG-KEY-rpmfusion-free-fedora-21-primary
Removed Files:
RPM-GPG-KEY-rpmfusion-free-fedora-18-primary
Log Message:
Add keys for devel
--- NEW FILE RPM-GPG-KEY-rpmfusion-free-fedora-21-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.13 (GNU/Linux)
mQINBFHN/E8BEADC4tpuU6vRz5FTDcbiZrhpWkhjtA3QIPGm9qlOt/woOisra6Gh
lriua9LzkLRnj5fTpbgciGjE5qM5Jy/YLZeHsqtHOt2DSWYoEcQbeRYJDO//aKtC
vw/rOH1s5rkfdtaIjcIjaVo3vW8nmoSfUMBP7p+uvzjo6OcOPhZlD9DOWgeZfo0N
J4mPuxMmi/uK5PirW1HC1XVHnpdS2a9wM4KzrddOA6aA6Gdu88VyG2pb3k41U2ox
8GA6mxJ06XwKNqKD15cyty5fG5mWIdRvMeP0nUShxTUw6lt6qH8MWr/Xj6BPiHcf
xNdLi9SsojRy4W38StWLKfYRtwLnGoylw2PX74wsMkBuliGpWM8nHLCb4Y2hhs5M
mzy4c8Nu8/pPCTcREu2zhS4mbHhzA8RAqaR5uBG6Uj2GKmU7BP0WviSCUTCNf30z
XJeGYWDk9GZJFiBAa/S9qLKUX5rRwvPaF2m8PM2Hwaafsm9cQQUu8I1uTkEkwZer
iRQJe0UPcjrxKsWrCtl1x3mcVLqtRlK8TWAyTM/W9uf90Q3bTnfJqN8QVdPQNz/M
bR4dNLuVQWr0PvwzmOEn/yWVBqv9tFJHXsbQXr98lupZL+kPz53DW/9VIYIk0kFM
Aj75XtbX+mm0PmA+Te3DnMWC3QqLDXZIx/nHzjdYLTGCOUPJpFAHKHvKmwARAQAB
tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyMSkgPHJw
bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIAIgUC
Uc38TwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQPIN9DWRG2FkaaQ/7
BxsoRJKz4nIgjgi5L0qXmY0DNl2A+dk5PDE8bYOvLMB48EE9FhFbtRt8xbbE3iHT
IUcWT4ABJtktqeuzJ3UcAkac6asy+260oQOj8ripM8myZLZGMGmMExj2i02RDxq1
OtT68FH4yvacTPKbSgN6D6xSpKHlQL5yurQQBQLZ2i/+MdyM6btG6Ebv/2nHapQJ
PvC+AIwgvUFt8iFf4p4HfkQ94ZtZopdDGAMFazwGGpp+sCFpCondsunMLjbEMn51
WHJNv82jmoop2NBoWWQVdTsAZumRSpjB7jxev8S7vk30iii8oivewVNwDbz9pHAv
5HdRBFB203w+aA8TqGj9WfMyWyrxWABSYEJhVUGNVKcy0XqWO+iB9ufGN6zsXXoo
AHYw6oC1EJVEgU0DBIMmPeSDmUmhRlalcgQYSnLC00lMETfaO5w4lLi7PS5xkTzK
gELzCmoWPBoqD2trfGx4lFRjzLZttKPdW0dFvqpd/E2cRdclz/WHyi718F6iyHOf
MG2T+mMz5nURokQX5onfB+IX82ADZXSntD/1qsDno4EO2BDItpnV3rrXz3Lnnfyi
ac20V6CeKenFNo2aBu2aS8A46rxpdrg8H0ZglwO7GQ0NpJe2Vrbl1vB224WbnABx
x9PKNaZo0RGgx0WqZtEv6Wk68cpnZ+HvClWoaT7P4BA=
=OMMM
-----END PGP PUBLIC KEY BLOCK-----
Index: rpmfusion-free-release.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/devel/rpmfusion-free-release.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- rpmfusion-free-release.spec 18 Mar 2013 22:38:28 -0000 1.38
+++ rpmfusion-free-release.spec 28 Jun 2013 21:58:09 -0000 1.39
@@ -3,7 +3,7 @@
Name: rpmfusion-%{repo}-release
Version: 20
-Release: 0.1
+Release: 0.2
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -13,16 +13,13 @@
Source2: rpmfusion-%{repo}-updates.repo
Source3: rpmfusion-%{repo}-updates-testing.repo
Source4: rpmfusion-%{repo}-rawhide.repo
-Source18: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-primary
Source19: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19-primary
Source20: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-20-primary
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source21: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-21-primary
BuildArch: noarch
Requires: system-release >= %{version}
-# If apt is around, it needs to be a version with repomd support
-Conflicts: apt < 0.5.15lorg3
%if %{repo} == "nonfree"
Requires: rpmfusion-free-release >= %{version}
@@ -53,7 +50,6 @@
echo "Nothing to build"
%install
-rm -rf $RPM_BUILD_ROOT
# Create dirs
install -d -m755 \
@@ -62,45 +58,38 @@
# GPG Key
%{__install} -Dp -m644 \
- %{SOURCE18} \
%{SOURCE19} \
%{SOURCE20} \
+ %{SOURCE21} \
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
# compatibility symlink for easy transition to F11
ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18
ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19
ln -s $(basename %{SOURCE20}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-20
+ln -s $(basename %{SOURCE21}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-21
# Links for the keys
ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest
ln -s $(basename %{SOURCE20}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide
-# Compatibility Links for the keys for F-17 > Later update.
-# Can be dropped by F-20
-for i in i386 x86_64 arm armhfp ; do
- ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-${i}
- ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19-${i}
-done
-
# Yum .repo files
%{__install} -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%{_sysconfdir}/pki/rpm-gpg/*
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
+* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 20-0.2
+- Add key for Rawhide/F-21
+- Spec file clean-up
+
* Mon Mar 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 20-0.1
- Build for Rawhide/F-20
--- RPM-GPG-KEY-rpmfusion-free-fedora-18-primary DELETED ---
10 years, 9 months
rpms/rpmfusion-nonfree-release/devel RPM-GPG-KEY-rpmfusion-nonfree-fedora-21-primary, NONE, 1.1 rpmfusion-nonfree-release.spec, 1.32, 1.33 RPM-GPG-KEY-rpmfusion-nonfree-fedora-18-primary, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7385/devel
Modified Files:
rpmfusion-nonfree-release.spec
Added Files:
RPM-GPG-KEY-rpmfusion-nonfree-fedora-21-primary
Removed Files:
RPM-GPG-KEY-rpmfusion-nonfree-fedora-18-primary
Log Message:
Add key for F-21
--- NEW FILE RPM-GPG-KEY-rpmfusion-nonfree-fedora-21-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.13 (GNU/Linux)
mQINBFHN/o4BEADYs5qmEKG5ORh7vXN2NUStj3YMpS5RdjlgBG3PUyLpzSYYrvlF
kBHa9xGrT7LQfTmhT9TtN0fpHA8/343oExO/lZKhDmtgE7/yFUv8LUtHiSxt/sO5
oPaRKZmuHzgJahRwX3kkwCOGcos8GOgJLQF3DojuwH6sScKnB9J+8sBsKQ26WrmE
0mtEcGD0ZxurGEAGeu2D4zA4XWAGukJl4NJDsjoHdVpZyow66AREo9/JV4dXZdd6
jHvUMpOleO1YQyTIoODxPyx2qqUycerZ4QD4kBXW6j8p5gUW9+rIFoqGjrDOfgr8
PwzMJNOlTPNVWRtr4+nN5TgD0WB4WnkY4dM/9le5KECb2neQo11ujj000Jh30Pbb
sf+wWeKu0H7rRDXG4mB15uqTnOydpeg+K1I0SeYogcjLvUfTk9ZBan3lw2t1/bjr
7eIffy2l+FXaa2OtWSM9IkxVg+/2tOMrW2DZUA5uGlhZ+Vtr4pfPfuyAt1mSIFjj
lbO8I2bivyrvgwdTm2YxneGNrK92htzdhq1jvliAGxCzBy4h2sK9os6ft70Jcau4
2fIsiHhpYHk98RXhQKjt/1ULpP8KeJtKE551wtHqfixiRpSVF6DtvyYV7Ix4Ukgr
jAgWWCnJWWF4a+i23Cuyf7hWRae0ukhqQ3UGPhOphjK5xwS3940xY7D3BwARAQAB
tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyMSkg
PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIA
IgUCUc3+jgIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQAXRG0aZos3ar
uA//Syin1BOi3GPKhDeRXRy3wjfgEWF+zibXOk12o26kQEAUX6tTqOxJ8vl1nt7G
rHnNFKmnY11IqJGb6zwP22e8kBUfUBEcLMwLe7RUdV5VTqkFvpuk+fsihYu6RCUj
kteuwnO57s58QypAkMKRPEtx6ozepq8JUAklMQkdnpasp91r+YA2DzKDSGXCZ1uS
f9FGgrqNLtnpoRdkCrO80mirYyYlak7u5adwH2Z4aVI9kOXPLc0LWc25eoKeo7Lb
hhKg4T58NUDucK+qZb8lTAMQQKnnvOjmnWC0T4SQlWQeffi6xSm8euKjjdbbCd0f
R/1+BsUWWgT+3Sw80prdG591+S5F40JU9PYP7bsCinVKmGneDCIlAISZ7dnTuLkh
s7GuZv8iojpiGR92Ea22pMi09013ZTGwmSr7iwo+j6PRY8MmrflhBQQx8CKb/W7n
IOlBfVHWWQ/n0/9e0iw1YcBu3nno6k8LQQS5LQclnabhq6l8k19ZgC2Y9otjDRPL
NyvQi+5tM2uW8iKEA5bmoNpJlZKKSI7e1UzN9kB3eObRZxq6JU9nzT+E9RYwYTBY
y9VM0pAXaeA8byREEcELhsuku+Kzjs3TF4hEY9lNDKfitr0jropeED/Tb62Z0QO1
f6C5r5Wl8dz0fM+Fj4nstVEhAEVtAwVXl/6ATjs9qwTV+8M=
=r0EG
-----END PGP PUBLIC KEY BLOCK-----
Index: rpmfusion-nonfree-release.spec
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-release.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rpmfusion-nonfree-release.spec 18 Mar 2013 22:40:14 -0000 1.32
+++ rpmfusion-nonfree-release.spec 28 Jun 2013 21:56:21 -0000 1.33
@@ -3,7 +3,7 @@
Name: rpmfusion-%{repo}-release
Version: 20
-Release: 0.1
+Release: 0.2
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -13,16 +13,13 @@
Source2: rpmfusion-%{repo}-updates.repo
Source3: rpmfusion-%{repo}-updates-testing.repo
Source4: rpmfusion-%{repo}-rawhide.repo
-Source18: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-primary
Source19: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19-primary
Source20: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-20-primary
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source21: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-21-primary
BuildArch: noarch
Requires: system-release >= %{version}
-# If apt is around, it needs to be a version with repomd support
-Conflicts: apt < 0.5.15lorg3
%if %{repo} == "nonfree"
Requires: rpmfusion-free-release >= %{version}
@@ -53,7 +50,6 @@
echo "Nothing to build"
%install
-rm -rf $RPM_BUILD_ROOT
# Create dirs
install -d -m755 \
@@ -62,45 +58,38 @@
# GPG Key
%{__install} -Dp -m644 \
- %{SOURCE18} \
%{SOURCE19} \
%{SOURCE20} \
+ %{SOURCE21} \
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
# compatibility symlink for easy transition to F11
ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18
ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19
ln -s $(basename %{SOURCE20}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-20
+ln -s $(basename %{SOURCE21}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-21
# Links for the keys
ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest
ln -s $(basename %{SOURCE20}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide
-# Compatibility Links for the keys for F-17 > Later update.
-# Can be dropped by F-20
-for i in i386 x86_64 arm armhfp ; do
- ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-${i}
- ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19-${i}
-done
-
# Yum .repo files
%{__install} -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%{_sysconfdir}/pki/rpm-gpg/*
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
+* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 20-0.2
+- Add key for Rawhide/F-21
+- Spec file clean-up
+
* Mon Mar 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 20-0.1
- Build for Rawhide/F-20
--- RPM-GPG-KEY-rpmfusion-nonfree-fedora-18-primary DELETED ---
10 years, 9 months
rpms/rpmfusion-nonfree-release/F-19 RPM-GPG-KEY-rpmfusion-nonfree-fedora-21-primary, NONE, 1.1 rpmfusion-nonfree-release.spec, 1.32, 1.33 rpmfusion-nonfree-updates-testing.repo, 1.11, 1.12 rpmfusion-nonfree.repo, 1.20, 1.21 RPM-GPG-KEY-rpmfusion-nonfree-fedora-18-primary, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6658/F-19
Modified Files:
rpmfusion-nonfree-release.spec
rpmfusion-nonfree-updates-testing.repo rpmfusion-nonfree.repo
Added Files:
RPM-GPG-KEY-rpmfusion-nonfree-fedora-21-primary
Removed Files:
RPM-GPG-KEY-rpmfusion-nonfree-fedora-18-primary
Log Message:
Update to Final for F-19
--- NEW FILE RPM-GPG-KEY-rpmfusion-nonfree-fedora-21-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.13 (GNU/Linux)
mQINBFHN/o4BEADYs5qmEKG5ORh7vXN2NUStj3YMpS5RdjlgBG3PUyLpzSYYrvlF
kBHa9xGrT7LQfTmhT9TtN0fpHA8/343oExO/lZKhDmtgE7/yFUv8LUtHiSxt/sO5
oPaRKZmuHzgJahRwX3kkwCOGcos8GOgJLQF3DojuwH6sScKnB9J+8sBsKQ26WrmE
0mtEcGD0ZxurGEAGeu2D4zA4XWAGukJl4NJDsjoHdVpZyow66AREo9/JV4dXZdd6
jHvUMpOleO1YQyTIoODxPyx2qqUycerZ4QD4kBXW6j8p5gUW9+rIFoqGjrDOfgr8
PwzMJNOlTPNVWRtr4+nN5TgD0WB4WnkY4dM/9le5KECb2neQo11ujj000Jh30Pbb
sf+wWeKu0H7rRDXG4mB15uqTnOydpeg+K1I0SeYogcjLvUfTk9ZBan3lw2t1/bjr
7eIffy2l+FXaa2OtWSM9IkxVg+/2tOMrW2DZUA5uGlhZ+Vtr4pfPfuyAt1mSIFjj
lbO8I2bivyrvgwdTm2YxneGNrK92htzdhq1jvliAGxCzBy4h2sK9os6ft70Jcau4
2fIsiHhpYHk98RXhQKjt/1ULpP8KeJtKE551wtHqfixiRpSVF6DtvyYV7Ix4Ukgr
jAgWWCnJWWF4a+i23Cuyf7hWRae0ukhqQ3UGPhOphjK5xwS3940xY7D3BwARAQAB
tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyMSkg
PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIA
IgUCUc3+jgIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQAXRG0aZos3ar
uA//Syin1BOi3GPKhDeRXRy3wjfgEWF+zibXOk12o26kQEAUX6tTqOxJ8vl1nt7G
rHnNFKmnY11IqJGb6zwP22e8kBUfUBEcLMwLe7RUdV5VTqkFvpuk+fsihYu6RCUj
kteuwnO57s58QypAkMKRPEtx6ozepq8JUAklMQkdnpasp91r+YA2DzKDSGXCZ1uS
f9FGgrqNLtnpoRdkCrO80mirYyYlak7u5adwH2Z4aVI9kOXPLc0LWc25eoKeo7Lb
hhKg4T58NUDucK+qZb8lTAMQQKnnvOjmnWC0T4SQlWQeffi6xSm8euKjjdbbCd0f
R/1+BsUWWgT+3Sw80prdG591+S5F40JU9PYP7bsCinVKmGneDCIlAISZ7dnTuLkh
s7GuZv8iojpiGR92Ea22pMi09013ZTGwmSr7iwo+j6PRY8MmrflhBQQx8CKb/W7n
IOlBfVHWWQ/n0/9e0iw1YcBu3nno6k8LQQS5LQclnabhq6l8k19ZgC2Y9otjDRPL
NyvQi+5tM2uW8iKEA5bmoNpJlZKKSI7e1UzN9kB3eObRZxq6JU9nzT+E9RYwYTBY
y9VM0pAXaeA8byREEcELhsuku+Kzjs3TF4hEY9lNDKfitr0jropeED/Tb62Z0QO1
f6C5r5Wl8dz0fM+Fj4nstVEhAEVtAwVXl/6ATjs9qwTV+8M=
=r0EG
-----END PGP PUBLIC KEY BLOCK-----
Index: rpmfusion-nonfree-release.spec
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-19/rpmfusion-nonfree-release.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rpmfusion-nonfree-release.spec 19 Mar 2013 10:49:27 -0000 1.32
+++ rpmfusion-nonfree-release.spec 28 Jun 2013 21:49:03 -0000 1.33
@@ -3,7 +3,7 @@
Name: rpmfusion-%{repo}-release
Version: 19
-Release: 0.4
+Release: 1
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -13,17 +13,13 @@
Source2: rpmfusion-%{repo}-updates.repo
Source3: rpmfusion-%{repo}-updates-testing.repo
Source4: rpmfusion-%{repo}-rawhide.repo
-Source18: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-primary
Source19: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19-primary
Source20: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-20-primary
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source21: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-21-primary
BuildArch: noarch
Requires: system-release >= %{version}
-# If apt is around, it needs to be a version with repomd support
-Conflicts: apt < 0.5.15lorg3
-
%if %{repo} == "nonfree"
Requires: rpmfusion-free-release >= %{version}
@@ -53,7 +49,6 @@
echo "Nothing to build"
%install
-rm -rf $RPM_BUILD_ROOT
# Create dirs
install -d -m755 \
@@ -62,18 +57,18 @@
# GPG Key
%{__install} -Dp -m644 \
- %{SOURCE18} \
%{SOURCE19} \
%{SOURCE20} \
+ %{SOURCE21} \
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
+ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18
ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19
ln -s $(basename %{SOURCE20}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-20
+ln -s $(basename %{SOURCE21}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-21
# Links for the keys
ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest
@@ -82,7 +77,6 @@
# Compatibility Links for the keys for F-17 > Later update.
# Can be dropped by F-20
for i in i386 x86_64 arm armhfp ; do
- ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-${i}
ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19-${i}
done
@@ -92,15 +86,15 @@
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%{_sysconfdir}/pki/rpm-gpg/*
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
+* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 19-1
+- Add key for Rawhide/F-21
+- Spec file clean-up
+
* Thu Mar 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 19-0.4
- Fix GPG's key name
Index: rpmfusion-nonfree-updates-testing.repo
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-19/rpmfusion-nonfree-updates-testing.repo,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpmfusion-nonfree-updates-testing.repo 13 Mar 2013 20:11:49 -0000 1.11
+++ rpmfusion-nonfree-updates-testing.repo 28 Jun 2013 21:49:03 -0000 1.12
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up...
-enabled=1
+enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
Index: rpmfusion-nonfree.repo
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-19/rpmfusion-nonfree.repo,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rpmfusion-nonfree.repo 13 Mar 2013 20:11:49 -0000 1.20
+++ rpmfusion-nonfree.repo 28 Jun 2013 21:49:03 -0000 1.21
@@ -3,7 +3,7 @@
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$r...
enabled=1
-#metadata_expire=7d
+metadata_expire=7d
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
--- RPM-GPG-KEY-rpmfusion-nonfree-fedora-18-primary DELETED ---
10 years, 9 months
rpms/rpmfusion-free-release/F-19 RPM-GPG-KEY-rpmfusion-free-fedora-21-primary, NONE, 1.1 rpmfusion-free-release.spec, 1.38, 1.39 rpmfusion-free-updates-testing.repo, 1.11, 1.12 rpmfusion-free.repo, 1.20, 1.21 RPM-GPG-KEY-rpmfusion-free-fedora-18-primary, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/rpmfusion-free-release/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6334/F-19
Modified Files:
rpmfusion-free-release.spec
rpmfusion-free-updates-testing.repo rpmfusion-free.repo
Added Files:
RPM-GPG-KEY-rpmfusion-free-fedora-21-primary
Removed Files:
RPM-GPG-KEY-rpmfusion-free-fedora-18-primary
Log Message:
Update to F-19 Final
--- NEW FILE RPM-GPG-KEY-rpmfusion-free-fedora-21-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.13 (GNU/Linux)
mQINBFHN/E8BEADC4tpuU6vRz5FTDcbiZrhpWkhjtA3QIPGm9qlOt/woOisra6Gh
lriua9LzkLRnj5fTpbgciGjE5qM5Jy/YLZeHsqtHOt2DSWYoEcQbeRYJDO//aKtC
vw/rOH1s5rkfdtaIjcIjaVo3vW8nmoSfUMBP7p+uvzjo6OcOPhZlD9DOWgeZfo0N
J4mPuxMmi/uK5PirW1HC1XVHnpdS2a9wM4KzrddOA6aA6Gdu88VyG2pb3k41U2ox
8GA6mxJ06XwKNqKD15cyty5fG5mWIdRvMeP0nUShxTUw6lt6qH8MWr/Xj6BPiHcf
xNdLi9SsojRy4W38StWLKfYRtwLnGoylw2PX74wsMkBuliGpWM8nHLCb4Y2hhs5M
mzy4c8Nu8/pPCTcREu2zhS4mbHhzA8RAqaR5uBG6Uj2GKmU7BP0WviSCUTCNf30z
XJeGYWDk9GZJFiBAa/S9qLKUX5rRwvPaF2m8PM2Hwaafsm9cQQUu8I1uTkEkwZer
iRQJe0UPcjrxKsWrCtl1x3mcVLqtRlK8TWAyTM/W9uf90Q3bTnfJqN8QVdPQNz/M
bR4dNLuVQWr0PvwzmOEn/yWVBqv9tFJHXsbQXr98lupZL+kPz53DW/9VIYIk0kFM
Aj75XtbX+mm0PmA+Te3DnMWC3QqLDXZIx/nHzjdYLTGCOUPJpFAHKHvKmwARAQAB
tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyMSkgPHJw
bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIAIgUC
Uc38TwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQPIN9DWRG2FkaaQ/7
BxsoRJKz4nIgjgi5L0qXmY0DNl2A+dk5PDE8bYOvLMB48EE9FhFbtRt8xbbE3iHT
IUcWT4ABJtktqeuzJ3UcAkac6asy+260oQOj8ripM8myZLZGMGmMExj2i02RDxq1
OtT68FH4yvacTPKbSgN6D6xSpKHlQL5yurQQBQLZ2i/+MdyM6btG6Ebv/2nHapQJ
PvC+AIwgvUFt8iFf4p4HfkQ94ZtZopdDGAMFazwGGpp+sCFpCondsunMLjbEMn51
WHJNv82jmoop2NBoWWQVdTsAZumRSpjB7jxev8S7vk30iii8oivewVNwDbz9pHAv
5HdRBFB203w+aA8TqGj9WfMyWyrxWABSYEJhVUGNVKcy0XqWO+iB9ufGN6zsXXoo
AHYw6oC1EJVEgU0DBIMmPeSDmUmhRlalcgQYSnLC00lMETfaO5w4lLi7PS5xkTzK
gELzCmoWPBoqD2trfGx4lFRjzLZttKPdW0dFvqpd/E2cRdclz/WHyi718F6iyHOf
MG2T+mMz5nURokQX5onfB+IX82ADZXSntD/1qsDno4EO2BDItpnV3rrXz3Lnnfyi
ac20V6CeKenFNo2aBu2aS8A46rxpdrg8H0ZglwO7GQ0NpJe2Vrbl1vB224WbnABx
x9PKNaZo0RGgx0WqZtEv6Wk68cpnZ+HvClWoaT7P4BA=
=OMMM
-----END PGP PUBLIC KEY BLOCK-----
Index: rpmfusion-free-release.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-19/rpmfusion-free-release.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- rpmfusion-free-release.spec 14 Mar 2013 23:37:24 -0000 1.38
+++ rpmfusion-free-release.spec 28 Jun 2013 21:44:13 -0000 1.39
@@ -3,7 +3,7 @@
Name: rpmfusion-%{repo}-release
Version: 19
-Release: 0.4
+Release: 1
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -13,17 +13,13 @@
Source2: rpmfusion-%{repo}-updates.repo
Source3: rpmfusion-%{repo}-updates-testing.repo
Source4: rpmfusion-%{repo}-rawhide.repo
-Source18: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-primary
Source19: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19-primary
Source20: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-20-primary
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source21: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-21-primary
BuildArch: noarch
Requires: system-release >= %{version}
-# If apt is around, it needs to be a version with repomd support
-Conflicts: apt < 0.5.15lorg3
-
%if %{repo} == "nonfree"
Requires: rpmfusion-free-release >= %{version}
@@ -53,7 +49,6 @@
echo "Nothing to build"
%install
-rm -rf $RPM_BUILD_ROOT
# Create dirs
install -d -m755 \
@@ -62,18 +57,18 @@
# GPG Key
%{__install} -Dp -m644 \
- %{SOURCE18} \
%{SOURCE19} \
%{SOURCE20} \
+ %{SOURCE21} \
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
+ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18
ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19
ln -s $(basename %{SOURCE20}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-20
+ln -s $(basename %{SOURCE21}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-21
# Links for the keys
ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest
@@ -82,7 +77,6 @@
# Compatibility Links for the keys for F-17 > Later update.
# Can be dropped by F-20
for i in i386 x86_64 arm armhfp ; do
- ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-${i}
ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19-${i}
done
@@ -92,15 +86,15 @@
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%{_sysconfdir}/pki/rpm-gpg/*
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
+* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 19-1
+- Add key for Rawhide/F-21
+- Spec file clean-up
+
* Thu Mar 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 19-0.4
- Fix GPG's key name
Index: rpmfusion-free-updates-testing.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-19/rpmfusion-free-updates-testing.repo,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpmfusion-free-updates-testing.repo 13 Mar 2013 20:10:03 -0000 1.11
+++ rpmfusion-free-updates-testing.repo 28 Jun 2013 21:44:13 -0000 1.12
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Free - Test Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
-enabled=1
+enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
Index: rpmfusion-free.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-19/rpmfusion-free.repo,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rpmfusion-free.repo 13 Mar 2013 20:10:03 -0000 1.20
+++ rpmfusion-free.repo 28 Jun 2013 21:44:13 -0000 1.21
@@ -3,7 +3,7 @@
#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-$rele...
enabled=1
-#metadata_expire=7d
+metadata_expire=7d
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
--- RPM-GPG-KEY-rpmfusion-free-fedora-18-primary DELETED ---
10 years, 9 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.124,1.125
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4114
Modified Files:
nvidia-kmod.spec
Log Message:
Fix akmod
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- nvidia-kmod.spec 28 Jun 2013 20:37:02 -0000 1.124
+++ nvidia-kmod.spec 28 Jun 2013 20:48:01 -0000 1.125
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels akmods
+%global buildforkernels akmod
Name: nvidia-kmod
Epoch: 1
10 years, 9 months
rpms/nvidia-kmod/devel .cvsignore, 1.55, 1.56 nvidia-kmod.spec, 1.123, 1.124 sources, 1.58, 1.59
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3740/devel
Modified Files:
.cvsignore nvidia-kmod.spec sources
Log Message:
Update to 319.32
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore 1 May 2013 07:35:12 -0000 1.55
+++ .cvsignore 28 Jun 2013 20:37:02 -0000 1.56
@@ -1 +1 @@
-nvidia-kmod-data-319.12.tar.xz
+nvidia-kmod-data-319.32.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- nvidia-kmod.spec 31 May 2013 22:39:41 -0000 1.123
+++ nvidia-kmod.spec 28 Jun 2013 20:37:02 -0000 1.124
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels current
+%global buildforkernels akmods
Name: nvidia-kmod
Epoch: 1
-Version: 319.23
+Version: 319.32
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -85,6 +85,9 @@
%changelog
+* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1
+- Update to 319.32
+
* Fri May 31 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:319.23-3
- Patch for 3.10 kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources 24 May 2013 09:58:02 -0000 1.58
+++ sources 28 Jun 2013 20:37:02 -0000 1.59
@@ -1 +1 @@
-2756e7fe2a4d7808a85742fae833e13a nvidia-kmod-data-319.23.tar.xz
+cdb20c69343ff34f93c6e8d71ead101b nvidia-kmod-data-319.32.tar.xz
10 years, 9 months
rpms/xorg-x11-drv-nvidia-304xx/F-18 xorg-x11-drv-nvidia-304xx.spec, 1.6, 1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1931/F-18
Modified Files:
xorg-x11-drv-nvidia-304xx.spec
Log Message:
Used configuration used before upgrade
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-18/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-nvidia-304xx.spec 12 Jun 2013 14:48:20 -0000 1.6
+++ xorg-x11-drv-nvidia-304xx.spec 28 Jun 2013 20:00:53 -0000 1.7
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia-304xx
Version: 304.88
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -283,6 +283,9 @@
&>/dev/null
done
fi
+ [ -f %{_sysconfdir}/X11/xorg.conf.xorg-x11-drv-nvidia_uninstalled ] && \
+ cp -p %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled %{_sysconfdir}/X11/xorg.conf
+
fi || :
%post libs -p /sbin/ldconfig
@@ -372,6 +375,9 @@
%changelog
+* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-6
+- Restore configuration used before rename
+
* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-5
- Relax kernel flavor cases
10 years, 9 months
rpms/xorg-x11-drv-nvidia-304xx/F-17 xorg-x11-drv-nvidia-304xx.spec, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1931/F-17
Modified Files:
xorg-x11-drv-nvidia-304xx.spec
Log Message:
Used configuration used before upgrade
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-17/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-nvidia-304xx.spec 19 Jun 2013 11:37:18 -0000 1.1
+++ xorg-x11-drv-nvidia-304xx.spec 28 Jun 2013 20:00:53 -0000 1.2
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia-304xx
Version: 304.88
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -283,6 +283,9 @@
&>/dev/null
done
fi
+ [ -f %{_sysconfdir}/X11/xorg.conf.xorg-x11-drv-nvidia_uninstalled ] && \
+ cp -p %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled %{_sysconfdir}/X11/xorg.conf
+
fi || :
%post libs -p /sbin/ldconfig
@@ -372,6 +375,9 @@
%changelog
+* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-6
+- Restore configuration used before rename
+
* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-5
- Relax kernel flavor cases
10 years, 9 months
rpms/wl-kmod/F-17 wl-kmod.spec,1.138,1.139
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29935
Modified Files:
wl-kmod.spec
Log Message:
* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.6
- Rebuilt for kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-17/wl-kmod.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- wl-kmod.spec 27 Jun 2013 16:45:51 -0000 1.138
+++ wl-kmod.spec 28 Jun 2013 17:35:09 -0000 1.139
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 10%{?dist}.5
+Release: 10%{?dist}.6
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -101,6 +101,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.6
+- Rebuilt for kernel
+
* Thu Jun 27 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.5
- Rebuilt for kernel
10 years, 9 months