rpms/rpmfusion-free-package-config-smart/devel rpmfusion-free-package-config-smart.spec, 1.6, 1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/rpmfusion-free-package-config-smart/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25292/devel
Modified Files:
rpmfusion-free-package-config-smart.spec
Log Message:
Update for F-18
Add secondary-arches support
Index: rpmfusion-free-package-config-smart.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-package-config-smart/devel/rpmfusion-free-package-config-smart.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpmfusion-free-package-config-smart.spec 1 May 2012 20:03:23 -0000 1.6
+++ rpmfusion-free-package-config-smart.spec 7 Sep 2012 20:49:47 -0000 1.7
@@ -1,36 +1,48 @@
-%define debug_package %{nil}
+%global debug_package %{nil}
+
+%global basearch %{_target_cpu}
%ifarch %{ix86}
-%define basearch i386
+%global basearch i386
+%endif
+
+%ifarch %{arm}
+%ifarch armv7hl armv7hnl
+%global basearch armhfp
%else
-%define basearch %{_target_cpu}
+%global basearch arm
%endif
+%endif
+
+%global repo free
-Summary: RPM Fusion (free) configuration files for the Smart package manager
+Summary: RPM Fusion (%{repo}) configuration files for the Smart package manager
Name: rpmfusion-free-package-config-smart
-Version: 17
+Version: 18
Release: 1
License: GPLv2+
Group: System Environment/Base
URL: http://rpmfusion.org/
Source0: COPYING
-Source1: rpmfusion-free.channel
-Source2: rpmfusion-free-rawhide.channel
-Source3: rpmfusion-free-updates.channel
-Source4: rpmfusion-free-updates-testing.channel
+Source1: rpmfusion-%{repo}.channel
+Source2: rpmfusion-%{repo}-rawhide.channel
+Source3: rpmfusion-%{repo}-updates.channel
+Source4: rpmfusion-%{repo}-updates-testing.channel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: smart
-Provides: smart-config-rpmfusion-free = %{version}-%{release}
+Provides: smart-config-rpmfusion-%{repo} = %{version}-%{release}
+%if %repo == "nonfree"
+Requires: rpmfusion-free-package-config-smart >= %{version}
+%endif
%description
This package provides the configuration files required by the Smart package
-manager to use RPM Fusion's "free" software repository.
+manager to use RPM Fusion's "%{repo}" software repository.
%prep
%setup -cT
cp %{SOURCE0} .
-sleep 3m
%build
@@ -43,6 +55,10 @@
install -p -m0644 $channel $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
sed -i 's/\$basearch/%{basearch}/' $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
sed -i 's/\$releasever/%{fedora}/' $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
+%ifnarch %{ix86} x86_64
+ #Fedora secondary
+ sed -i 's/free\/fedora\//free\/fedora-secondary\//' $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
+%endif
done
%clean
@@ -54,6 +70,12 @@
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel
%changelog
+* Fri Sep 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 18-1
+- Update for F-18
+
+* Fri Sep 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-2
+- Add support for secondary-arches
+
* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-1
- Update for F-17
11 years, 8 months
rpms/rpmfusion-free-package-config-smart/F-17 rpmfusion-free-package-config-smart.spec, 1.6, 1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/rpmfusion-free-package-config-smart/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25292/F-17
Modified Files:
rpmfusion-free-package-config-smart.spec
Log Message:
Update for F-18
Add secondary-arches support
Index: rpmfusion-free-package-config-smart.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-package-config-smart/F-17/rpmfusion-free-package-config-smart.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpmfusion-free-package-config-smart.spec 1 May 2012 20:03:23 -0000 1.6
+++ rpmfusion-free-package-config-smart.spec 7 Sep 2012 20:49:47 -0000 1.7
@@ -1,36 +1,48 @@
-%define debug_package %{nil}
+%global debug_package %{nil}
+
+%global basearch %{_target_cpu}
%ifarch %{ix86}
-%define basearch i386
+%global basearch i386
+%endif
+
+%ifarch %{arm}
+%ifarch armv7hl armv7hnl
+%global basearch armhfp
%else
-%define basearch %{_target_cpu}
+%global basearch arm
+%endif
%endif
-Summary: RPM Fusion (free) configuration files for the Smart package manager
+%global repo free
+
+Summary: RPM Fusion (%{repo}) configuration files for the Smart package manager
Name: rpmfusion-free-package-config-smart
Version: 17
-Release: 1
+Release: 2
License: GPLv2+
Group: System Environment/Base
URL: http://rpmfusion.org/
Source0: COPYING
-Source1: rpmfusion-free.channel
-Source2: rpmfusion-free-rawhide.channel
-Source3: rpmfusion-free-updates.channel
-Source4: rpmfusion-free-updates-testing.channel
+Source1: rpmfusion-%{repo}.channel
+Source2: rpmfusion-%{repo}-rawhide.channel
+Source3: rpmfusion-%{repo}-updates.channel
+Source4: rpmfusion-%{repo}-updates-testing.channel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: smart
-Provides: smart-config-rpmfusion-free = %{version}-%{release}
+Provides: smart-config-rpmfusion-%{repo} = %{version}-%{release}
+%if %repo == "nonfree"
+Requires: rpmfusion-free-package-config-smart >= %{version}
+%endif
%description
This package provides the configuration files required by the Smart package
-manager to use RPM Fusion's "free" software repository.
+manager to use RPM Fusion's "%{repo}" software repository.
%prep
%setup -cT
cp %{SOURCE0} .
-sleep 3m
%build
@@ -43,6 +55,10 @@
install -p -m0644 $channel $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
sed -i 's/\$basearch/%{basearch}/' $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
sed -i 's/\$releasever/%{fedora}/' $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
+%ifnarch %{ix86} x86_64
+ #Fedora secondary
+ sed -i 's/free\/fedora\//free\/fedora-secondary\//' $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
+%endif
done
%clean
@@ -54,6 +70,9 @@
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel
%changelog
+* Fri Sep 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-2
+- Add support for secondary-arches
+
* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-1
- Update for F-17
11 years, 8 months
rpms/chromaprint-tools/devel chromaprint-tools.spec,1.5,1.6
by Ismael Olea
Author: olea
Update of /cvs/free/rpms/chromaprint-tools/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23912
Modified Files:
chromaprint-tools.spec
Log Message:
* Fri Sep 7 2012 Ismael Olea <ismael(a)olea.org> - 0.7-2
- bump
Index: chromaprint-tools.spec
===================================================================
RCS file: /cvs/free/rpms/chromaprint-tools/devel/chromaprint-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- chromaprint-tools.spec 7 Sep 2012 19:34:07 -0000 1.5
+++ chromaprint-tools.spec 7 Sep 2012 20:27:35 -0000 1.6
@@ -1,6 +1,6 @@
Name: chromaprint-tools
Version: 0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Chromaprint audio fingerprinting tools
Group: Applications/Multimedia
License: LGPLv2+
@@ -43,6 +43,9 @@
%{_bindir}/fpcalc
%changelog
+* Fri Sep 7 2012 Ismael Olea <ismael(a)olea.org> - 0.7-2
+- bump
+
* Fri Sep 7 2012 Ismael Olea <ismael(a)olea.org> - 0.7-1
- update to 0.7
11 years, 8 months
rpms/chromaprint-tools/F-18 chromaprint-tools.spec,1.5,1.6
by Ismael Olea
Author: olea
Update of /cvs/free/rpms/chromaprint-tools/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23723
Modified Files:
chromaprint-tools.spec
Log Message:
* Fri Sep 7 2012 Ismael Olea <ismael(a)olea.org> - 0.7-2
- bump
Index: chromaprint-tools.spec
===================================================================
RCS file: /cvs/free/rpms/chromaprint-tools/F-18/chromaprint-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- chromaprint-tools.spec 7 Sep 2012 20:06:56 -0000 1.5
+++ chromaprint-tools.spec 7 Sep 2012 20:26:22 -0000 1.6
@@ -1,6 +1,6 @@
Name: chromaprint-tools
Version: 0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Chromaprint audio fingerprinting tools
Group: Applications/Multimedia
License: LGPLv2+
@@ -43,6 +43,9 @@
%{_bindir}/fpcalc
%changelog
+* Fri Sep 7 2012 Ismael Olea <ismael(a)olea.org> - 0.7-2
+- bump
+
* Fri Sep 7 2012 Ismael Olea <ismael(a)olea.org> - 0.7-1
- update to 0.7
11 years, 8 months
rpms/chromaprint-tools/F-18 chromaprint-tools.spec, 1.4, 1.5 sources, 1.2, 1.3
by Ismael Olea
Author: olea
Update of /cvs/free/rpms/chromaprint-tools/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22569
Modified Files:
chromaprint-tools.spec sources
Log Message:
* Fri Sep 7 2012 Ismael Olea <ismael(a)olea.org> - 0.7-1
- update to 0.7
Index: chromaprint-tools.spec
===================================================================
RCS file: /cvs/free/rpms/chromaprint-tools/F-18/chromaprint-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- chromaprint-tools.spec 26 Jun 2012 09:06:11 -0000 1.4
+++ chromaprint-tools.spec 7 Sep 2012 20:06:56 -0000 1.5
@@ -1,6 +1,6 @@
Name: chromaprint-tools
-Version: 0.6
-Release: 6%{?dist}
+Version: 0.7
+Release: 1%{?dist}
Summary: Chromaprint audio fingerprinting tools
Group: Applications/Multimedia
License: LGPLv2+
@@ -18,8 +18,8 @@
client-side library that implements a custom algorithm for extracting
fingerprints from raw audio sources.
-This is a set of Chromaprint tools related to acoustic fingerprinting,
-featuring fpcalc, an standalone AcoustID tool used by Picard.
+This is a set of Chromaprint tools related to acoustic fingerprinting
+featuring fpcalc an standalone AcoustID tool used by Picard.
%prep
%setup -q -n chromaprint-%{version}
@@ -43,6 +43,9 @@
%{_bindir}/fpcalc
%changelog
+* Fri Sep 7 2012 Ismael Olea <ismael(a)olea.org> - 0.7-1
+- update to 0.7
+
* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6-6
- Rebuilt for FFmpeg
Index: sources
===================================================================
RCS file: /cvs/free/rpms/chromaprint-tools/F-18/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Jan 2012 09:52:00 -0000 1.2
+++ sources 7 Sep 2012 20:06:56 -0000 1.3
@@ -1 +1 @@
-6b5a4f2685395e68d8abc40d1c2a8785 chromaprint-0.6.tar.gz
+3005fc2c69b9ef4a5c6787ef9355a855 chromaprint-0.7.tar.gz
11 years, 8 months
rpms/chromaprint-tools/F-17 .cvsignore, 1.2, 1.3 chromaprint-tools.spec, 1.3, 1.4 sources, 1.2, 1.3
by Ismael Olea
Author: olea
Update of /cvs/free/rpms/chromaprint-tools/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21248
Modified Files:
.cvsignore chromaprint-tools.spec sources
Log Message:
* Fri Sep 7 2012 Ismael Olea <ismael(a)olea.org> - 0.7-1
- update to 0.7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/chromaprint-tools/F-17/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Jan 2012 09:52:00 -0000 1.2
+++ .cvsignore 7 Sep 2012 19:44:30 -0000 1.3
@@ -1 +1 @@
-chromaprint-0.6.tar.gz
+chromaprint-0.7.tar.gz
Index: chromaprint-tools.spec
===================================================================
RCS file: /cvs/free/rpms/chromaprint-tools/F-17/chromaprint-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- chromaprint-tools.spec 9 May 2012 08:49:40 -0000 1.3
+++ chromaprint-tools.spec 7 Sep 2012 19:44:30 -0000 1.4
@@ -1,6 +1,6 @@
Name: chromaprint-tools
-Version: 0.6
-Release: 5%{?dist}
+Version: 0.7
+Release: 1%{?dist}
Summary: Chromaprint audio fingerprinting tools
Group: Applications/Multimedia
License: LGPLv2+
@@ -18,8 +18,8 @@
client-side library that implements a custom algorithm for extracting
fingerprints from raw audio sources.
-This is a set of Chromaprint tools related to acoustic fingerprinting,
-featuring fpcalc, an standalone AcoustID tool used by Picard.
+This is a set of Chromaprint tools related to acoustic fingerprinting
+featuring fpcalc an standalone AcoustID tool used by Picard.
%prep
%setup -q -n chromaprint-%{version}
@@ -43,6 +43,9 @@
%{_bindir}/fpcalc
%changelog
+* Fri Sep 7 2012 Ismael Olea <ismael(a)olea.org> - 0.7-1
+- update to 0.7
+
* Wed May 9 2012 Ismael Olea <ismael(a)olea.org> - 0.6-5
- bump
Index: sources
===================================================================
RCS file: /cvs/free/rpms/chromaprint-tools/F-17/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Jan 2012 09:52:00 -0000 1.2
+++ sources 7 Sep 2012 19:44:30 -0000 1.3
@@ -1 +1 @@
-6b5a4f2685395e68d8abc40d1c2a8785 chromaprint-0.6.tar.gz
+3005fc2c69b9ef4a5c6787ef9355a855 chromaprint-0.7.tar.gz
11 years, 8 months
rpms/chromaprint-tools/devel .cvsignore, 1.2, 1.3 chromaprint-tools.spec, 1.4, 1.5 sources, 1.2, 1.3
by Ismael Olea
Author: olea
Update of /cvs/free/rpms/chromaprint-tools/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20595
Modified Files:
.cvsignore chromaprint-tools.spec sources
Log Message:
* Fri Sep 7 2012 Ismael Olea <ismael(a)olea.org> - 0.7-1
- update to 0.7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/chromaprint-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Jan 2012 09:52:00 -0000 1.2
+++ .cvsignore 7 Sep 2012 19:34:07 -0000 1.3
@@ -1 +1 @@
-chromaprint-0.6.tar.gz
+chromaprint-0.7.tar.gz
Index: chromaprint-tools.spec
===================================================================
RCS file: /cvs/free/rpms/chromaprint-tools/devel/chromaprint-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- chromaprint-tools.spec 26 Jun 2012 09:06:11 -0000 1.4
+++ chromaprint-tools.spec 7 Sep 2012 19:34:07 -0000 1.5
@@ -1,6 +1,6 @@
Name: chromaprint-tools
-Version: 0.6
-Release: 6%{?dist}
+Version: 0.7
+Release: 1%{?dist}
Summary: Chromaprint audio fingerprinting tools
Group: Applications/Multimedia
License: LGPLv2+
@@ -18,8 +18,8 @@
client-side library that implements a custom algorithm for extracting
fingerprints from raw audio sources.
-This is a set of Chromaprint tools related to acoustic fingerprinting,
-featuring fpcalc, an standalone AcoustID tool used by Picard.
+This is a set of Chromaprint tools related to acoustic fingerprinting
+featuring fpcalc an standalone AcoustID tool used by Picard.
%prep
%setup -q -n chromaprint-%{version}
@@ -43,6 +43,9 @@
%{_bindir}/fpcalc
%changelog
+* Fri Sep 7 2012 Ismael Olea <ismael(a)olea.org> - 0.7-1
+- update to 0.7
+
* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6-6
- Rebuilt for FFmpeg
Index: sources
===================================================================
RCS file: /cvs/free/rpms/chromaprint-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Jan 2012 09:52:00 -0000 1.2
+++ sources 7 Sep 2012 19:34:07 -0000 1.3
@@ -1 +1 @@
-6b5a4f2685395e68d8abc40d1c2a8785 chromaprint-0.6.tar.gz
+3005fc2c69b9ef4a5c6787ef9355a855 chromaprint-0.7.tar.gz
11 years, 8 months
rpms/VirtualBox/devel VirtualBox-OSE-4.0.0-32bit.patch, 1.3, 1.4 VirtualBox.spec, 1.21, 1.22
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2227
Modified Files:
VirtualBox.spec
Added Files:
VirtualBox-OSE-4.0.0-32bit.patch
Log Message:
* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.5.RC3
- not drop 32-bit patch, as a quick resolution.
VirtualBox-OSE-4.0.0-32bit.patch:
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 10 +++++++++-
3 files changed, 18 insertions(+), 2 deletions(-)
Index: VirtualBox-OSE-4.0.0-32bit.patch
===================================================================
RCS file: VirtualBox-OSE-4.0.0-32bit.patch
diff -N VirtualBox-OSE-4.0.0-32bit.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ VirtualBox-OSE-4.0.0-32bit.patch 7 Sep 2012 15:15:58 -0000 1.4
@@ -0,0 +1,113 @@
+From a9548501755beeec6fa11b0c261f167164a4ee70 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak(a)v3.sk>
+Date: Fri, 26 Mar 2010 04:44:55 +0100
+Subject: [PATCH] Build on x86_64 without 32bit toolchain.
+
+This disables the check for 32bit toolchain and tests that need it
+(boo).
+---
+ configure | 2 +-
+ src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
+ src/VBox/VMM/testcase/Makefile.kmk | 9 +++++++++
+ 3 files changed, 18 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 42ce775..0932637 100755
+--- a/configure
++++ b/configure
+@@ -2525,7 +2525,7 @@ if [ "$OS" = "linux" ]; then
+ fi
+ check_libcap
+ check_compiler_h
+- [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
++ #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+ # tools/common/makeself*
+ [ $OSE -ge 1 ] && check_makeself
+ fi
+diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk
+index 4debf81..59dae0d 100644
+--- a/src/VBox/Devices/testcase/Makefile.kmk
++++ b/src/VBox/Devices/testcase/Makefile.kmk
+@@ -45,22 +45,28 @@ VBOX_DEVICES_TESTS_FEATURES = \
+ # We setup one 'other' target for executing the structure & alignment
+ # validation testcases. Perhaps a bit hackish, but extremely useful.
+ #
++ifneq ($(KBUILD_HOST_ARCH),amd64)
+ ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
+ ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
+ OTHERS += \
+ $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
+ endif
+ endif
++endif
+
+ # The normal testing pass.
++ifneq ($(KBUILD_HOST_ARCH),amd64)
+ TESTING += \
+ $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
++endif
+
+ ifdef VBOX_WITH_RAW_MODE
+ #
+ # The testcase generator.
+ #
++ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstDeviceStructSizeRC
++endif
+ tstDeviceStructSizeRC_TEMPLATE = VBoxRcExe
+ tstDeviceStructSizeRC_DEFS = $(VBOX_DEVICES_TESTS_FEATURES)
+ tstDeviceStructSizeRC_SOURCES = tstDeviceStructSizeRC.cpp
+@@ -73,7 +79,9 @@ endif # VBOX_WITH_RAW_MODE
+ #
+ # The testcase it self.
+ #
++ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstDeviceStructSize
++endif
+ tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
+ tstDeviceStructSize_DEFS = $(VBOX_DEVICES_TESTS_FEATURES)
+ tstDeviceStructSize_INCS = \
+diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk
+index f947789..95882f1 100644
+--- a/src/VBox/VMM/testcase/Makefile.kmk
++++ b/src/VBox/VMM/testcase/Makefile.kmk
+@@ -21,10 +21,14 @@ include $(KBUILD_PATH)/subheader.kmk
+ #
+ # Target lists.
+ #
++ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstVMStructSize tstAsmStructs
++endif
+ ifdef VBOX_WITH_RAW_MODE
++ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstVMStructRC tstAsmStructsRC
+ endif
++endif
+ ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
+ PROGRAMS += tstGlobalConfig tstInstrEmul
+ ifdef VBOX_WITH_RAW_MODE
+@@ -67,16 +71,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR)
+ #
+ ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
+ ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
++ ifneq ($(KBUILD_HOST_ARCH),amd64)
+ OTHERS += \
+ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
+ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
++ endif
+ endif
+ endif
+
+ # The normal testing pass.
++
++ifneq ($(KBUILD_HOST_ARCH),amd64)
+ TESTING += \
+ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
+ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
++endif
+ ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
+ TESTING += \
+ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run
+--
+1.7.3.4
+
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- VirtualBox.spec 7 Sep 2012 03:58:22 -0000 1.21
+++ VirtualBox.spec 7 Sep 2012 15:15:58 -0000 1.22
@@ -15,7 +15,7 @@
Name: VirtualBox
Version: 4.2.0
-Release: 0.4%{?prerel:.%{prerel}}%{?dist}
+Release: 0.5%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -34,6 +34,7 @@
Patch2: VirtualBox-4.1.18-strings.patch
Patch3: VirtualBox-4.2.0-libcxx.patch
Patch5: VirtualBox-4.2.0-xorg17.patch
+Patch10: VirtualBox-OSE-4.0.0-32bit.patch
Patch15: VirtualBox-OSE-4.0.0-makeself.patch
Patch17: VirtualBox-OSE-4.0.0-beramono.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
@@ -61,7 +62,7 @@
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
BuildRequires: libpng-devel
-BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686
+#BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686
#BuildRequires: /usr/lib/libc.so
#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6
@@ -177,6 +178,7 @@
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
%patch5 -p1 -b .xorg17
+%patch10 -p1 -b .32bit
%patch15 -p1 -b .makeself
%patch17 -p1 -b .beramono
%patch18 -p1 -b .aiobug
@@ -551,6 +553,9 @@
%changelog
+* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.5.RC3
+- not drop 32-bit patch, as a quick resolution.
+
* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.4.RC3
- Also Compile guest drives vboxvideo_drv and vboxmouse_drv with X11 sources from system.
- Fix ABI/API breakages in X11 1.13.
11 years, 8 months
rpms/VirtualBox/devel VirtualBox.spec,1.20,1.21
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24824
Modified Files:
VirtualBox.spec
Log Message:
fix a typo.
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- VirtualBox.spec 7 Sep 2012 03:49:38 -0000 1.20
+++ VirtualBox.spec 7 Sep 2012 03:58:22 -0000 1.21
@@ -61,7 +61,7 @@
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
BuildRequires: libpng-devel
-BuildRequires: libc.i686 libc-devel.i686 libstdc++.i686
+BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686
#BuildRequires: /usr/lib/libc.so
#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6
11 years, 8 months
rpms/VirtualBox/devel VirtualBox.spec,1.19,1.20
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24256
Modified Files:
VirtualBox.spec
Log Message:
* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.4.RC3
- Also Compile guest drives vboxvideo_drv and vboxmouse_drv with X11 sources from system.
- Fix ABI/API breakages in X11 1.13.
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- VirtualBox.spec 7 Sep 2012 03:03:37 -0000 1.19
+++ VirtualBox.spec 7 Sep 2012 03:49:38 -0000 1.20
@@ -61,9 +61,9 @@
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
BuildRequires: libpng-devel
-# libstdc++.i686 and libc-devel.i686 for 32-bits
-BuildRequires: /usr/lib/libc.so
-BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6
+BuildRequires: libc.i686 libc-devel.i686 libstdc++.i686
+#BuildRequires: /usr/lib/libc.so
+#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6
# For the X11 module
BuildRequires: libdrm-devel
11 years, 8 months