rpms/xorg-x11-drv-nvidia/F-15 sources, 1.36, 1.37 xorg-x11-drv-nvidia.spec, 1.66, 1.67
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8979
Modified Files:
sources xorg-x11-drv-nvidia.spec
Log Message:
* Mon Jun 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.59-1
- Update to 295.59
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-15/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources 22 May 2012 18:33:42 -0000 1.36
+++ sources 11 Jun 2012 18:26:38 -0000 1.37
@@ -1,2 +1,2 @@
-af353274ab078cb90aba428ca1f00f0e NVIDIA-Linux-x86-295.53.run
-e349da7e84360521917689237611564f NVIDIA-Linux-x86_64-295.53.run
+bef732dfcf5cb079c06c1e8672d8d5dd NVIDIA-Linux-x86-295.59.run
+a921cfdb0162b9bb788c4486b1e6d725 NVIDIA-Linux-x86_64-295.59.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-15/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- xorg-x11-drv-nvidia.spec 22 May 2012 18:33:42 -0000 1.66
+++ xorg-x11-drv-nvidia.spec 11 Jun 2012 18:26:38 -0000 1.67
@@ -6,7 +6,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 295.53
+Version: 295.59
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -347,6 +347,9 @@
%changelog
+* Mon Jun 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.59-1
+- Update to 295.59
+
* Tue May 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.53-1
- Update to 295.53
12 years, 5 months
rpms/xorg-x11-drv-nvidia/F-16 sources, 1.43, 1.44 xorg-x11-drv-nvidia.spec, 1.77, 1.78
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8951
Modified Files:
sources xorg-x11-drv-nvidia.spec
Log Message:
* Mon Jun 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.59-1
- Update to 295.59
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources 22 May 2012 18:02:12 -0000 1.43
+++ sources 11 Jun 2012 18:26:35 -0000 1.44
@@ -1,2 +1,2 @@
-af353274ab078cb90aba428ca1f00f0e NVIDIA-Linux-x86-295.53.run
-e349da7e84360521917689237611564f NVIDIA-Linux-x86_64-295.53.run
+bef732dfcf5cb079c06c1e8672d8d5dd NVIDIA-Linux-x86-295.59.run
+a921cfdb0162b9bb788c4486b1e6d725 NVIDIA-Linux-x86_64-295.59.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- xorg-x11-drv-nvidia.spec 22 May 2012 18:02:12 -0000 1.77
+++ xorg-x11-drv-nvidia.spec 11 Jun 2012 18:26:35 -0000 1.78
@@ -6,7 +6,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 295.53
+Version: 295.59
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -352,6 +352,9 @@
%changelog
+* Mon Jun 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.59-1
+- Update to 295.59
+
* Tue May 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.53-1
- Update to 295.53
12 years, 5 months
rpms/xorg-x11-drv-nvidia/F-17 .cvsignore, 1.45, 1.46 sources, 1.46, 1.47 xorg-x11-drv-nvidia.spec, 1.79, 1.80
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8910
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
* Mon Jun 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.59-1
- Update to 295.59
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore 22 May 2012 17:57:28 -0000 1.45
+++ .cvsignore 11 Jun 2012 18:26:33 -0000 1.46
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-295.53.run
-NVIDIA-Linux-x86_64-295.53.run
+NVIDIA-Linux-x86-295.59.run
+NVIDIA-Linux-x86_64-295.59.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources 22 May 2012 17:57:28 -0000 1.46
+++ sources 11 Jun 2012 18:26:33 -0000 1.47
@@ -1,2 +1,2 @@
-af353274ab078cb90aba428ca1f00f0e NVIDIA-Linux-x86-295.53.run
-e349da7e84360521917689237611564f NVIDIA-Linux-x86_64-295.53.run
+bef732dfcf5cb079c06c1e8672d8d5dd NVIDIA-Linux-x86-295.59.run
+a921cfdb0162b9bb788c4486b1e6d725 NVIDIA-Linux-x86_64-295.59.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- xorg-x11-drv-nvidia.spec 22 May 2012 17:57:29 -0000 1.79
+++ xorg-x11-drv-nvidia.spec 11 Jun 2012 18:26:33 -0000 1.80
@@ -6,7 +6,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 295.53
+Version: 295.59
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -352,6 +352,9 @@
%changelog
+* Mon Jun 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.59-1
+- Update to 295.59
+
* Tue May 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.53-1
- Update to 295.53
12 years, 5 months
rpms/lightspark/devel sources, 1.21, 1.22 lightspark.spec, 1.26, 1.27 .cvsignore, 1.1, 1.2
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/lightspark/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7964
Modified Files:
sources lightspark.spec .cvsignore
Log Message:
0.6.0.1
Index: sources
===================================================================
RCS file: /cvs/free/rpms/lightspark/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 23 May 2012 20:48:23 -0000 1.21
+++ sources 11 Jun 2012 18:14:54 -0000 1.22
@@ -1 +1 @@
-613b4baad01159726dd8c5133c6ff526 lightspark-0.5.7.tar.gz
+66e13a61d06dd0c8c81303fabaee8549 lightspark-0.6.0.1.tar.gz
12 years, 5 months
rpms/openmotif/F-17 openmotif.spec,1.3,1.4
by Jochen Schmitt
Author: s4504kr
Update of /cvs/nonfree/rpms/openmotif/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31225
Modified Files:
openmotif.spec
Log Message:
Add flex-static as a BR
Index: openmotif.spec
===================================================================
RCS file: /cvs/nonfree/rpms/openmotif/F-17/openmotif.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openmotif.spec 8 Feb 2012 23:46:14 -0000 1.3
+++ openmotif.spec 10 Jun 2012 18:13:45 -0000 1.4
@@ -2,7 +2,7 @@
Summary: Open Motif runtime libraries and executables
Name: openmotif
Version: %{major}.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: Open Group Public License
Group: System Environment/Libraries
Source: ftp://ftp.ics.com/openmotif/%{major}/%{version}/%{name}-%{version}.tar.gz
@@ -18,6 +18,7 @@
BuildRequires: libXft-devel libXmu-devel libXp-devel libXt-devel libXext-devel
BuildRequires: xorg-x11-xbitmaps
BuildRequires: perl
+BuildRequires: flex-static
Patch1: openMotif-2.2.3-uil_lib.patch
Patch2: openMotif-2.3.0-rgbtxt.patch
@@ -186,6 +187,9 @@
%{_mandir}/man3/*
%changelog
+* Tue Jun 5 2012 Jochen Schmitt <Jochen herr-schmitt de> - 2.3.3-3
+- Add a BR to flex-static to fix a FTBFS
+
* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 5 months
rpms/wl-kmod/F-16 broadcom-wl-5.100.82.112-kernel-3.4.patch, NONE, 1.1 wl-kmod.spec, 1.92, 1.93
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21525
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.4.patch
Log Message:
* Sun Jun 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
- Added patch to build for kernel >= 3.4
broadcom-wl-5.100.82.112-kernel-3.4.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.4.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2012-01-09 15:07:19.779120052 +0100
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2012-06-08 19:33:56.732583669 +0200
@@ -40,7 +40,9 @@
#include <linux/pci_ids.h>
#define WLC_MAXBSSCFG 1
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
#include <asm/system.h>
+#endif
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/pgtable.h>
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-16/wl-kmod.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- wl-kmod.spec 5 Jun 2012 20:23:15 -0000 1.92
+++ wl-kmod.spec 10 Jun 2012 08:48:04 -0000 1.93
@@ -3,11 +3,11 @@
# "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
-%define buildforkernels newest
+%define buildforkernels current
Name: wl-kmod
Version: 5.100.82.112
-Release: 2%{?dist}.25
+Release: 3%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -17,6 +17,7 @@
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
Patch0: broadcom-wl-5.100.82.112-license.patch
Patch1: broadcom-wl-5.100.82.112-kernel-3.2.patch
+Patch2: broadcom-wl-5.100.82.112-kernel-3.4.patch
BuildRequires: %{_bindir}/kmodtool
@@ -54,6 +55,7 @@
%endif
%patch0 -p1 -b .license
%patch1 -p1 -b .kernel-3.2
+%patch2 -p1 -b .kernel-3.4
popd
for kernel_version in %{?kernel_versions} ; do
@@ -83,6 +85,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jun 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
+- Added patch to build for kernel >= 3.4
+
* Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-2.25
- Rebuilt for updated kernel
12 years, 5 months
rpms/catalyst-kmod/F-16 catalyst-kmod.spec, 1.54, 1.55 fglrx_kernel_3.4.0.patch, 1.2, 1.3
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10933
Modified Files:
catalyst-kmod.spec fglrx_kernel_3.4.0.patch
Log Message:
* Sat Jun 09 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.4-4
- complete patch for newer kernels
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/catalyst-kmod.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- catalyst-kmod.spec 5 Jun 2012 20:22:43 -0000 1.54
+++ catalyst-kmod.spec 9 Jun 2012 23:25:33 -0000 1.55
@@ -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
-%define buildforkernels newest
+%define buildforkernels current
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -13,7 +13,7 @@
Name: catalyst-kmod
Version: 12.4
-Release: 3%{?dist}.1
+Release: 4%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -105,6 +105,9 @@
%changelog
+* Sat Jun 09 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.4-4
+- complete patch for newer kernels
+
* Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 12.4-3.1
- Rebuilt for updated kernel
fglrx_kernel_3.4.0.patch:
firegl_public.c | 7 +++++++
kcl_ioctl.c | 4 ++++
2 files changed, 11 insertions(+)
Index: fglrx_kernel_3.4.0.patch
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/fglrx_kernel_3.4.0.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fglrx_kernel_3.4.0.patch 23 May 2012 15:04:20 -0000 1.2
+++ fglrx_kernel_3.4.0.patch 9 Jun 2012 23:25:33 -0000 1.3
@@ -15,10 +15,23 @@
unsigned int p;
KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
-+ for_each_cpu_mask(p, cpu_possible_mask)
++ for_each_possible_cpu(p)
+#else
for_each_cpu_mask(p, cpu_possible_map)
+#endif
{
KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p);
preempt_disable();
+--- lib/modules/fglrx/build_mod/kcl_ioctl.c
++++ lib/modules/fglrx/build_mod/kcl_ioctl.c
+@@ -217,6 +217,10 @@
+ * \param size [in] Number of bytes to allocate
+ * \return Pointer to allocated memory
+ */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
++DEFINE_PER_CPU(unsigned long, old_rsp);
++#endif
++
+ void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
+ {
+ void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
12 years, 5 months
rpms/VirtualBox/F-17 VirtualBox-OSE-90-vboxdrv.rules, 1.6, 1.7 VirtualBox.spec, 1.3, 1.4
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7708
Modified Files:
VirtualBox-OSE-90-vboxdrv.rules VirtualBox.spec
Log Message:
* Sat Jun 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.16-3
- From Packaging Guidelines, https://fedoraproject.org/wiki/Packaging:Systemd, Packages with systemd
unit files must put them into %{_unitdir}.
- Install VBoxCreateUSBNode.sh in /lib/udev, and udev rules from upstream.
Index: VirtualBox-OSE-90-vboxdrv.rules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/VirtualBox-OSE-90-vboxdrv.rules,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VirtualBox-OSE-90-vboxdrv.rules 22 Sep 2011 10:04:38 -0000 1.6
+++ VirtualBox-OSE-90-vboxdrv.rules 9 Jun 2012 21:57:10 -0000 1.7
@@ -1,3 +1,4 @@
-ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxdrv", OWNER="root", MODE="0600"
-ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxnetctl", OWNER="root", MODE="0600"
-ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{bDeviceClass}!="09", GROUP="vboxusers", MODE="660", SYMLINK+="vboxusb/$env{BUSNUM}/$env{DEVNUM}"
+SUBSYSTEM=="usb_device", ACTION=="add", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/VirtualBox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VirtualBox.spec 31 May 2012 05:02:21 -0000 1.3
+++ VirtualBox.spec 9 Jun 2012 21:57:10 -0000 1.4
@@ -1,7 +1,5 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%global systemd_dir /lib/systemd/system
-
# Standard compiler flags, without:
# -Wall -- VirtualBox takes care of reasonable warnings very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
@@ -17,7 +15,7 @@
Name: VirtualBox
Version: 4.1.16
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Release: 3%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -82,6 +80,11 @@
BuildRequires: libXcomposite-devel
BuildRequires: libXmu-devel
+BuildRequires: systemd-units
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+
# Plague-specific weirdness
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch: i686 x86_64
@@ -91,10 +94,6 @@
ExclusiveArch: i386 x86_64
%endif
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-
Provides: %{name}-OSE = %{version}-%{release}
Obsoletes: %{name}-OSE < %{version}-%{release}
Requires: %{name}-kmod = %{version}%{?prereltag}
@@ -353,10 +352,13 @@
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
install -m 0644 -D %{SOURCE10} \
- $RPM_BUILD_ROOT%{systemd_dir}/vboxweb.service
+ $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service
install -m 0644 -D %{SOURCE11} \
- $RPM_BUILD_ROOT%{systemd_dir}/vboxservice.service
+ $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service
+
+install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \
+ $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
@@ -512,7 +514,8 @@
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
%doc COPYING
-%{systemd_dir}/vboxweb.service
+%{_unitdir}/vboxweb.service
+/lib/udev/VBoxCreateUSBNode.sh
%files devel
@@ -540,7 +543,7 @@
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
%doc COPYING
-%{systemd_dir}/vboxservice.service
+%{_unitdir}/vboxservice.service
%files kmodsrc
@@ -548,6 +551,11 @@
%changelog
+* Sat Jun 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.16-3
+- From Packaging Guidelines, https://fedoraproject.org/wiki/Packaging:Systemd, Packages with systemd
+ unit files must put them into %{_unitdir}.
+- Install VBoxCreateUSBNode.sh in /lib/udev, and udev rules from upstream.
+
* Wed May 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.16-2
- Obsolete also VirtualBox-OSE-kmodsrc.
12 years, 5 months
rpms/VirtualBox/devel VirtualBox-OSE-90-vboxdrv.rules, 1.6, 1.7 VirtualBox.spec, 1.8, 1.9
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7444
Modified Files:
VirtualBox-OSE-90-vboxdrv.rules VirtualBox.spec
Log Message:
* Sat Jun 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.16-3
- From Packaging Guidelines, https://fedoraproject.org/wiki/Packaging:Systemd, Packages with systemd
unit files must put them into %{_unitdir}.
- Install VBoxCreateUSBNode.sh in /lib/udev, and udev rules from upstream.
Index: VirtualBox-OSE-90-vboxdrv.rules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-OSE-90-vboxdrv.rules,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VirtualBox-OSE-90-vboxdrv.rules 22 Sep 2011 10:04:38 -0000 1.6
+++ VirtualBox-OSE-90-vboxdrv.rules 9 Jun 2012 21:48:48 -0000 1.7
@@ -1,3 +1,4 @@
-ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxdrv", OWNER="root", MODE="0600"
-ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxnetctl", OWNER="root", MODE="0600"
-ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{bDeviceClass}!="09", GROUP="vboxusers", MODE="660", SYMLINK+="vboxusb/$env{BUSNUM}/$env{DEVNUM}"
+SUBSYSTEM=="usb_device", ACTION=="add", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VirtualBox.spec 7 Jun 2012 21:34:52 -0000 1.8
+++ VirtualBox.spec 9 Jun 2012 21:48:48 -0000 1.9
@@ -357,6 +357,9 @@
install -m 0644 -D %{SOURCE11} \
$RPM_BUILD_ROOT%{_unitdir}/vboxservice.service
+install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \
+ $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh
+
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
@@ -512,6 +515,7 @@
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
%doc COPYING
%{_unitdir}/vboxweb.service
+/lib/udev/VBoxCreateUSBNode.sh
%files devel
@@ -547,9 +551,10 @@
%changelog
-* Sérgio Basto <sergio(a)serjux.com> - 4.1.16-3
+* Sat Jun 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.16-3
- From Packaging Guidelines, https://fedoraproject.org/wiki/Packaging:Systemd, Packages with systemd
unit files must put them into %{_unitdir}.
+- Install VBoxCreateUSBNode.sh in /lib/udev, and udev rules from upstream.
* Wed May 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.16-2
- Obsolete also VirtualBox-OSE-kmodsrc.
12 years, 5 months
rpms/php-pecl-pdflib/F-17 .cvsignore, 1.5, 1.6 php-pecl-pdflib.spec, 1.11, 1.12 sources, 1.5, 1.6 pdflib-php54.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/nonfree/rpms/php-pecl-pdflib/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28585
Modified Files:
.cvsignore php-pecl-pdflib.spec sources
Removed Files:
pdflib-php54.patch
Log Message:
Update to 2.1.9, provide ZTS extension
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/F-17/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 7 May 2010 04:42:10 -0000 1.5
+++ .cvsignore 9 Jun 2012 05:31:29 -0000 1.6
@@ -1 +1 @@
-pdflib-2.1.8.tgz
+pdflib-2.1.9.tgz
Index: php-pecl-pdflib.spec
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/F-17/php-pecl-pdflib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- php-pecl-pdflib.spec 2 May 2012 08:43:07 -0000 1.11
+++ php-pecl-pdflib.spec 9 Jun 2012 05:31:29 -0000 1.12
@@ -1,6 +1,7 @@
%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}}
+%{!?php_inidir: %{expand: %%global php_inidir %{_sysconfdir}/php.d}}
%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
-%{!?php_apiver: %{expand: %%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)}}
+%{!?php_apiver: %{expand: %%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)}}
%global pecl_name pdflib
%global extname pdf
@@ -8,19 +9,15 @@
Summary: Package for generating PDF files
Summary(fr): Extension pour générer des fichiers PDF
Name: php-pecl-pdflib
-Version: 2.1.8
-Release: 4%{?dist}
+Version: 2.1.9
+Release: 1%{?dist}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/pdflib
Source: http://pecl.php.net/get/pdflib-%{version}.tgz
-
Source2: xml2changelog
-# https://bugs.php.net/60397 php 5.4 build
-Patch0: pdflib-php54.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-devel, pdflib-lite-devel, php-pear
@@ -62,8 +59,6 @@
%setup -c -q
%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-%patch0 -p0 -b .php54
-
# Check version
extver=$(sed -n '/#define PHP_PDFLIB_VERSION/{s/.* "//;s/".*$//;p}' %{pecl_name}-%{version}/php_pdflib.h)
if test "x${extver}" != "x%{version}"; then
@@ -71,38 +66,59 @@
exit 1
fi
+cp -pr %{pecl_name}-%{version} %{pecl_name}-zts
+
+# Create the config file
+cat > %{extname}.ini << 'EOF'
+; Enable PDFlib extension module
+extension=%{extname}.so
+EOF
+
%build
-cd pdflib-%{version}
-phpize
-%configure
+cd %{pecl_name}-%{version}
+%{_bindir}/phpize
+%configure --with-php-config=%{_bindir}/php-config
+make %{?_smp_mflags}
+
+%if 0%{?__ztsphp:1}
+cd ../%{pecl_name}-zts
+%{_bindir}/zts-phpize
+%configure --with-php-config=%{_bindir}/zts-php-config
make %{?_smp_mflags}
+%endif
%install
-cd pdflib-%{version}
rm -rf %{buildroot}
-make install INSTALL_ROOT=%{buildroot}
+
+make -C %{pecl_name}-%{version} install-modules INSTALL_ROOT=%{buildroot}
# Drop in the bit of configuration
-mkdir -p %{buildroot}%{_sysconfdir}/php.d
-cat > %{buildroot}%{_sysconfdir}/php.d/%{extname}.ini << 'EOF'
-; Enable PDFlib extension module
-extension=%{extname}.so
-EOF
+install -D -m 644 %{extname}.ini %{buildroot}%{php_inidir}/%{extname}.ini
# Install XML package description
-mkdir -p %{buildroot}%{pecl_xmldir}
-install -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+
+%if 0%{?__ztsphp:1}
+make -C %{pecl_name}-zts install-modules INSTALL_ROOT=%{buildroot}
+install -D -m 644 %{extname}.ini %{buildroot}%{php_ztsinidir}/%{extname}.ini
+%endif
%check
-cd %{pecl_name}-%{version}
-php -n \
- -d extension_dir=modules \
+%{_bindir}/php -n \
+ -d extension_dir=%{pecl_name}-%{version}/modules \
-d extension=%{extname}.so \
-m | grep %{extname}
+%if 0%{?__ztsphp:1}
+%{__ztsphp} -n \
+ -d extension_dir=%{pecl_name}-zts/modules \
+ -d extension=%{extname}.so \
+ -m | grep %{extname}
+%endif
+
%if 0%{?pecl_install:1}
%post
@@ -124,13 +140,22 @@
%files
%defattr(-, root, root, -)
-%doc CHANGELOG pdflib-%{version}/CREDITS
-%config(noreplace) %{_sysconfdir}/php.d/%{extname}.ini
+%doc CHANGELOG %{pecl_name}-%{version}/CREDITS
+%config(noreplace) %{php_inidir}/%{extname}.ini
%{php_extdir}/%{extname}.so
%{pecl_xmldir}/%{name}.xml
+%if 0%{?__ztsphp:1}
+%config(noreplace) %{php_ztsinidir}/%{extname}.ini
+%{php_ztsextdir}/%{extname}.so
+%endif
+
%changelog
+* Sat Jun 09 2012 Remi Collet <RPMS(a)FamilleCollet.com> 2.1.9-1
+- update to 2.1.9
+- add ZTS extension
+
* Wed May 02 2012 Remi Collet <rpmfusion(a)FamilleCollet.com> 2.1.8-4
- add patch for php 5.4
- fix filter for private .so
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/F-17/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 7 May 2010 04:42:10 -0000 1.5
+++ sources 9 Jun 2012 05:31:29 -0000 1.6
@@ -1 +1 @@
-ee1b7c30b68b2caba8a95ef9a45e9b84 pdflib-2.1.8.tgz
+04b4e0a2a8731c5f087f40620aca4ddf pdflib-2.1.9.tgz
--- pdflib-php54.patch DELETED ---
12 years, 5 months
