rpms/VirtualBox/F-19 .cvsignore, 1.54, 1.55 VirtualBox-4.3.0-VBoxGuestLib.patch, 1.3, 1.4 VirtualBox.spec, 1.56, 1.57 sources, 1.54, 1.55
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15258
Modified Files:
.cvsignore VirtualBox-4.3.0-VBoxGuestLib.patch VirtualBox.spec
sources
Log Message:
* Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-2
- Moved files from /etc/modules-load.d/ to /usr/lib/modules-load.d/, fix rfbz #3469 .
- Also moved files from /etc/udev/rules.d/ to /usr/lib/udev/rules.d/ and removed %config directive .
- s/$RPM_BUILD_ROOT/%{buildroot}/g
- Added %{_prefix} to /lib/udev/ .
- Moved pam_vbox.so from %{_lib}/security/ to %{_libdir}/security/ .
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore 18 Sep 2014 22:22:56 -0000 1.54
+++ .cvsignore 25 Dec 2014 02:25:22 -0000 1.55
@@ -1 +1 @@
-VirtualBox-4.3.16.tar.bz2
+VirtualBox-4.3.20.tar.bz2
VirtualBox-4.3.0-VBoxGuestLib.patch:
Makefile.kmk | 2 ++
1 file changed, 2 insertions(+)
Index: VirtualBox-4.3.0-VBoxGuestLib.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox-4.3.0-VBoxGuestLib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VirtualBox-4.3.0-VBoxGuestLib.patch 18 Sep 2014 22:22:56 -0000 1.3
+++ VirtualBox-4.3.0-VBoxGuestLib.patch 25 Dec 2014 02:25:22 -0000 1.4
@@ -1,15 +1,16 @@
when we use VBOX_USE_SYSTEM_XORG_HEADERS , we don't need compile the very old libXFree86 (from xfree86.org)
Sérgio Basto <sergio(a)serjux.com>
---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2014-09-11 15:31:56.706906433 +0100
-+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-09-11 15:32:24.737206867 +0100
-@@ -39,10 +39,6 @@ LIBRARIES += \
- VBoxGuestR3Lib \
+--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2014-10-11 13:03:35.000000000 +0100
++++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-10-12 00:11:00.925507543 +0100
+@@ -40,9 +40,11 @@ LIBRARIES += \
VBoxGuestR3LibShared
ifndef VBOX_ONLY_TESTSUITE
-- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
-- LIBRARIES += \
-- VBoxGuestR3LibXFree86
-- endif
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
++ ifndef VBOX_USE_SYSTEM_XORG_HEADERS
+ LIBRARIES += \
+ VBoxGuestR3LibXFree86
+ endif
++ endif
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
LIBRARIES += \
VBoxGuestR3LibXOrg
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- VirtualBox.spec 18 Sep 2014 22:22:56 -0000 1.56
+++ VirtualBox.spec 25 Dec 2014 02:25:22 -0000 1.57
@@ -26,8 +26,8 @@
#endif
Name: VirtualBox
-Version: 4.3.16
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Version: 4.3.20
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -90,7 +90,7 @@
#BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32)
#BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686
#BuildRequires: /usr/lib/libc.so
-#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6
+#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6
# For the X11 module
BuildRequires: libdrm-devel
@@ -199,7 +199,7 @@
%setup -qn %{name}-%{version}%{prereltag}
find -name '*.py[co]' -delete
-# Remove prebuilt binary tools
+# Remove prebuilt binary tools
rm -rf kBuild
rm -rf tools
# Remove bundle X11 sources and some lib sources, before patching.
@@ -209,11 +209,11 @@
rm -rf src/VBox/Additions/x11/x11stubs
rm -rf src/VBox/GuestHost/OpenGL/include/GL
-rm -rf src/libs/boost-1.37.0/
-#rm -rf src/libs/liblzf-3.4/
-rm -rf src/libs/libxml2-2.6.31/
-rm -rf src/libs/libpng-1.2.8/
-rm -rf src/libs/zlib-1.2.6/
+rm -rf src/libs/boost-1.37.0/
+#rm -rf src/libs/liblzf-3.4/
+rm -rf src/libs/libxml2-2.6.31/
+rm -rf src/libs/libpng-1.2.8/
+rm -rf src/libs/zlib-1.2.6/
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
@@ -272,57 +272,55 @@
# the commercially supported version to minimize confusion
# Directory structure
-install -d $RPM_BUILD_ROOT/%{_lib}/security
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_sbindir}
-install -d $RPM_BUILD_ROOT%{_libdir}
-install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox
-install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/components
-install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls
-install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/ExtensionPacks
-install -d $RPM_BUILD_ROOT%{_libdir}/dri
-install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk
-install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
-install -d $RPM_BUILD_ROOT%{_datadir}/icons
-install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-kmod-%{version}
-install -d $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
+install -d %{buildroot}%{_bindir}
+install -d %{buildroot}%{_sbindir}
+install -d %{buildroot}%{_libdir}
+install -d %{buildroot}%{_libdir}/virtualbox
+install -d %{buildroot}%{_libdir}/virtualbox/components
+install -d %{buildroot}%{_libdir}/virtualbox/nls
+install -d %{buildroot}%{_libdir}/virtualbox/ExtensionPacks
+install -d %{buildroot}%{_libdir}/virtualbox/sdk
+install -d %{buildroot}%{_datadir}/pixmaps
+install -d %{buildroot}%{_datadir}/mime/packages
+install -d %{buildroot}%{_datadir}/icons
+install -d %{buildroot}%{_prefix}/src/%{name}-kmod-%{version}
+install -d %{buildroot}%{python_sitelib}/virtualbox
# Binaries and Wrapper with Launchers
-install -p -m 0755 obj/bin/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBox
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/virtualbox
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxManage
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxmanage
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxsdl
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxVRDP
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
+install -p -m 0755 obj/bin/VBox.sh %{buildroot}%{_bindir}/VBox
+ln -s VBox %{buildroot}%{_bindir}/VirtualBox
+ln -s VBox %{buildroot}%{_bindir}/virtualbox
+ln -s VBox %{buildroot}%{_bindir}/VBoxManage
+ln -s VBox %{buildroot}%{_bindir}/vboxmanage
+ln -s VBox %{buildroot}%{_bindir}/VBoxSDL
+ln -s VBox %{buildroot}%{_bindir}/vboxsdl
+ln -s VBox %{buildroot}%{_bindir}/VBoxVRDP
+ln -s VBox %{buildroot}%{_bindir}/VBoxHeadless
+ln -s VBox %{buildroot}%{_bindir}/vboxheadless
+ln -s VBox %{buildroot}%{_bindir}/VBoxBalloonCtrl
+ln -s VBox %{buildroot}%{_bindir}/vboxballoonctrl
%if %{enable_webservice}
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+ln -s VBox %{buildroot}%{_bindir}/vboxwebsrv
%endif
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
+install -p -m 0755 -t %{buildroot}%{_bindir} \
obj/bin/VBoxTunctl
# Components
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/components \
+install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/components \
obj/bin/components/*
# Lib
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
+install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/*.so
-install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
+install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/V*.gc \
obj/bin/V*.r0 \
obj/bin/VBoxEFI*.fd
# Executables
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
+install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/SUPInstall \
obj/bin/SUPLoggerCtl \
obj/bin/SUPUninstall \
@@ -349,108 +347,110 @@
obj/bin/webtest \
%endif
-install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh
+install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh %{buildroot}%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
# Language files
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
+install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/nls \
obj/bin/nls/*
# SDK
pushd obj/bin/sdk/installer
VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
- python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT
+ python vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
popd
-cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk
-rm -rf $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk/installer
+cp -rp obj/bin/sdk/. %{buildroot}%{_libdir}/virtualbox/sdk
+rm -rf %{buildroot}%{_libdir}/virtualbox/sdk/installer
# Icons
-install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
+install -p -m 0644 -t %{buildroot}%{_datadir}/pixmaps \
obj/bin/VBox.png
for S in obj/bin/icons/*
do
SIZE=$(basename $S)
- install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps}
- install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes
- [ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png
+ install -d %{buildroot}%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps}
+ install -p -m 0644 $S/* %{buildroot}%{_datadir}/icons/hicolor/$SIZE/mimetypes
+ [ -f %{buildroot}%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \
+ %{buildroot}%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \
+ %{buildroot}%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png
done
-install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
+install -p -m 0644 obj/bin/virtualbox.xml %{buildroot}%{_datadir}/mime/packages
# Guest X.Org drivers
-# Michael Thayer from Oracle wrote: I have applied the patch [1] I posted so that you
-# can build with VBOX_USE_SYSTEM_XORG_HEADERS=1 set in future to only
+# Michael Thayer from Oracle wrote: I have applied the patch [1] I posted so that you
+# can build with VBOX_USE_SYSTEM_XORG_HEADERS=1 set in future to only
# build the X.Org drivers against the installed system headers.
# also wrote:
# As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not
# build it in this case.
# and
# Build using local X.Org headers. We assume X.Org Server 1.7 or later.
-#
+#
# [1] https://www.virtualbox.org/changeset/43588/vbox
install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+ %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
# Guest tools
-install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \
+install -m 0755 -t %{buildroot}%{_sbindir} \
obj/bin/additions/mount.vboxsf
-install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
+install -m 0755 -t %{buildroot}%{_bindir} \
obj/bin/additions/VBoxService \
obj/bin/additions/VBoxClient \
obj/bin/additions/VBoxControl
%if %{enable_webservice}
install -m 0644 -D %{SOURCE10} \
- $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service
+ %{buildroot}%{_unitdir}/vboxweb.service
%endif
install -m 0644 -D %{SOURCE11} \
- $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service
+ %{buildroot}%{_unitdir}/vboxservice.service
#review this 3
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
- $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
+ %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
-#/usr/bin/VBoxClient-all does not exits
+#/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
-#desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+# %{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+#desktop-file-validate %{buildroot}%{_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%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
+ %{buildroot}%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
+desktop-file-validate %{buildroot}%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
# Guest libraries
-install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \
+install -d %{buildroot}%{_libdir}/dri
+install -m 0755 -t %{buildroot}%{_libdir} \
obj/bin/additions/VBoxOGL*.so
-ln -sf ../VBoxOGL.so $RPM_BUILD_ROOT%{_libdir}/dri/vboxvideo_dri.so
+ln -sf ../VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
-install -m 0755 -t $RPM_BUILD_ROOT/%{_lib}/security \
+install -d %{buildroot}%{_libdir}/security
+install -m 0755 -t %{buildroot}%{_libdir}/security \
obj/bin/additions/pam_vbox.so
# Installation root configuration
-install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
-echo 'INSTALL_DIR=%{_libdir}/virtualbox' > $RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
+install -d %{buildroot}%{_sysconfdir}/vbox
+echo 'INSTALL_DIR=%{_libdir}/virtualbox' > %{buildroot}%{_sysconfdir}/vbox/vbox.cfg
# Install udev rules
-install -p -m 0644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
-install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxguest.rules
+install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/udev/rules.d/90-vboxdrv.rules
+install -p -m 0644 -D %{SOURCE5} %{buildroot}%{_prefix}/lib/udev/rules.d/60-vboxguest.rules
# Install modules load script
-install -p -m 0644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}.conf
-install -p -m 0644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}-guest.conf
+install -p -m 0644 -D %{SOURCE6} %{buildroot}%{_prefix}/lib/modules-load.d/%{name}.conf
+install -p -m 0644 -D %{SOURCE7} %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
# Module Source Code
mkdir -p %{name}-kmod-%{version}
cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version}
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}
-tar --use-compress-program xz -cf $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \
+install -d %{buildroot}%{_datadir}/%{name}-kmod-%{version}
+tar --use-compress-program xz -cf %{buildroot}%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \
%{name}-kmod-%{version}
# Menu entry
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
--remove-key=DocPath --remove-category=X-MandrivaLinux-System \
--vendor='' obj/bin/virtualbox.desktop
@@ -501,7 +501,7 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
# Guest additions install
-%post guest
+%post guest
/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
# should be in kmod package, not here
@@ -571,8 +571,8 @@
%{_datadir}/applications/*.desktop
%dir %{_sysconfdir}/vbox
%config %{_sysconfdir}/vbox/vbox.cfg
-%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
-%config %{_sysconfdir}/modules-load.d/%{name}.conf
+%{_prefix}/lib/udev/rules.d/90-vboxdrv.rules
+%{_prefix}/lib/modules-load.d/%{name}.conf
%doc COPYING*
%doc doc/*.*
%if %{enable_docs}
@@ -581,7 +581,7 @@
%if %{enable_webservice}
%{_unitdir}/vboxweb.service
%endif
-/lib/udev/VBoxCreateUSBNode.sh
+%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
%files devel
@@ -594,7 +594,7 @@
%files guest
-/%{_lib}/security/pam_vbox.so
+%{_libdir}/security/pam_vbox.so
%{_sbindir}/mount.vboxsf
%{_bindir}/VBoxClient
%{_bindir}/VBoxControl
@@ -605,8 +605,8 @@
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
#%{_sysconfdir}/xdg/autostart/vboxclient.desktop
%exclude %{_datadir}/gdm
-%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
-%config %{_sysconfdir}/modules-load.d/%{name}-guest.conf
+%{_prefix}/lib/udev/rules.d/60-vboxguest.rules
+%{_prefix}/lib/modules-load.d/%{name}-guest.conf
#doc COPYING
%{_unitdir}/vboxservice.service
@@ -616,6 +616,21 @@
%changelog
+* Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-2
+- Moved files from /etc/modules-load.d/ to /usr/lib/modules-load.d/, fix rfbz #3469 .
+- Also moved files from /etc/udev/rules.d/ to /usr/lib/udev/rules.d/ and removed %config directive .
+- s/$RPM_BUILD_ROOT/%{buildroot}/g
+- Added %{_prefix} to /lib/udev/ .
+- Moved pam_vbox.so from %{_lib}/security/ to %{_libdir}/security/ .
+
+* Sun Nov 23 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-1
+- New upstream release .
+
+* Sat Oct 11 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.18-1
+- New upstream release .
+- Removed trailing whitespaces .
+- Refactor VirtualBox-4.3.0-VBoxGuestLib.patch to try upstreaming .
+
* Wed Sep 10 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.16-1
- New upstream release .
- Fixed VirtualBox-4.3.0-VBoxGuestLib.patch .
@@ -651,7 +666,7 @@
- small adjustments in others patches.
* Wed Dec 25 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6-4
-- Update VirtualBox-4.3-mesa.patch, for guest drives and for Xorg-x11-server-1.14.99 in rawhide, glx internals "fixes" completely removed, eliminating BuildRequires of xorg-x11-server-source.
+- Update VirtualBox-4.3-mesa.patch, for guest drives and for Xorg-x11-server-1.14.99 in rawhide, glx internals "fixes" completely removed, eliminating BuildRequires of xorg-x11-server-source.
Also add to VBoxOGL_LIBS libXcomposite, libXdamage etc of the system.
- Disable webservice for rawhide, problems reported upstream with new gsoap version.
@@ -674,30 +689,30 @@
* Mon Oct 28 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.0-1
- New upstream release.
-- Refactor patches VirtualBox-4.3.0-32bit.patch, VirtualBox-4.3.0-libcxx.patch, VirtualBox-4.3.0-mesa.patch,
+- Refactor patches VirtualBox-4.3.0-32bit.patch, VirtualBox-4.3.0-libcxx.patch, VirtualBox-4.3.0-mesa.patch,
VirtualBox-4.3.0-no-bundles.patch, VirtualBox-4.3.0-testmangle.patch and VirtualBox-4.3.0-VBoxGuestLib.patch
- Took the opportunity to do a review: add some new binaries, need to review it again .
* Sun Sep 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-2
-- Additions/linux: fix shared folders for Linux 3.11
+- Additions/linux: fix shared folders for Linux 3.11
* Fri Sep 20 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-1
- New upstream release.
* Sun Sep 01 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.16-2
-- fixes for Kernel 3.11:
+- fixes for Kernel 3.11:
https://www.virtualbox.org/changeset/47484/vbox/trunk
and
- https://www.virtualbox.org/changeset/47588/vbox/trunk
+ https://www.virtualbox.org/changeset/47588/vbox/trunk
* Fri Jul 05 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.16-1
- New upstream release.
* Sun Jun 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.14-2
-- Bugfix, forgot rename *.modules to *.conf, as defined in modules-load.d(5) .
+- Bugfix, forgot rename *.modules to *.conf, as defined in modules-load.d(5) .
* Sat Jun 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.14-1
-- Change strings instructions to load modules.
+- Change strings instructions to load modules.
- New upstream release.
- Drop gcc-4.8 patch.
@@ -717,7 +732,7 @@
* Thu Mar 07 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.8-2
- Added upstreamed patch for kernels 3.9, "That fix will be part of the next maintenance
- release".
+ release".
* Sat Mar 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.8-1
- New upstream release.
@@ -760,7 +775,7 @@
* Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
-- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588,
+- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588,
https://www.virtualbox.org/changeset/43588/vbox , allow compile vboxvideo with system headers, and
"As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not build it".
- enable-webservice on F17 and lower (stables) and disable-docs on F18 and rawhide, can't buid it
@@ -770,8 +785,8 @@
- On F16, need add one xorg header for xorg-x11-server 1.11.x
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
-- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
-VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
+- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
+VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
* Sat Sep 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2
- Disable websrv because fails to build on rawhide, temporarily I hope.
@@ -779,18 +794,18 @@
* Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-1
- 4.2.0 released
- Rebase and rework VirtualBox-4.2.0-xorg17.patch, add 2 new Definitions: XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000
-- Rename and rework VirtualBox-OSE-4.1.10-mesa.patch
+- Rename and rework VirtualBox-OSE-4.1.10-mesa.patch
- Reorganize last 2 patches.
- Revert attempt to remove 32-bits patch.
-* Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.7.RC4
+* Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.7.RC4
- Another try to compile with 32-bits suport on x86_64.
* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.6.RC4
-- Update to RC4.
+- Update to RC4.
- Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch
- Drop patch23 to fix ABI/API breakages in X11 1.13, appears fixed in RC4 !
-- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp.
+- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp.
- Removes X11 includes from sources (src/VBox/Additions/x11/x11include).
* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.5.RC3
@@ -808,7 +823,7 @@
- add BR # libstdc++.i686 and libc-devel.i686 for 32-bits
BuildRequires: /usr/lib/libc.so
BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6
-- drop 32-bit patch and testmangle patch, no fails.
+- drop 32-bit patch and testmangle patch, no fails.
- rename and remove some patches
cvs diff: VirtualBox-4.1.20-libcxx.patch was removed, no comparison available
cvs diff: VirtualBox-4.1.20-x113.patch is a new entry, no comparison available
@@ -858,8 +873,8 @@
* Tue May 22 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.16-1
- New upstream release.
-* Mon May 21 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-7
-- Customize VBOX_VERSION_STRING.
+* Mon May 21 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-7
+- Customize VBOX_VERSION_STRING.
* Wed May 16 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-6
- Bump a release, to build a new tag, one more try.
@@ -871,15 +886,15 @@
- Rename to VirtualBox, rfbz #1826
* Tue May 1 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-3
-- Review spec with fedora-review
+- Review spec with fedora-review
- Remove requirement for hal for F15
- .desktop, .service and xorg.conf.d/vboxvideo.conf are text files, put chmod 644
- don't try start vboxservice.service, because vboxservice.service depends on kmods, maybe start when
- modules are loaded.
+ modules are loaded.
* Sun Apr 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-2
-- Migrating vboxweb-service to a systemd unit file from a SysV initscript
-- Add vboxservice.service systemd unit file in guest package, rfbz #2274.
+- Migrating vboxweb-service to a systemd unit file from a SysV initscript
+- Add vboxservice.service systemd unit file in guest package, rfbz #2274.
* Thu Apr 26 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-1
- new release
@@ -903,7 +918,7 @@
- Upsteam says that java stuff is fiexd , https://www.virtualbox.org/ticket/9848#comment:5
- Upsteam says that have compile fixes for kernel 3.3-rc1 (in changelog).
- backport fix for web-service with newer versions of GSOAP, Changeset 40476 and 40477 in vbox, kindly
- fixed from Frank Mehnert "The real fix can be found in r40476 and r40477. You should be able to
+ fixed from Frank Mehnert "The real fix can be found in r40476 and r40477. You should be able to
apply these fixes to VBox 4.1.10 as well." and add -lssl and -lcrypto by my self.
- drop Patch to allow to build with GCC 4.7
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources 18 Sep 2014 22:22:56 -0000 1.54
+++ sources 25 Dec 2014 02:25:22 -0000 1.55
@@ -1 +1 @@
-16f8f3e5fea2677da7456bc8b6aff458 VirtualBox-4.3.16.tar.bz2
+cf3f25644aa0fae1029e8b362bd4375e VirtualBox-4.3.20.tar.bz2
9 years, 4 months
rpms/wl-kmod/F-20 wl-kmod.spec,1.138,1.139
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6875
Modified Files:
wl-kmod.spec
Log Message:
Rebuilt for kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-20/wl-kmod.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- wl-kmod.spec 18 Dec 2014 19:33:36 -0000 1.138
+++ wl-kmod.spec 24 Dec 2014 08:20:33 -0000 1.139
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.248
-Release: 4%{?dist}.6
+Release: 4%{?dist}.7
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -94,6 +94,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Dec 24 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-4.7
+- Rebuilt for kernel
+
* Thu Dec 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-4.6
- Rebuilt for kernel
9 years, 4 months
rpms/mpv/devel mpv-old-waf.patch,1.1,1.2 mpv.spec,1.35,1.36
by Miro Hrončok
Author: churchyard
Update of /cvs/free/rpms/mpv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11245
Modified Files:
mpv-old-waf.patch mpv.spec
Log Message:
* Mon Dec 22 2014 Miro Hrončok <mhroncok(a)redhat.com> - 0.7.1-3
- Slightly change the waf patch
mpv-old-waf.patch:
bootstrap.py | 6 ++----
waftools/generators/headers.py | 2 +-
waftools/waf_customizations.py | 9 +++++++++
wscript | 2 +-
4 files changed, 13 insertions(+), 6 deletions(-)
Index: mpv-old-waf.patch
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/mpv-old-waf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mpv-old-waf.patch 22 Dec 2014 15:32:56 -0000 1.1
+++ mpv-old-waf.patch 22 Dec 2014 16:01:41 -0000 1.2
@@ -35,10 +35,10 @@
node.parent.mkdir()
node.write(src)
diff --git a/waftools/waf_customizations.py b/waftools/waf_customizations.py
-index 8163c9f..a02bc95 100644
+index 8163c9f..029ad8d 100644
--- a/waftools/waf_customizations.py
+++ b/waftools/waf_customizations.py
-@@ -34,6 +34,21 @@ def build(ctx):
+@@ -34,6 +34,15 @@ def build(ctx):
cls = Task.classes['cprogram']
class cprogram(cls):
run_str = cls.hcode + '${LAST_LINKFLAGS}'
@@ -51,12 +51,6 @@
+ def __str__(self):
+ tgt_str = ' '.join([a.nice_path() for a in self.outputs])
+ return 'linking -> {0}\n'.format(tgt_str)
-+
-+ cls = Task.classes['compile_sym']
-+ class compile_sym(cls):
-+ def __str__(self):
-+ tgt_str = ' '.join([a.nice_path() for a in self.outputs])
-+ return 'compile_sym -> {0}\n'.format(tgt_str)
cls = Task.classes['macplist']
class macplist(cls):
Index: mpv.spec
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/mpv.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mpv.spec 22 Dec 2014 15:32:56 -0000 1.35
+++ mpv.spec 22 Dec 2014 16:01:41 -0000 1.36
@@ -1,6 +1,6 @@
Name: mpv
Version: 0.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+
URL: http://%{name}.io/
@@ -117,6 +117,9 @@
%config(noreplace) %{_sysconfdir}/%{name}/input.conf
%changelog
+* Mon Dec 22 2014 Miro Hrončok <mhroncok(a)redhat.com> - 0.7.1-3
+- Slightly change the waf patch
+
* Mon Dec 22 2014 Miro Hrončok <mhroncok(a)redhat.com> - 0.7.1-2
- Add patch to allow waf 1.7
9 years, 4 months
rpms/mpv/devel mpv-old-waf.patch,NONE,1.1 mpv.spec,1.34,1.35
by Miro Hrončok
Author: churchyard
Update of /cvs/free/rpms/mpv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10622
Modified Files:
mpv.spec
Added Files:
mpv-old-waf.patch
Log Message:
* Mon Dec 22 2014 Miro Hrončok <mhroncok(a)redhat.com> - 0.7.1-2
- Add patch to allow waf 1.7
mpv-old-waf.patch:
bootstrap.py | 6 ++----
waftools/generators/headers.py | 2 +-
waftools/waf_customizations.py | 15 +++++++++++++++
wscript | 2 +-
4 files changed, 19 insertions(+), 6 deletions(-)
--- NEW FILE mpv-old-waf.patch ---
diff --git a/bootstrap.py b/bootstrap.py
index f354d5f..ce388ff 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -5,9 +5,9 @@
from __future__ import print_function
import os, sys, stat, hashlib, subprocess
-WAFRELEASE = "waf-1.8.1"
+WAFRELEASE = "waf-1.7.16"
WAFURL = "http://ftp.waf.io/pub/release/" + WAFRELEASE
-SHA256HASH = "ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d"
+SHA256HASH = "b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61"
if os.path.exists("waf"):
wafver = subprocess.check_output(['./waf', '--version']).decode()
@@ -31,8 +31,6 @@ if SHA256HASH == hashlib.sha256(waf).hexdigest():
print("Checksum verified.")
else:
print("The checksum of the downloaded file does not match!")
- print(" - got: {}".format(hashlib.sha256(waf).hexdigest()))
- print(" - expected: {}".format(SHA256HASH))
print("Please download and verify the file manually.")
sys.exit(1)
diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py
index 79bd71d..bd28bef 100644
--- a/waftools/generators/headers.py
+++ b/waftools/generators/headers.py
@@ -1,5 +1,5 @@
def __cp_to_variant__(ctx, variant, basename):
- src = ctx.bldnode.search_node(basename).read()
+ src = ctx.bldnode.search(basename).read()
node = ctx.bldnode.make_node("{0}/{1}".format(variant, basename))
node.parent.mkdir()
node.write(src)
diff --git a/waftools/waf_customizations.py b/waftools/waf_customizations.py
index 8163c9f..a02bc95 100644
--- a/waftools/waf_customizations.py
+++ b/waftools/waf_customizations.py
@@ -34,6 +34,21 @@ def build(ctx):
cls = Task.classes['cprogram']
class cprogram(cls):
run_str = cls.hcode + '${LAST_LINKFLAGS}'
+ def __str__(self):
+ tgt_str = ' '.join([a.nice_path() for a in self.outputs])
+ return 'linking -> {0}\n'.format(tgt_str)
+
+ cls = Task.classes['cshlib']
+ class cshlib(cls):
+ def __str__(self):
+ tgt_str = ' '.join([a.nice_path() for a in self.outputs])
+ return 'linking -> {0}\n'.format(tgt_str)
+
+ cls = Task.classes['compile_sym']
+ class compile_sym(cls):
+ def __str__(self):
+ tgt_str = ' '.join([a.nice_path() for a in self.outputs])
+ return 'compile_sym -> {0}\n'.format(tgt_str)
cls = Task.classes['macplist']
class macplist(cls):
diff --git a/wscript b/wscript
index 7e82038..aa041c4 100644
--- a/wscript
+++ b/wscript
@@ -848,7 +848,7 @@ def is_debug_build(ctx):
def configure(ctx):
ctx.resetenv(ctx.options.variant)
- ctx.check_waf_version(mini='1.8.1')
+ ctx.check_waf_version(mini='1.7.15')
target = os.environ.get('TARGET')
(cc, pkg_config, ar, windres) = ('cc', 'pkg-config', 'ar', 'windres')
Index: mpv.spec
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/mpv.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mpv.spec 13 Dec 2014 16:56:51 -0000 1.34
+++ mpv.spec 22 Dec 2014 15:32:56 -0000 1.35
@@ -1,6 +1,6 @@
Name: mpv
Version: 0.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+
URL: http://%{name}.io/
@@ -9,6 +9,10 @@
# set defaults for Fedora
Patch0: %{name}-config.patch
+# Upstream commit to use waf >= 1.8 (reverted, rebased)
+# See https://github.com/mpv-player/mpv/issues/1363
+Patch1: %{name}-old-waf.patch
+
BuildRequires: aalib-devel
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
@@ -53,6 +57,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
CCFLAGS="%{optflags}" \
@@ -112,6 +117,9 @@
%config(noreplace) %{_sysconfdir}/%{name}/input.conf
%changelog
+* Mon Dec 22 2014 Miro Hrončok <mhroncok(a)redhat.com> - 0.7.1-2
+- Add patch to allow waf 1.7
+
* Sat Dec 13 2014 Miro Hrončok <mhroncok(a)redhat.com> - 0.7.1-1
- New version 0.7.1
- Rebuilt new lirc (#3450)
9 years, 4 months
rpms/kdenlive/F-20 .cvsignore, 1.15, 1.16 kdenlive.spec, 1.24, 1.25 sources, 1.15, 1.16
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/kdenlive/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9968
Modified Files:
.cvsignore kdenlive.spec sources
Log Message:
* Mon Dec 22 2014 Rex Dieter <rdieter(a)fedoraproject.org> 0.9.10-1
- 0.9.10
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-20/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 24 Oct 2014 15:56:18 -0000 1.15
+++ .cvsignore 22 Dec 2014 15:09:05 -0000 1.16
@@ -1 +1 @@
-kdenlive-0.9.8.tar.bz2
+kdenlive-0.9.10.tar.bz2
Index: kdenlive.spec
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-20/kdenlive.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kdenlive.spec 24 Oct 2014 15:56:18 -0000 1.24
+++ kdenlive.spec 22 Dec 2014 15:09:05 -0000 1.25
@@ -1,7 +1,7 @@
Name: kdenlive
-Version: 0.9.8
-Release: 2%{?dist}
+Version: 0.9.10
+Release: 1%{?dist}
Summary: Non-linear video editor
License: GPLv2+
URL: http://www.kdenlive.org
@@ -35,9 +35,6 @@
sed -i 's|/bin/melt|/bin/mlt-melt|' src/mainwindow.cpp
sed -i 's|findExe("melt")|findExe("mlt-melt")|' src/mainwindow.cpp
-# make palletable for %%doc later
-cp -a effects/README README.effects
-
%build
mkdir -p %{_target_platform}
@@ -79,7 +76,7 @@
%files -f %{name}.lang
-%doc AUTHORS COPYING README*
+%doc AUTHORS COPYING README
%{_kde4_bindir}/*
%{_kde4_datadir}/applications/kde4/%{name}.desktop
%{_kde4_libdir}/kde4/*.so
@@ -97,6 +94,9 @@
%changelog
+* Mon Dec 22 2014 Rex Dieter <rdieter(a)fedoraproject.org> 0.9.10-1
+- 0.9.10
+
* Wed Aug 06 2014 Rex Dieter <rdieter(a)fedoraproject.org> 0.9.8-2
- optimize mime scriptlets
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-20/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 24 Oct 2014 15:56:18 -0000 1.15
+++ sources 22 Dec 2014 15:09:05 -0000 1.16
@@ -1 +1 @@
-589801ff79c5819936141abe7e4f44fc kdenlive-0.9.8.tar.bz2
+40d7ee8e388cb084f5eb1ad1596a14b2 kdenlive-0.9.10.tar.bz2
9 years, 4 months
rpms/kdenlive/devel .cvsignore, 1.15, 1.16 kdenlive.spec, 1.25, 1.26 sources, 1.15, 1.16
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/kdenlive/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9827
Modified Files:
.cvsignore kdenlive.spec sources
Log Message:
* Mon Dec 22 2014 Rex Dieter <rdieter(a)fedoraproject.org> 0.9.10-1
- 0.9.10
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kdenlive/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 14 May 2014 16:04:28 -0000 1.15
+++ .cvsignore 22 Dec 2014 15:08:17 -0000 1.16
@@ -1 +1 @@
-kdenlive-0.9.8.tar.bz2
+kdenlive-0.9.10.tar.bz2
Index: kdenlive.spec
===================================================================
RCS file: /cvs/free/rpms/kdenlive/devel/kdenlive.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kdenlive.spec 6 Aug 2014 18:59:52 -0000 1.25
+++ kdenlive.spec 22 Dec 2014 15:08:18 -0000 1.26
@@ -1,7 +1,7 @@
Name: kdenlive
-Version: 0.9.8
-Release: 2%{?dist}
+Version: 0.9.10
+Release: 1%{?dist}
Summary: Non-linear video editor
License: GPLv2+
URL: http://www.kdenlive.org
@@ -35,9 +35,6 @@
sed -i 's|/bin/melt|/bin/mlt-melt|' src/mainwindow.cpp
sed -i 's|findExe("melt")|findExe("mlt-melt")|' src/mainwindow.cpp
-# make palletable for %%doc later
-cp -a effects/README README.effects
-
%build
mkdir -p %{_target_platform}
@@ -79,7 +76,7 @@
%files -f %{name}.lang
-%doc AUTHORS COPYING README*
+%doc AUTHORS COPYING README
%{_kde4_bindir}/*
%{_kde4_datadir}/applications/kde4/%{name}.desktop
%{_kde4_libdir}/kde4/*.so
@@ -97,6 +94,9 @@
%changelog
+* Mon Dec 22 2014 Rex Dieter <rdieter(a)fedoraproject.org> 0.9.10-1
+- 0.9.10
+
* Wed Aug 06 2014 Rex Dieter <rdieter(a)fedoraproject.org> 0.9.8-2
- optimize mime scriptlets
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kdenlive/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 14 May 2014 16:04:29 -0000 1.15
+++ sources 22 Dec 2014 15:08:18 -0000 1.16
@@ -1 +1 @@
-589801ff79c5819936141abe7e4f44fc kdenlive-0.9.8.tar.bz2
+40d7ee8e388cb084f5eb1ad1596a14b2 kdenlive-0.9.10.tar.bz2
9 years, 4 months
rpms/x264/devel .cvsignore,1.36,1.37 sources,1.36,1.37
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8925
Modified Files:
.cvsignore sources
Log Message:
forgot upload sources
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore 15 Sep 2014 01:35:16 -0000 1.36
+++ .cvsignore 22 Dec 2014 14:28:05 -0000 1.37
@@ -1 +1 @@
-x264-0.142-20140826-021c0dc.tar.bz2
+x264-0.142-20141221-6a301b6.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources 15 Sep 2014 01:35:16 -0000 1.36
+++ sources 22 Dec 2014 14:28:05 -0000 1.37
@@ -1 +1 @@
-b8bea981f9b01bf5e77b3f8ebf9e7fca x264-0.142-20140826-021c0dc.tar.bz2
+f6c0d02ee82bd4e625ac2e5ca7a34392 x264-0.142-20141221-6a301b6.tar.bz2
9 years, 4 months
rpms/x264/devel x264.spec,1.76,1.77
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30610
Modified Files:
x264.spec
Log Message:
* Mon Dec 22 2014 Sérgio Basto <sergio(a)serjux.com> - 0.142-11.20141221git6a301b6
- Update to x264-0.142 to git 6a301b6
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- x264.spec 19 Oct 2014 21:26:10 -0000 1.76
+++ x264.spec 22 Dec 2014 03:17:27 -0000 1.77
@@ -1,6 +1,7 @@
+# globals for x264-0.142-20141221-6a301b6.tar.bz2
%global api 142
-%global gitdate 20140826
-%global gitversion 021c0dc
+%global gitdate 20141221
+%global gitversion 6a301b6
%global snapshot %{gitdate}-%{gitversion}
%global gver .%{gitdate}git%{gitversion}
%global branch stable
@@ -24,7 +25,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 10%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 11%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -189,6 +190,9 @@
%{_libdir}/libx26410b.so
%changelog
+* Mon Dec 22 2014 Sérgio Basto <sergio(a)serjux.com> - 0.142-11.20141221git6a301b6
+- Update to x264-0.142 to git 6a301b6
+
* Sun Oct 19 2014 Sérgio Basto <sergio(a)serjux.com> - 0.142-10.20140826git021c0dc
- Rebuilt for FFmpeg 2.4.3
9 years, 4 months
rpms/VirtualBox/F-20 VirtualBox.spec,1.64,1.65
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12957
Modified Files:
VirtualBox.spec
Log Message:
* Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-2
- Moved files from /etc/modules-load.d/ to /usr/lib/modules-load.d/, fix rfbz #3469 .
- Also moved files from /etc/udev/rules.d/ to /usr/lib/udev/rules.d/ and removed %config directive .
- s/$RPM_BUILD_ROOT/%{buildroot}/g
- Added %{_prefix} to /lib/udev/ .
- Moved pam_vbox.so from %{_lib}/security/ to %{_libdir}/security/ .
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- VirtualBox.spec 23 Nov 2014 03:33:44 -0000 1.64
+++ VirtualBox.spec 22 Dec 2014 01:44:03 -0000 1.65
@@ -27,7 +27,7 @@
Name: VirtualBox
Version: 4.3.20
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -272,57 +272,55 @@
# the commercially supported version to minimize confusion
# Directory structure
-install -d $RPM_BUILD_ROOT/%{_lib}/security
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_sbindir}
-install -d $RPM_BUILD_ROOT%{_libdir}
-install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox
-install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/components
-install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls
-install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/ExtensionPacks
-install -d $RPM_BUILD_ROOT%{_libdir}/dri
-install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk
-install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
-install -d $RPM_BUILD_ROOT%{_datadir}/icons
-install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-kmod-%{version}
-install -d $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
+install -d %{buildroot}%{_bindir}
+install -d %{buildroot}%{_sbindir}
+install -d %{buildroot}%{_libdir}
+install -d %{buildroot}%{_libdir}/virtualbox
+install -d %{buildroot}%{_libdir}/virtualbox/components
+install -d %{buildroot}%{_libdir}/virtualbox/nls
+install -d %{buildroot}%{_libdir}/virtualbox/ExtensionPacks
+install -d %{buildroot}%{_libdir}/virtualbox/sdk
+install -d %{buildroot}%{_datadir}/pixmaps
+install -d %{buildroot}%{_datadir}/mime/packages
+install -d %{buildroot}%{_datadir}/icons
+install -d %{buildroot}%{_prefix}/src/%{name}-kmod-%{version}
+install -d %{buildroot}%{python_sitelib}/virtualbox
# Binaries and Wrapper with Launchers
-install -p -m 0755 obj/bin/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBox
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/virtualbox
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxManage
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxmanage
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxsdl
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxVRDP
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
+install -p -m 0755 obj/bin/VBox.sh %{buildroot}%{_bindir}/VBox
+ln -s VBox %{buildroot}%{_bindir}/VirtualBox
+ln -s VBox %{buildroot}%{_bindir}/virtualbox
+ln -s VBox %{buildroot}%{_bindir}/VBoxManage
+ln -s VBox %{buildroot}%{_bindir}/vboxmanage
+ln -s VBox %{buildroot}%{_bindir}/VBoxSDL
+ln -s VBox %{buildroot}%{_bindir}/vboxsdl
+ln -s VBox %{buildroot}%{_bindir}/VBoxVRDP
+ln -s VBox %{buildroot}%{_bindir}/VBoxHeadless
+ln -s VBox %{buildroot}%{_bindir}/vboxheadless
+ln -s VBox %{buildroot}%{_bindir}/VBoxBalloonCtrl
+ln -s VBox %{buildroot}%{_bindir}/vboxballoonctrl
%if %{enable_webservice}
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+ln -s VBox %{buildroot}%{_bindir}/vboxwebsrv
%endif
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
+install -p -m 0755 -t %{buildroot}%{_bindir} \
obj/bin/VBoxTunctl
# Components
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/components \
+install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/components \
obj/bin/components/*
# Lib
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
+install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/*.so
-install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
+install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/V*.gc \
obj/bin/V*.r0 \
obj/bin/VBoxEFI*.fd
# Executables
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
+install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/SUPInstall \
obj/bin/SUPLoggerCtl \
obj/bin/SUPUninstall \
@@ -349,33 +347,33 @@
obj/bin/webtest \
%endif
-install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh
+install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh %{buildroot}%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
# Language files
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
+install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/nls \
obj/bin/nls/*
# SDK
pushd obj/bin/sdk/installer
VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
- python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT
+ python vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
popd
-cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk
-rm -rf $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk/installer
+cp -rp obj/bin/sdk/. %{buildroot}%{_libdir}/virtualbox/sdk
+rm -rf %{buildroot}%{_libdir}/virtualbox/sdk/installer
# Icons
-install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
+install -p -m 0644 -t %{buildroot}%{_datadir}/pixmaps \
obj/bin/VBox.png
for S in obj/bin/icons/*
do
SIZE=$(basename $S)
- install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps}
- install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes
- [ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png
+ install -d %{buildroot}%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps}
+ install -p -m 0644 $S/* %{buildroot}%{_datadir}/icons/hicolor/$SIZE/mimetypes
+ [ -f %{buildroot}%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \
+ %{buildroot}%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \
+ %{buildroot}%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png
done
-install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
+install -p -m 0644 obj/bin/virtualbox.xml %{buildroot}%{_datadir}/mime/packages
# Guest X.Org drivers
# Michael Thayer from Oracle wrote: I have applied the patch [1] I posted so that you
@@ -390,67 +388,69 @@
# [1] https://www.virtualbox.org/changeset/43588/vbox
install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+ %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
# Guest tools
-install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \
+install -m 0755 -t %{buildroot}%{_sbindir} \
obj/bin/additions/mount.vboxsf
-install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
+install -m 0755 -t %{buildroot}%{_bindir} \
obj/bin/additions/VBoxService \
obj/bin/additions/VBoxClient \
obj/bin/additions/VBoxControl
%if %{enable_webservice}
install -m 0644 -D %{SOURCE10} \
- $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service
+ %{buildroot}%{_unitdir}/vboxweb.service
%endif
install -m 0644 -D %{SOURCE11} \
- $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service
+ %{buildroot}%{_unitdir}/vboxservice.service
#review this 3
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
- $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
+ %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
#/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
-#desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+# %{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+#desktop-file-validate %{buildroot}%{_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%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
+ %{buildroot}%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
+desktop-file-validate %{buildroot}%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
# Guest libraries
-install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \
+install -d %{buildroot}%{_libdir}/dri
+install -m 0755 -t %{buildroot}%{_libdir} \
obj/bin/additions/VBoxOGL*.so
-ln -sf ../VBoxOGL.so $RPM_BUILD_ROOT%{_libdir}/dri/vboxvideo_dri.so
+ln -sf ../VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
-install -m 0755 -t $RPM_BUILD_ROOT/%{_lib}/security \
+install -d %{buildroot}%{_libdir}/security
+install -m 0755 -t %{buildroot}%{_libdir}/security \
obj/bin/additions/pam_vbox.so
# Installation root configuration
-install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
-echo 'INSTALL_DIR=%{_libdir}/virtualbox' > $RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
+install -d %{buildroot}%{_sysconfdir}/vbox
+echo 'INSTALL_DIR=%{_libdir}/virtualbox' > %{buildroot}%{_sysconfdir}/vbox/vbox.cfg
# Install udev rules
-install -p -m 0644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
-install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxguest.rules
+install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/udev/rules.d/90-vboxdrv.rules
+install -p -m 0644 -D %{SOURCE5} %{buildroot}%{_prefix}/lib/udev/rules.d/60-vboxguest.rules
# Install modules load script
-install -p -m 0644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}.conf
-install -p -m 0644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}-guest.conf
+install -p -m 0644 -D %{SOURCE6} %{buildroot}%{_prefix}/lib/modules-load.d/%{name}.conf
+install -p -m 0644 -D %{SOURCE7} %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
# Module Source Code
mkdir -p %{name}-kmod-%{version}
cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version}
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}
-tar --use-compress-program xz -cf $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \
+install -d %{buildroot}%{_datadir}/%{name}-kmod-%{version}
+tar --use-compress-program xz -cf %{buildroot}%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \
%{name}-kmod-%{version}
# Menu entry
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
--remove-key=DocPath --remove-category=X-MandrivaLinux-System \
--vendor='' obj/bin/virtualbox.desktop
@@ -571,8 +571,8 @@
%{_datadir}/applications/*.desktop
%dir %{_sysconfdir}/vbox
%config %{_sysconfdir}/vbox/vbox.cfg
-%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
-%config %{_sysconfdir}/modules-load.d/%{name}.conf
+%{_prefix}/lib/udev/rules.d/90-vboxdrv.rules
+%{_prefix}/lib/modules-load.d/%{name}.conf
%doc COPYING*
%doc doc/*.*
%if %{enable_docs}
@@ -581,7 +581,7 @@
%if %{enable_webservice}
%{_unitdir}/vboxweb.service
%endif
-/lib/udev/VBoxCreateUSBNode.sh
+%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
%files devel
@@ -594,7 +594,7 @@
%files guest
-/%{_lib}/security/pam_vbox.so
+%{_libdir}/security/pam_vbox.so
%{_sbindir}/mount.vboxsf
%{_bindir}/VBoxClient
%{_bindir}/VBoxControl
@@ -605,8 +605,8 @@
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
#%{_sysconfdir}/xdg/autostart/vboxclient.desktop
%exclude %{_datadir}/gdm
-%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
-%config %{_sysconfdir}/modules-load.d/%{name}-guest.conf
+%{_prefix}/lib/udev/rules.d/60-vboxguest.rules
+%{_prefix}/lib/modules-load.d/%{name}-guest.conf
#doc COPYING
%{_unitdir}/vboxservice.service
@@ -616,6 +616,13 @@
%changelog
+* Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-2
+- Moved files from /etc/modules-load.d/ to /usr/lib/modules-load.d/, fix rfbz #3469 .
+- Also moved files from /etc/udev/rules.d/ to /usr/lib/udev/rules.d/ and removed %config directive .
+- s/$RPM_BUILD_ROOT/%{buildroot}/g
+- Added %{_prefix} to /lib/udev/ .
+- Moved pam_vbox.so from %{_lib}/security/ to %{_libdir}/security/ .
+
* Sun Nov 23 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-1
- New upstream release .
9 years, 4 months
rpms/VirtualBox-kmod/devel VirtualBox-kmod.spec,1.40,1.41
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11118
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-2.3
- s/$RPM_BUILD_ROOT/%{buildroot}/g.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/devel/VirtualBox-kmod.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- VirtualBox-kmod.spec 19 Dec 2014 20:19:08 -0000 1.40
+++ VirtualBox-kmod.spec 21 Dec 2014 22:03:06 -0000 1.41
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.3.20
-Release: 2%{?prerel:.%{prerel}}%{?dist}.2
+Release: 2%{?prerel:.%{prerel}}%{?dist}.3
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -83,8 +83,8 @@
%install
for kernel_version in %{?kernel_versions}; do
- install -d ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
- install _kmod_build_${kernel_version%%___*}/*/*.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
+ install -d %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
+ install _kmod_build_${kernel_version%%___*}/*/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
done
%{?akmod_install}
@@ -92,12 +92,15 @@
%check
# If we built modules, check if it was everything the kmodsrc package provided
-MODS=$(find $(ls -d $RPM_BUILD_ROOT%{_prefix}/lib/modules/* |head -n1) -name '*.ko' -exec basename '{}' \; |wc -l)
+MODS=$(find $(ls -d %{buildroot}%{_prefix}/lib/modules/* |head -n1) -name '*.ko' -exec basename '{}' \; |wc -l)
DIRS=$(ls %{name}-%{version} |wc -l)
[ $MODS = $DIRS ] || [ $MODS = 0 ]
%changelog
+* Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-2.3
+- s/$RPM_BUILD_ROOT/%{buildroot}/g.
+
* Fri Dec 19 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.20-2.2
- Rebuilt for kernel
9 years, 4 months