rpms/lpf-flash-plugin/devel flash-plugin.spec.in, 1.6, 1.7 lpf-flash-plugin.spec, 1.9, 1.10
by Simone Caronni
Author: slaanesh
Update of /cvs/nonfree/rpms/lpf-flash-plugin/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24549
Modified Files:
flash-plugin.spec.in lpf-flash-plugin.spec
Log Message:
* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 1:11.2.202.359-1
- Update to 11.2.202.359.
Index: flash-plugin.spec.in
===================================================================
RCS file: /cvs/nonfree/rpms/lpf-flash-plugin/devel/flash-plugin.spec.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- flash-plugin.spec.in 30 Apr 2014 15:04:35 -0000 1.6
+++ flash-plugin.spec.in 19 May 2014 12:03:48 -0000 1.7
@@ -2,8 +2,8 @@
%global __strip /bin/true
Name: flash-plugin
-Version: 11.2.202.356
-Release: 1%{?dist}
+Version: 11.2.202.359
+Release: 0%{?dist}
Epoch: 1
Summary: Adobe Flash Player
License: Non-redistributable, no modification permitted
Index: lpf-flash-plugin.spec
===================================================================
RCS file: /cvs/nonfree/rpms/lpf-flash-plugin/devel/lpf-flash-plugin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lpf-flash-plugin.spec 30 Apr 2014 15:04:36 -0000 1.9
+++ lpf-flash-plugin.spec 19 May 2014 12:03:48 -0000 1.10
@@ -5,7 +5,7 @@
%define target_pkg %(t=%{name}; echo ${t#lpf-})
Name: lpf-flash-plugin
-Version: 11.2.202.356
+Version: 11.2.202.359
Release: 1%{?dist}
Epoch: 1
Summary: Adobe Flash Player package bootstrap
@@ -67,6 +67,9 @@
%changelog
+* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 1:11.2.202.359-1
+- Update to 11.2.202.359.
+
* Wed Apr 30 2014 Simone Caronni <negativo17(a)gmail.com> - 1:11.2.202.356-1
- Update to 11.2.202.356.
9 years, 11 months
rpms/lpf-skype/F-19 lpf-skype.spec,1.10,1.11 skype.spec.in,1.3,1.4
by Simone Caronni
Author: slaanesh
Update of /cvs/nonfree/rpms/lpf-skype/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14313
Modified Files:
lpf-skype.spec skype.spec.in
Log Message:
* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-3
- Allow command line parameters to be passed to wrapper.
- Fix desktop file Exec line.
Index: lpf-skype.spec
===================================================================
RCS file: /cvs/nonfree/rpms/lpf-skype/F-19/lpf-skype.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lpf-skype.spec 29 Jan 2014 07:49:28 -0000 1.10
+++ lpf-skype.spec 19 May 2014 09:49:58 -0000 1.11
@@ -5,7 +5,7 @@
Name: lpf-skype
Version: 4.2.0.13
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Skype Messaging and Telephony Client package bootstrap
@@ -65,6 +65,10 @@
%changelog
+* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-3
+- Allow command line parameters to be passed to wrapper.
+- Fix desktop file Exec line.
+
* Wed Jan 29 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-1
- Update to 4.2.0.13.
Index: skype.spec.in
===================================================================
RCS file: /cvs/nonfree/rpms/lpf-skype/F-19/skype.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- skype.spec.in 29 Jan 2014 07:49:29 -0000 1.3
+++ skype.spec.in 19 May 2014 09:49:58 -0000 1.4
@@ -5,7 +5,7 @@
Name: skype
Version: 4.2.0.13
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Skype Messaging and Telephony Client
License: Skype End User License Agreement
@@ -13,6 +13,7 @@
# Download at:
# http://www.skype.com/intl/en/get-skype/on-your-computer/linux/downloading...
Source0: http://download.skype.com/linux/%{name}-%{version}.tar.bz2
+Source1: %{name}-wrapper
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -38,25 +39,29 @@
%prep
%setup -q
-cat << EOF > %{name}-wrapper
-#!/bin/sh
-PULSE_LATENCY_MSEC=30 skype-bin
-EOF
+
sed -i 's/\r$//' LICENSE
%build
# Nothing to build
%install
-# Fedora 20+ needs a wrapper for PulseAudio latency
mkdir -p %{buildroot}%{_sysconfdir}/prelink.conf.d/
+
+
+# Fedora 20+ needs a wrapper for PulseAudio latency
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
-install -p -D -m 755 %{name}-wrapper %{buildroot}%{_bindir}/%{name}
+
+install -p -D -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
install -p -D -m 655 %{name} %{buildroot}%{_bindir}/%{name}-bin
echo "-b %{_bindir}/skype-bin" > %{buildroot}%{_sysconfdir}/prelink.conf.d/%{name}-%{_arch}.conf
+sed -i -e 's/Exec=env PULSE_LATENCY_MSEC=60 skype %U/Exec=env PULSE_LATENCY_MSEC=30 skype-bin %U/g' %{name}.desktop
+
%else
+
install -p -D -m 655 %{name} %{buildroot}%{_bindir}/%{name}
echo "-b %{_bindir}/skype" > %{buildroot}%{_sysconfdir}/prelink.conf.d/%{name}-%{_arch}.conf
+
%endif
install -p -D -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/%{name}.conf
@@ -103,6 +108,12 @@
%{_datadir}/%{name}
%changelog
+* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-3
+- Allow command line parameters to be passed to wrapper.
+
+* Wed May 14 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-2
+- Fix desktop file Exec line.
+
* Wed Jan 29 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-1
- Updated to 4.2.0.13.
9 years, 11 months
rpms/lpf-skype/F-20 skype-wrapper, NONE, 1.1 lpf-skype.spec, 1.13, 1.14 skype.spec.in, 1.3, 1.4
by Simone Caronni
Author: slaanesh
Update of /cvs/nonfree/rpms/lpf-skype/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14206
Modified Files:
lpf-skype.spec skype.spec.in
Added Files:
skype-wrapper
Log Message:
* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-3
- Allow command line parameters to be passed to wrapper.
- Fix desktop file Exec line.
--- NEW FILE skype-wrapper ---
#!/bin/sh
PULSE_LATENCY_MSEC=30 skype-bin $@
Index: lpf-skype.spec
===================================================================
RCS file: /cvs/nonfree/rpms/lpf-skype/F-20/lpf-skype.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lpf-skype.spec 5 Feb 2014 13:06:58 -0000 1.13
+++ lpf-skype.spec 19 May 2014 09:49:43 -0000 1.14
@@ -5,7 +5,7 @@
Name: lpf-skype
Version: 4.2.0.13
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Skype Messaging and Telephony Client package bootstrap
@@ -65,6 +65,10 @@
%changelog
+* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-3
+- Allow command line parameters to be passed to wrapper.
+- Fix desktop file Exec line.
+
* Wed Jan 29 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-1
- Update to 4.2.0.13.
Index: skype.spec.in
===================================================================
RCS file: /cvs/nonfree/rpms/lpf-skype/F-20/skype.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- skype.spec.in 5 Feb 2014 13:06:58 -0000 1.3
+++ skype.spec.in 19 May 2014 09:49:43 -0000 1.4
@@ -5,7 +5,7 @@
Name: skype
Version: 4.2.0.13
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Skype Messaging and Telephony Client
License: Skype End User License Agreement
@@ -13,6 +13,7 @@
# Download at:
# http://www.skype.com/intl/en/get-skype/on-your-computer/linux/downloading...
Source0: http://download.skype.com/linux/%{name}-%{version}.tar.bz2
+Source1: %{name}-wrapper
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -38,25 +39,29 @@
%prep
%setup -q
-cat << EOF > %{name}-wrapper
-#!/bin/sh
-PULSE_LATENCY_MSEC=30 skype-bin
-EOF
+
sed -i 's/\r$//' LICENSE
%build
# Nothing to build
%install
-# Fedora 20+ needs a wrapper for PulseAudio latency
mkdir -p %{buildroot}%{_sysconfdir}/prelink.conf.d/
+
+
+# Fedora 20+ needs a wrapper for PulseAudio latency
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
-install -p -D -m 755 %{name}-wrapper %{buildroot}%{_bindir}/%{name}
+
+install -p -D -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
install -p -D -m 655 %{name} %{buildroot}%{_bindir}/%{name}-bin
echo "-b %{_bindir}/skype-bin" > %{buildroot}%{_sysconfdir}/prelink.conf.d/%{name}-%{_arch}.conf
+sed -i -e 's/Exec=env PULSE_LATENCY_MSEC=60 skype %U/Exec=env PULSE_LATENCY_MSEC=30 skype-bin %U/g' %{name}.desktop
+
%else
+
install -p -D -m 655 %{name} %{buildroot}%{_bindir}/%{name}
echo "-b %{_bindir}/skype" > %{buildroot}%{_sysconfdir}/prelink.conf.d/%{name}-%{_arch}.conf
+
%endif
install -p -D -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/%{name}.conf
@@ -103,6 +108,12 @@
%{_datadir}/%{name}
%changelog
+* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-3
+- Allow command line parameters to be passed to wrapper.
+
+* Wed May 14 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-2
+- Fix desktop file Exec line.
+
* Wed Jan 29 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-1
- Updated to 4.2.0.13.
9 years, 11 months
rpms/lpf-skype/devel skype-wrapper, NONE, 1.1 lpf-skype.spec, 1.14, 1.15 skype.spec.in, 1.3, 1.4
by Simone Caronni
Author: slaanesh
Update of /cvs/nonfree/rpms/lpf-skype/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13971
Modified Files:
lpf-skype.spec skype.spec.in
Added Files:
skype-wrapper
Log Message:
* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-3
- Allow command line parameters to be passed to wrapper.
--- NEW FILE skype-wrapper ---
#!/bin/sh
PULSE_LATENCY_MSEC=30 skype-bin $@
Index: lpf-skype.spec
===================================================================
RCS file: /cvs/nonfree/rpms/lpf-skype/devel/lpf-skype.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lpf-skype.spec 29 Jan 2014 07:48:42 -0000 1.14
+++ lpf-skype.spec 19 May 2014 09:48:18 -0000 1.15
@@ -5,7 +5,7 @@
Name: lpf-skype
Version: 4.2.0.13
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Skype Messaging and Telephony Client package bootstrap
@@ -65,6 +65,10 @@
%changelog
+* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-3
+- Allow command line parameters to be passed to wrapper.
+- Fix desktop file Exec line.
+
* Wed Jan 29 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-1
- Update to 4.2.0.13.
Index: skype.spec.in
===================================================================
RCS file: /cvs/nonfree/rpms/lpf-skype/devel/skype.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- skype.spec.in 29 Jan 2014 07:48:43 -0000 1.3
+++ skype.spec.in 19 May 2014 09:48:18 -0000 1.4
@@ -5,7 +5,7 @@
Name: skype
Version: 4.2.0.13
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Skype Messaging and Telephony Client
License: Skype End User License Agreement
@@ -13,6 +13,7 @@
# Download at:
# http://www.skype.com/intl/en/get-skype/on-your-computer/linux/downloading...
Source0: http://download.skype.com/linux/%{name}-%{version}.tar.bz2
+Source1: %{name}-wrapper
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -38,25 +39,29 @@
%prep
%setup -q
-cat << EOF > %{name}-wrapper
-#!/bin/sh
-PULSE_LATENCY_MSEC=30 skype-bin
-EOF
+
sed -i 's/\r$//' LICENSE
%build
# Nothing to build
%install
-# Fedora 20+ needs a wrapper for PulseAudio latency
mkdir -p %{buildroot}%{_sysconfdir}/prelink.conf.d/
+
+
+# Fedora 20+ needs a wrapper for PulseAudio latency
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
-install -p -D -m 755 %{name}-wrapper %{buildroot}%{_bindir}/%{name}
+
+install -p -D -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
install -p -D -m 655 %{name} %{buildroot}%{_bindir}/%{name}-bin
echo "-b %{_bindir}/skype-bin" > %{buildroot}%{_sysconfdir}/prelink.conf.d/%{name}-%{_arch}.conf
+sed -i -e 's/Exec=env PULSE_LATENCY_MSEC=60 skype %U/Exec=env PULSE_LATENCY_MSEC=30 skype-bin %U/g' %{name}.desktop
+
%else
+
install -p -D -m 655 %{name} %{buildroot}%{_bindir}/%{name}
echo "-b %{_bindir}/skype" > %{buildroot}%{_sysconfdir}/prelink.conf.d/%{name}-%{_arch}.conf
+
%endif
install -p -D -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/%{name}.conf
@@ -103,6 +108,12 @@
%{_datadir}/%{name}
%changelog
+* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-3
+- Allow command line parameters to be passed to wrapper.
+
+* Wed May 14 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-2
+- Fix desktop file Exec line.
+
* Wed Jan 29 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-1
- Updated to 4.2.0.13.
9 years, 11 months
rpms/VirtualBox-kmod/devel VirtualBox-kmod.spec,1.32,1.33
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9348
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sun May 18 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1
- New upstream release and just build akmods for rawhide.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/devel/VirtualBox-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- VirtualBox-kmod.spec 2 May 2014 19:47:57 -0000 1.32
+++ VirtualBox-kmod.spec 18 May 2014 15:47:07 -0000 1.33
@@ -12,15 +12,15 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global vboxrel 2
+%global vboxrel 1
%global vboxreltag %{?vboxrel:-%{vboxrel}}
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
%bcond_with hardening
Name: VirtualBox-kmod
-Version: 4.3.10
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Version: 4.3.12
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Sun May 18 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1
+- New upstream release and just build akmods for rawhide.
+
* Fri May 02 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.10-2
- Rebuild for new x11-xorg-server
9 years, 11 months
rpms/VirtualBox-kmod/F-20 VirtualBox-kmod.spec,1.52,1.53
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4515
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sat May 17 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1
- New upstream release and also build akmods
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-20/VirtualBox-kmod.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- VirtualBox-kmod.spec 15 May 2014 06:06:02 -0000 1.52
+++ VirtualBox-kmod.spec 17 May 2014 14:39:31 -0000 1.53
@@ -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 newest
+#global buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -19,8 +19,8 @@
%bcond_with hardening
Name: VirtualBox-kmod
-Version: 4.3.10
-Release: 1%{?prerel:.%{prerel}}%{?dist}.7
+Version: 4.3.12
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Sat May 17 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1
+- New upstream release and also build akmods
+
* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.10-1.7
- Rebuilt for kernel
9 years, 11 months
rpms/nvidia-kmod/devel sources, 1.67, 1.68 nvidia-kmod.spec, 1.158, 1.159
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3858
Modified Files:
sources nvidia-kmod.spec
Log Message:
Update to kmodsrc scheme
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources 6 May 2014 16:01:24 -0000 1.67
+++ sources 17 May 2014 13:51:09 -0000 1.68
@@ -1 +0,0 @@
-29f0b3eb6ede2acc4db7ec0aab9e8eb1 nvidia-kmod-data-337.19.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- nvidia-kmod.spec 6 May 2014 16:01:24 -0000 1.158
+++ nvidia-kmod.spec 17 May 2014 13:51:09 -0000 1.159
@@ -9,30 +9,22 @@
Epoch: 1
Version: 337.19
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
-# Source is created from these files:
-#ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
-#ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
-#ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux-armv7l-gnueabihf-%{version}.run
-#sh %{SOURCE0} --extract-only --target nvidiapkg-i686
-#sh %{SOURCE1} --extract-only --target nvidiapkg-x86_64
-#sh %{SOURCE4} --extract-only --target nvidiapkg-armv7hl
-#tar -cJf nvidia-kmod-data-%{version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel
-Source0: nvidia-kmod-data-%{version}.tar.xz
-Patch0: nv-linux-arm.patch
-
-Source11: nvidia-kmodtool-excludekernel-filterfile
+Source11: nvidia-kmodtool-excludekernel-filterfile
+Patch0: nv-linux-arm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64 armv7hl
+BuildRequires: xorg-x11-drv-nvidia-kmodsrc >= %{version}
+
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -47,24 +39,19 @@
%{?kmodtool_check}
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
-%setup -q -c -T -a 0
-
+%setup -T -c
+tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
-for arch in x86_64 i686 armv7hl
-do
-pushd nvidiapkg-${arch}
%patch0 -p1
-popd
-done
for kernel_version in %{?kernel_versions} ; do
- cp -a nvidiapkg-%{_target_cpu} _kmod_build_${kernel_version%%___*}
+ cp -a kernel _kmod_build_${kernel_version%%___*}
done
%build
for kernel_version in %{?kernel_versions}; do
- pushd _kmod_build_${kernel_version%%___*}/kernel/
+ pushd _kmod_build_${kernel_version%%___*}/
make %{?_smp_mflags} \
KERNEL_UNAME="${kernel_version%%___*}" SYSSRC="${kernel_version##*___}" \
IGNORE_CC_MISMATCH=1 IGNORE_XEN_PRESENCE=1 IGNORE_PREEMPT_RT_PRESENCE=1 \
@@ -72,7 +59,7 @@
module
popd
%{!?_nv_build_module_instances:
- pushd _kmod_build_${kernel_version%%___*}/kernel/uvm
+ pushd _kmod_build_${kernel_version%%___*}/uvm
make %{?_smp_mflags} \
KERNEL_UNAME="${kernel_version%%___*}" SYSSRC="${kernel_version##*___}" \
IGNORE_CC_MISMATCH=1 IGNORE_XEN_PRESENCE=1 IGNORE_PREEMPT_RT_PRESENCE=1 \
@@ -86,7 +73,7 @@
rm -rf $RPM_BUILD_ROOT
for kernel_version in %{?kernel_versions}; do
mkdir -p $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
- install -D -m 0755 _kmod_build_${kernel_version%%___*}/kernel/{,uvm}/nvidia*.ko \
+ install -D -m 0755 _kmod_build_${kernel_version%%___*}/{,uvm}/nvidia*.ko \
$RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
done
%{?akmod_install}
@@ -97,6 +84,9 @@
%changelog
+* Sat May 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:337.19-2
+- Use kmodsrc to bundle kmod sources
+
* Tue May 06 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:337.19-1
- Update to 337.19
9 years, 11 months
rpms/xorg-x11-drv-nvidia/F-19 xorg-x11-drv-nvidia.spec,1.120,1.121
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3659/F-19
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Sync for stable
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- xorg-x11-drv-nvidia.spec 9 Apr 2014 12:30:41 -0000 1.120
+++ xorg-x11-drv-nvidia.spec 17 May 2014 13:49:43 -0000 1.121
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 331.67
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -65,7 +65,7 @@
#Support for cuda
#Don't put an epoch here
-Provides: cuda-driver = %{version}
+Provides: cuda-drivers = %{version}
%{?filter_setup:
%filter_from_provides /^libnvidia/d;
@@ -162,7 +162,6 @@
install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/
%ifarch x86_64 i686
install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
-install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
%endif
@@ -173,10 +172,11 @@
install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so.1
ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so
+%endif
#Vdpau
+install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
-%endif
#
mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
@@ -299,7 +299,7 @@
%endif
fi || :
-%triggerpostun -- xorg-x11-drv-nvidia < 1:%{version}-5
+%triggerpostun -- xorg-x11-drv-nvidia < 1:319.23-5
if [ "$1" -eq "1" ]; then
ISGRUB1=""
if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub.cfg ]] ; then
@@ -432,6 +432,8 @@
%exclude %{_libdir}/vdpau/libvdpau_trace.so*
%endif
%{_libdir}/libcuda.so.1
+%{_nvidia_libdir}/libcuda.so
+%{_libdir}/libcuda.so
%files devel
%defattr(-,root,root,-)
@@ -452,15 +454,19 @@
%{_nvidia_libdir}/libnvidia-eglcore.so
%{_nvidia_libdir}/libnvidia-glsi.so
%endif
-%{_nvidia_libdir}/libcuda.so
%{_nvidia_libdir}/libGL.so
%{_nvidia_libdir}/libnvidia-glcore.so
%{_nvidia_libdir}/libnvidia-fbc.so
%{_nvidia_libdir}/libnvcuvid.so
%{_nvidia_libdir}/libnvidia-ml.so
-%{_libdir}/libcuda.so
%changelog
+* Sat May 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.67-2
+- Fix for cuda-drivers provides
+- Provides libcuda.so in -libs rhbz#2979
+- Distribute libvdau_nvidia.so on ARM
+- Fix version macro on triggerpostun
+
* Wed Apr 09 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.67-1
- Update to 331.67
9 years, 11 months
rpms/xorg-x11-drv-nvidia/F-20 xorg-x11-drv-nvidia.spec,1.130,1.131
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3659/F-20
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Sync for stable
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-20/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- xorg-x11-drv-nvidia.spec 9 Apr 2014 11:33:46 -0000 1.130
+++ xorg-x11-drv-nvidia.spec 17 May 2014 13:49:44 -0000 1.131
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 331.67
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -65,7 +65,7 @@
#Support for cuda
#Don't put an epoch here
-Provides: cuda-driver = %{version}
+Provides: cuda-drivers = %{version}
%{?filter_setup:
%filter_from_provides /^libnvidia/d;
@@ -162,7 +162,6 @@
install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/
%ifarch x86_64 i686
install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
-install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
%endif
@@ -173,10 +172,11 @@
install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so.1
ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so
+%endif
#Vdpau
+install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
-%endif
#
mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
@@ -299,7 +299,7 @@
%endif
fi || :
-%triggerpostun -- xorg-x11-drv-nvidia < 1:%{version}-5
+%triggerpostun -- xorg-x11-drv-nvidia < 1:319.23-5
if [ "$1" -eq "1" ]; then
ISGRUB1=""
if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub.cfg ]] ; then
@@ -432,6 +432,8 @@
%exclude %{_libdir}/vdpau/libvdpau_trace.so*
%endif
%{_libdir}/libcuda.so.1
+%{_nvidia_libdir}/libcuda.so
+%{_libdir}/libcuda.so
%files devel
%defattr(-,root,root,-)
@@ -452,15 +454,19 @@
%{_nvidia_libdir}/libnvidia-eglcore.so
%{_nvidia_libdir}/libnvidia-glsi.so
%endif
-%{_nvidia_libdir}/libcuda.so
%{_nvidia_libdir}/libGL.so
%{_nvidia_libdir}/libnvidia-glcore.so
%{_nvidia_libdir}/libnvidia-fbc.so
%{_nvidia_libdir}/libnvcuvid.so
%{_nvidia_libdir}/libnvidia-ml.so
-%{_libdir}/libcuda.so
%changelog
+* Sat May 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.67-2
+- Fix for cuda-drivers provides
+- Provides libcuda.so in -libs rhbz#2979
+- Distribute libvdau_nvidia.so on ARM
+- Fix version macro on triggerpostun
+
* Wed Apr 09 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.67-1
- Update to 331.67
9 years, 11 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.133,1.134
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3035
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
- Provides libcuda.so in -libs rhbz#2979
- Split modules content into -kmodsrc reducing nvidia-kmod*.src.rpm size
- Distribute libvdau_nvidia.so on ARM
- Fix version macro on triggerpostun
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- xorg-x11-drv-nvidia.spec 6 May 2014 15:54:14 -0000 1.133
+++ xorg-x11-drv-nvidia.spec 17 May 2014 13:15:59 -0000 1.134
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 337.19
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -65,7 +65,7 @@
#Support for cuda
#Don't put an epoch here
-Provides: cuda-driver = %{version}
+Provides: cuda-drivers = %{version}
%{?filter_setup:
%filter_from_provides /^libnvidia/d;
@@ -106,6 +106,14 @@
This package provides the development files of the %{name} package,
such as OpenGL headers.
+%package kmodsrc
+Summary: %{name} kernel module source code
+Group: System Environment/Kernel
+
+%description kmodsrc
+Source tree used for building kernel module packages (%{name}-kmod)
+which is generated during the build of main package.
+
%package libs
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
@@ -120,16 +128,18 @@
%setup -q -c -T
#Only extract the needed arch
%ifarch %{ix86}
-sh %{SOURCE0} --extract-only --target nvidiapkg-i686
+sh %{SOURCE0} \
%endif
%ifarch x86_64
-sh %{SOURCE1} --extract-only --target nvidiapkg-x86_64
+sh %{SOURCE1} \
%endif
%ifarch armv7hl
-sh %{SOURCE4} --extract-only --target nvidiapkg-armv7hl
+sh %{SOURCE4} \
%endif
+ --extract-only --target nvidiapkg-%{_target_cpu}
ln -s nvidiapkg-%{_target_cpu} nvidiapkg
+
%build
# Nothing to build
echo "Nothing to build"
@@ -162,7 +172,6 @@
install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/
%ifarch x86_64 i686
install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
-install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
%endif
@@ -173,10 +182,11 @@
install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so.1
ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so
+%endif
#Vdpau
+install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
-%endif
#
mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
@@ -264,6 +274,10 @@
#Create the default nvidia config directory
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nvidia
+#Install the nvidia kernel modules sources archive
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version}
+tar Jcf $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz kernel
+
%pre
if [ "$1" -eq "1" ]; then
@@ -299,7 +313,7 @@
%endif
fi || :
-%triggerpostun -- xorg-x11-drv-nvidia < 1:%{version}-5
+%triggerpostun -- xorg-x11-drv-nvidia < 1:319.23-5
if [ "$1" -eq "1" ]; then
ISGRUB1=""
if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub.cfg ]] ; then
@@ -418,6 +432,10 @@
%{_mandir}/man1/nvidia-persistenced.1.*
%{_mandir}/man1/nvidia-modprobe.1.*
+%files kmodsrc
+%dir %{_datadir}/nvidia-kmod-%{version}
+%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz
+
%files libs
%defattr(-,root,root,-)
%dir %{_nvidia_libdir}
@@ -427,11 +445,12 @@
%ifarch x86_64 i686
%dir %{_nvidia_libdir}/tls
%{_nvidia_libdir}/tls/*.so.*
+%endif
%exclude %{_libdir}/vdpau/libvdpau.*
%{_libdir}/vdpau/libvdpau_nvidia.so.*
%exclude %{_libdir}/vdpau/libvdpau_trace.so*
-%endif
%{_libdir}/libcuda.so.1
+%{_libdir}/libcuda.so
%files devel
%defattr(-,root,root,-)
@@ -441,8 +460,8 @@
%{_nvidia_libdir}/libnvidia-compiler.so
%{_nvidia_libdir}/libnvidia-opencl.so
%{_nvidia_libdir}/tls/libnvidia-tls.so
-%{_libdir}/vdpau/libvdpau_nvidia.so
%endif
+%{_libdir}/vdpau/libvdpau_nvidia.so
%{_nvidia_libdir}/libnvidia-encode.so
%{_nvidia_libdir}/libnvidia-ifr.so
%{_nvidia_libdir}/libEGL.so
@@ -456,9 +475,14 @@
%{_nvidia_libdir}/libnvidia-fbc.so
%{_nvidia_libdir}/libnvcuvid.so
%{_nvidia_libdir}/libnvidia-ml.so
-%{_libdir}/libcuda.so
%changelog
+* Sat May 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:337.19-2
+- Provides libcuda.so in -libs rhbz#2979
+- Split modules content into -kmodsrc reducing nvidia-kmod*.src.rpm size
+- Distribute libvdau_nvidia.so on ARM
+- Fix version macro on triggerpostun
+
* Tue May 06 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:337.19-1
- Update to 337.19
9 years, 11 months