[VirtualBox-kmod/f34: 3/3] Update to 6.1.26
by Sérgio M. Basto
commit 5b6ee72826925011b2c12c925f2421cb0cb72c42
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Aug 9 18:41:20 2021 +0100
Update to 6.1.26
VirtualBox-kmod.spec | 9 ++++++---
update_vbox.sh | 8 +++++---
2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index bf20038..98a8e22 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -27,12 +27,12 @@
#global prerel RC1
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global vboxrel 1
+%global vboxrel 2
%global vboxreltag %{?vboxrel:-%{vboxrel}}
Name: VirtualBox-kmod
-Version: 6.1.22
-Release: 3%{?dist}
+Version: 6.1.26
+Release: 1%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -125,6 +125,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Mon Aug 09 2021 Sérgio Basto <sergio(a)serjux.com> - 6.1.26-1
+- Update to 6.1.26
+
* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.1.22-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/update_vbox.sh b/update_vbox.sh
index 2f2d7b2..0b22ca7 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,5 +1,5 @@
-VERSION=6.1.22
-REL=1
+VERSION=6.1.26
+REL=2
RAWHIDE=35
REPOS="f34 f33 f32 el8 el7"
@@ -31,7 +31,8 @@ rfpkg ci -c && git show
echo Press enter to continue; read dummy;
BRANCH1=f$RAWHIDE
BRANCH2=fc$RAWHIDE
-koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
+echo koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
+koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-3.$BRANCH2
(koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \
rfpkg push && rfpkg build --nowait ) &
fi
@@ -45,6 +46,7 @@ if [[ $repo == f* ]]; then
BRANCH2=fc${repo:1}
fi
echo Press enter tag-build $BRANCH1 to continue; read dummy;
+echo koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
(koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \
git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master) &
3 years, 3 months
[VirtualBox] Fix build on rawhide (disabling python) and BR alsa-lib-devel
by Sérgio M. Basto
commit 783bf98bae641b17c7a5e8ddc4e3e2c8eb264c74
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Aug 9 17:31:56 2021 +0100
Fix build on rawhide (disabling python) and BR alsa-lib-devel
VirtualBox.spec | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index c4323b6..4f7d97e 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -16,11 +16,11 @@
#global prerel RC1
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%if 0%{?fedora} > 34
- %bcond_with webservice
-%else
+#%%if 0%%{?fedora} > 34
+# %%bcond_with webservice
+#%%else
%bcond_without webservice
-%endif
+#%%endif
# Now we use upstream pdf
%bcond_with docs
%bcond_without vnc
@@ -33,6 +33,8 @@
%endif
# Since version 6.1.28, VBox should not have the python2 dependency
+%bcond_with python2
+
%if 0%{?fedora} > 34
%bcond_with python3
%else
@@ -41,7 +43,7 @@
Name: VirtualBox
Version: 6.1.26
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -106,7 +108,7 @@ BuildRequires: iasl
BuildRequires: libxslt-devel
BuildRequires: libIDL-devel
BuildRequires: yasm
-BuildRequires: pulseaudio-libs-devel
+BuildRequires: alsa-lib-devel
%if %{with python2}
BuildRequires: python2-devel
%endif
@@ -333,7 +335,6 @@ rm -r src/libs/zlib-1.2.*/
%patch40 -p1 -b .python2_path
%patch52 -p1 -b .convert-map-python3
%endif
-# mageia support not ready for 6.0
%patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
%patch60 -p1 -b .xclient
@@ -898,6 +899,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Mon Aug 09 2021 Sérgio Basto <sergio(a)serjux.com> - 6.1.26-3
+- Fix build on rawhide (disabling python) and BR alsa-lib-devel
+
* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.1.26-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
3 years, 3 months
[xcpc] Updated to new upstream release (BZ #6026)
by Andrea Musuruane
commit 59b359c463d7eff9228b68710a8b60462a7c025f
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Mon Aug 9 12:19:12 2021 +0200
Updated to new upstream release (BZ #6026)
.gitignore | 1 +
sources | 2 +-
xcpc.spec | 58 +++++++++++++++++++++++++++++++++-------------------------
3 files changed, 35 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eea8a02..4d97a8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xcpc-20070122.tar.gz
+/xcpc-0.37.0.tar.gz
diff --git a/sources b/sources
index ffb15f8..adb0525 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b9d1c94b37e1cc10312dd46bd0696b7 xcpc-20070122.tar.gz
+SHA512 (xcpc-0.37.0.tar.gz) = 8579711595ac5234c1c8a6e9d0279950c97966a2a8919d4f0ba404c5bd5609f299ab0b5131d6973f5decfc12bff184facf3009522bef568a108b5cfb7e74be11
diff --git a/xcpc.spec b/xcpc.spec
index b37735e..e5a8981 100644
--- a/xcpc.spec
+++ b/xcpc.spec
@@ -1,61 +1,66 @@
-%define date 20070122
-
Name: xcpc
-Version: 0.0
-Release: 0.28.%{date}wip%{?dist}
-Summary: A portable Amstrad CPC464/CPC664/CPC6128 Emulator written in C
+Version: 0.37.0
+Release: 1%{?dist}
+Summary: A portable Amstrad CPC 464/664/6128 emulator written in C
License: GPLv2+
URL: http://www.xcpc-emulator.net/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{date}.tar.gz
+Source0: https://bitbucket.org/ponceto/xcpc/downloads/%{name}-%{version}.tar.gz
Source1: %{name}.appdata.xml
BuildRequires: gcc
-BuildRequires: glib2-devel
-BuildRequires: libdsk-devel
-BuildRequires: libXmu-devel
-BuildRequires: motif-devel
-BuildRequires: libICE-devel
+BuildRequires: make
+BuildRequires: autoconf
+BuildRequires: autoconf-archive
+BuildRequires: automake
BuildRequires: libtool
+BuildRequires: gtk3-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: portaudio-devel
BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
+Provides: bundled(libdsk) = 1.4.2
+Provides: bundled(lib765) = 0.4.2
%description
-Xcpc is a portable Amstrad CPC464/CPC664/CPC6128 Emulator written in C.
-
-It is designed to run on any POSIX system (Linux/BSD/UNIX-like OSes).
+Xcpc is a portable Amstrad CPC 464/664/6128 emulator written in C. It is
+designed to run on any POSIX compliant system having an X11 server, including
+Linux, BSD and Unix.
%prep
-%setup -q -n %{name}-%{date}
+%autosetup
-# remove icon extension from desktop file
-sed -i -e 's/^Icon=%{name}.xpm$/Icon=%{name}/g' src/%{name}.desktop
+# Disable check for C++14 support in GCC
+sed -i '/AX_CHECK_CXX14/d' configure.ac
%build
-%configure --with-motif1
+autoreconf -fvi
+%configure --with-x11-toolkit=gtk3
%make_build
%install
%make_install
-# install desktop file and fix categories
+# fix desktop file
desktop-file-install \
--delete-original \
- --remove-category Application \
+ --remove-key Encoding \
+ --set-icon=%{name} \
--dir %{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/%{name}.desktop
# remove icon installed by make
-rm %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
+rm %{buildroot}%{_datadir}/pixmaps/%{name}.png
# install icon
-install -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-install -m 644 src/%{name}.xpm %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
+install -d %{buildroot}%{_datadir}/icons/hicolor/64x64/apps
+install -m 644 share/pixmaps/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
# install AppData file
install -d %{buildroot}%{_metainfodir}
@@ -67,13 +72,16 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_metainfodir}/%{name}.appdata.xml
-%doc AUTHORS ChangeLog README
+%doc AUTHORS ChangeLog README.md
%license COPYING
%changelog
+* Sat Aug 07 2021 Andrea Musuruane <musuruan(a)gmail.com> - 0.37.0-1
+- Updated to new upstream release (BZ #6026)
+
* Wed Aug 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.0-0.28.20070122wip
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
3 years, 3 months