[rfpkg/el8] (2 commits) ...use autosetup macro
by Leigh Scott
Summary of changes:
0325532... Add zsnes, gens and dega-sdl to multilibs (*)
c0917ab... use autosetup macro (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 11 months
[rfpkg/el7] (2 commits) ...use autosetup macro
by Sérgio M. Basto
Summary of changes:
0325532... Add zsnes, gens and dega-sdl to multilibs (*)
c0917ab... use autosetup macro (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 11 months
[rfpkg/f31] (2 commits) ...use autosetup macro
by Sérgio M. Basto
Summary of changes:
0325532... Add zsnes, gens and dega-sdl to multilibs (*)
c0917ab... use autosetup macro (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 11 months
[rfpkg/f32] (2 commits) ...use autosetup macro
by Sérgio M. Basto
Summary of changes:
0325532... Add zsnes, gens and dega-sdl to multilibs (*)
c0917ab... use autosetup macro (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 11 months
[rfpkg] use autosetup macro
by Sérgio M. Basto
commit c0917ab06cc792f735cfdc685fbe0db0d6604f1b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed May 27 06:37:08 2020 +0100
use autosetup macro
rfpkg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/rfpkg.spec b/rfpkg.spec
index a819cd2..6981cc4 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -80,7 +80,7 @@ Requires: rfpkgdb-cli
RPM Fusion utility for working with dist-git.
%prep
-%setup -q
+%autosetup -p1
%build
%if %{with python2}
3 years, 11 months
[rfpkg] Add zsnes, gens and dega-sdl to multilibs
by Sérgio M. Basto
commit 0325532770625c7a944c16bb1c553702f031e1df
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed May 27 06:18:10 2020 +0100
Add zsnes, gens and dega-sdl to multilibs
be33cce92923328b613e4245bfb28f2c10c93f35.patch | 24 ++++++++++++++++++++++++
rfpkg.spec | 6 +++++-
2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/be33cce92923328b613e4245bfb28f2c10c93f35.patch b/be33cce92923328b613e4245bfb28f2c10c93f35.patch
new file mode 100644
index 0000000..414fa94
--- /dev/null
+++ b/be33cce92923328b613e4245bfb28f2c10c93f35.patch
@@ -0,0 +1,24 @@
+From be33cce92923328b613e4245bfb28f2c10c93f35 Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux(a)gmail.com>
+Date: Sat, 25 Apr 2020 13:12:12 +0100
+Subject: [PATCH] Add zsnes, gens and dega-sdl to multilibs
+
+---
+ rfpkg/__init__.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rfpkg/__init__.py b/rfpkg/__init__.py
+index d364998..8517f72 100644
+--- a/rfpkg/__init__.py
++++ b/rfpkg/__init__.py
+@@ -223,8 +223,8 @@ def load_target(self):
+ if self._package_name_spec in ['buildsys-build-rpmfusion', 'gpac', 'gstreamer1-libav',
+ 'gstreamer1-plugins-bad-freeworld', 'gstreamer1-plugins-ugly', 'faad2', 'ffmpeg',
+ 'libde265', 'libdca', 'libmms', 'libquicktime', 'libva-intel-driver', 'mjpegtools',
+- 'opencore-amr', 'rtmpdump', 'vo-amrwbenc', 'x264', 'x265', 'xvidcore',
+- 'Cg', 'pcsx2', 'steam', 'xorg-x11-drv-nvidia', 'xorg-x11-drv-nvidia-390xx',
++ 'opencore-amr', 'rtmpdump', 'vo-amrwbenc', 'x264', 'x265', 'xvidcore', 'zsnes',
++ 'Cg', 'dega-sdl', 'gens', 'pcsx2', 'steam', 'xorg-x11-drv-nvidia', 'xorg-x11-drv-nvidia-390xx',
+ 'xorg-x11-drv-nvidia-340xx'] and self.branch_merge not in ['el6', 'f28',
+ 'f29', 'f30'] and self.namespace in ['free', 'nonfree']:
+ self._target += "-multilibs"
diff --git a/rfpkg.spec b/rfpkg.spec
index e7085a1..a819cd2 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -5,12 +5,13 @@
Name: rfpkg
Version: 1.26.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: RPM Fusion utility for working with dist-git
License: GPLv2+
Group: Applications/System
URL: https://github.com/rpmfusion-infra/rfpkg
Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch0: %url/commit/be33cce92923328b613e4245bfb28f2c10c93f35.patch
BuildArch: noarch
@@ -137,6 +138,9 @@ nosetests
%changelog
+* Wed May 27 2020 Sérgio Basto <sergio(a)serjux.com> - 1.26.3-2
+- Add zsnes, gens and dega-sdl to multilibs
+
* Sat Mar 14 2020 Sérgio Basto <sergio(a)serjux.com> - 1.26.3-1
- Update to 1.26.3
3 years, 11 months
[imagination] Update imagination to 3.5.1
by Sérgio M. Basto
commit bccfd3afa299af5c43c9f2be9d65c2c7a89a1183
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed May 27 06:13:52 2020 +0100
Update imagination to 3.5.1
.gitignore | 1 +
imagination-3.0-docfix.patch | 12 ++++++------
imagination-3.0-icon_fix.patch | 29 +++++------------------------
imagination.spec | 16 +++++++++-------
sources | 2 +-
5 files changed, 22 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac40c6b..d0a03b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
imagination-3.0.tar.gz
/imagination-3.1.tar.bz2
+/imagination-3.5.1.tar.gz
diff --git a/imagination-3.0-docfix.patch b/imagination-3.0-docfix.patch
index 26793a1..a69c29a 100644
--- a/imagination-3.0-docfix.patch
+++ b/imagination-3.0-docfix.patch
@@ -1,6 +1,6 @@
---- src/main-window.c.orig 2011-04-16 16:34:10.826673407 -0500
-+++ src/main-window.c 2011-04-16 16:35:18.218400982 -0500
-@@ -2127,7 +2127,7 @@
+--- src/main-window.c.orig 2020-05-27 05:14:24.148951173 +0100
++++ src/main-window.c 2020-05-27 05:28:14.376197928 +0100
+@@ -2257,7 +2257,7 @@ static void img_show_uri(GtkMenuItem * U
gchar *lang = NULL;
lang = g_strndup(g_getenv("LANG"),2);
@@ -9,12 +9,12 @@
g_free(lang);
img_message (img, FALSE, "%s\n", file);
-@@ -2135,7 +2135,7 @@
- if ( !gtk_show_uri(NULL,file, GDK_CURRENT_TIME, NULL))
+@@ -2265,7 +2265,7 @@ static void img_show_uri(GtkMenuItem * U
+ if ( !gtk_show_uri_on_window(GTK_WINDOW(img->imagination_window), file, GDK_CURRENT_TIME, NULL))
{
g_free( file );
- file = g_strconcat("file://",DATADIR,"/doc/",PACKAGE,"/html/en/index.html",NULL);
+ file = g_strconcat("file://",DATADIR,"/doc/",PACKAGE,"-",PACKAGE_VERSION,"/html/en/index.html",NULL);
- gtk_show_uri(NULL,file, GDK_CURRENT_TIME, NULL);
+ gtk_show_uri_on_window(GTK_WINDOW(img->imagination_window), file, GDK_CURRENT_TIME, NULL);
}
g_free(file);
diff --git a/imagination-3.0-icon_fix.patch b/imagination-3.0-icon_fix.patch
index bd7f81e..f3eb194 100644
--- a/imagination-3.0-icon_fix.patch
+++ b/imagination-3.0-icon_fix.patch
@@ -1,34 +1,15 @@
-diff -Naur imagination-3.0.orig/src/main-window.c imagination-3.0/src/main-window.c
---- imagination-3.0.orig/src/main-window.c 2011-04-18 13:08:21.379948445 -0500
-+++ imagination-3.0/src/main-window.c 2011-04-18 16:24:03.886827476 -0500
-@@ -262,7 +262,7 @@
- gtk_widget_add_accelerator (import_menu,"activate",img_struct->accel_group,GDK_i,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
- g_signal_connect (G_OBJECT (import_menu),"activate",G_CALLBACK (img_add_slides_thumbnails),img_struct);
-
-- pixbuf = gtk_icon_theme_load_icon(icon_theme,"image", 18, 0, NULL);
-+ pixbuf = gtk_icon_theme_load_icon(icon_theme,"image-x-generic", 18, 0, NULL);
- image_menu = gtk_image_new_from_pixbuf(pixbuf);
- g_object_unref(pixbuf);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (import_menu),image_menu);
-@@ -272,7 +272,7 @@
- gtk_widget_add_accelerator (import_audio_menu,"activate",img_struct->accel_group,GDK_m,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
- g_signal_connect (G_OBJECT (import_audio_menu),"activate",G_CALLBACK (img_select_audio_files_to_add),img_struct);
-
-- pixbuf = gtk_icon_theme_load_icon(icon_theme,"sound", 18, 0, NULL);
-+ pixbuf = gtk_icon_theme_load_icon(icon_theme,"audio-x-generic", 18, 0, NULL);
- image_menu = gtk_image_new_from_pixbuf(pixbuf);
- g_object_unref(pixbuf);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (import_audio_menu),image_menu);
-@@ -526,7 +526,7 @@
+--- ./src/main-window.c.orig 2020-02-23 19:42:19.000000000 +0000
++++ ./src/main-window.c 2020-05-27 05:14:24.148951173 +0100
+@@ -495,7 +495,7 @@ img_window_struct *img_create_window (vo
gtk_widget_show (separatortoolitem);
- gtk_container_add (GTK_CONTAINER (toolbar),separatortoolitem);
+ gtk_container_add (GTK_CONTAINER (img_struct->toolbar),separatortoolitem);
- pixbuf = gtk_icon_theme_load_icon(icon_theme,"image", 20, 0, NULL);
+ pixbuf = gtk_icon_theme_load_icon(icon_theme,"image-x-generic", 20, 0, NULL);
tmp_image = gtk_image_new_from_pixbuf(pixbuf);
g_object_unref(pixbuf);
-@@ -535,7 +535,7 @@
+@@ -504,7 +504,7 @@ img_window_struct *img_create_window (vo
gtk_widget_set_tooltip_text(import_button, _("Import pictures"));
g_signal_connect ((gpointer)import_button, "clicked", G_CALLBACK (img_add_slides_thumbnails),img_struct);
diff --git a/imagination.spec b/imagination.spec
index 2090369..e689b1c 100644
--- a/imagination.spec
+++ b/imagination.spec
@@ -1,18 +1,18 @@
Name: imagination
-Version: 3.1
-Release: 4%{?dist}
+Version: 3.5.1
+Release: 1%{?dist}
Summary: A lightweight and simple GTK based DVD slide show creator
Group: Applications/Multimedia
License: GPLv2
URL: http://imagination.sourceforge.net/
-Source0: https://downloads.sourceforge.net/imagination/%{name}-%{version}.tar.bz2
+Source0: https://downloads.sourceforge.net/imagination/%{name}-%{version}.tar.gz
Patch0: imagination-3.0-docfix.patch
# Fix icon references to not require gnome-icon-theme-legacy
Patch1: imagination-3.0-icon_fix.patch
-BuildRequires: gtk2-devel
+BuildRequires: gtk3-devel
BuildRequires: sox-devel
BuildRequires: ffmpeg-devel
BuildRequires: libxslt docbook-style-xsl
@@ -33,17 +33,16 @@ language and built with the GTK+2 toolkit.
%prep
%setup -q
-autoreconf -fiv
%patch0 -b .docfix
%patch1 -p1 -b .iconfix
%build
# Necessary due to patched configure.in
-/bin/bash ./autogen.sh
+./autogen.sh
LDFLAGS=`pkg-config --libs gmodule-2.0`; export LDFLAGS
%configure
-make %{?_smp_mflags} V=1
+%make_build
%install
@@ -72,6 +71,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/imagination.desktop
%{_libdir}/%{name}
%changelog
+* Wed May 27 2020 Sergio - 3.5.1-1
+- Update imagination to 3.5.1
+
* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index 1f94cfa..bde45f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c430f90a58cbd6c9fcebf1f8385d777 imagination-3.1.tar.bz2
+SHA512 (imagination-3.5.1.tar.gz) = a489ef0e087f89b54db88e7641cfa48faae3d5b4447ebd2b1bd94954408c729a99d7fa36105e460919509eb7b00f6a317486daf7d3aa54352a4ff4be84473f05
3 years, 11 months
[openshot/el7] (3 commits) ...New upstream release
by Sérgio M. Basto
Summary of changes:
bfc64d4... Fix el8 build (*)
988bc62... ExcludeArch: ppc64le (*)
9880084... New upstream release (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 11 months
[VirtualBox-kmod] Remove kernel-5.patch
by Sérgio M. Basto
commit a58d55fba4643da0af083248c6b7d84fb09eb2d6
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed May 27 02:41:27 2020 +0100
Remove kernel-5.patch
VirtualBox-kmod.spec | 7 +++---
kernel-5.patch | 60 ----------------------------------------------------
2 files changed, 3 insertions(+), 64 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index f375b01..d549d09 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -45,7 +45,6 @@ License: GPLv2 or CDDL
URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: excludekernel-filter.txt
-Patch2: kernel-5.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
@@ -69,9 +68,6 @@ Kernel module for VirtualBox
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
-
-%patch2 -p1
-
popd
# error out if there was something wrong with kmodtool
@@ -135,6 +131,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Wed May 27 2020 Sérgio Basto <sergio(a)serjux.com>
+- Remove kernel-5.patch
+
* Wed May 20 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.8-2
- vboxsf need symbols of vboxguest on building modules, stage 2.
3 years, 11 months
[VirtualBox] Add VirtualBox-6.1.0-VBoxRem.patch rfbz #5652 Remove pre-compiled headers xalan-c-devel and xerces-c
by Sérgio M. Basto
commit fd428110aa7257386a539dca1d63b5f9d58fc372
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed May 27 01:27:17 2020 +0100
Add VirtualBox-6.1.0-VBoxRem.patch rfbz #5652
Remove pre-compiled headers
xalan-c-devel and xerces-c-devel are not needed anymore
VirtualBox-6.1.0-VBoxRem.patch | 17 +++++++++++++++++
VirtualBox.spec | 13 ++++++++++---
2 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/VirtualBox-6.1.0-VBoxRem.patch b/VirtualBox-6.1.0-VBoxRem.patch
new file mode 100644
index 0000000..1ba1904
--- /dev/null
+++ b/VirtualBox-6.1.0-VBoxRem.patch
@@ -0,0 +1,17 @@
+--- VirtualBox-6.1.8.orig/src/VBox/Main/Makefile.kmk 2020-05-14 19:40:58.000000000 +0100
++++ VirtualBox-6.1.8/src/VBox/Main/Makefile.kmk 2020-05-20 23:47:09.205265933 +0100
+@@ -1286,10 +1286,13 @@ if defined(VBOX_WITH_HARDENING) && "$(KB
+ VBoxMain-hardening-inst_INST = $(INST_BIN)components/
+ VBoxMain-hardening-inst_SYMLINKS = \
+ VBoxDDU.so=>../VBoxDDU.so \
+- VBoxREM.so=>../VBoxREM.so \
+ VBoxRT.so=>../VBoxRT.so \
+ VBoxVMM.so=>../VBoxVMM.so \
+ VBoxXPCOM.so=>../VBoxXPCOM.so
++ ifdef VBOX_WITH_REM
++ VBoxMain-hardening-inst_SYMLINKS += \
++ VBoxREM.so=>../VBoxREM.so
++ endif
+ endif
+
+
diff --git a/VirtualBox.spec b/VirtualBox.spec
index c9aeb5e..4d5b912 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -46,7 +46,7 @@
Name: VirtualBox
Version: 6.1.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -91,6 +91,7 @@ Patch70: vbox-python-detection.diff
Patch80: VirtualBox-6.1.4-hacks.patch
Patch84: VirtualBox-6.1.4-wayland-crash.patch
Patch85: VirtualBox-6.1.4-Xwayland-shortcut-inhibit.patch
+Patch86: VirtualBox-6.1.0-VBoxRem.patch
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -99,8 +100,6 @@ BuildRequires: openssl-devel
BuildRequires: libcurl-devel
BuildRequires: iasl
BuildRequires: libxslt-devel
-BuildRequires: xalan-c-devel
-BuildRequires: xerces-c-devel
BuildRequires: libIDL-devel
BuildRequires: yasm
BuildRequires: pulseaudio-libs-devel
@@ -301,6 +300,8 @@ cp -a %{SOURCE20} %{SOURCE21} src/VBox/Frontends/VirtualBox/images/
# Remove prebuilt binary tools
find -name '*.py[co]' -delete
+# Remove pre-compiled headers
+find . -name "*.gch" -delete
rm -r src/VBox/Additions/WINNT
rm -r src/VBox/Additions/os2
rm -r kBuild/
@@ -341,6 +342,7 @@ rm -r src/libs/zlib-1.2.*/
%patch80 -p1 -b .hack
%patch84 -p1 -b .wayland
%patch85 -p1 -b .wayland2
+%patch86 -p1 -b .vboxrem
%build
@@ -868,6 +870,11 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Tue May 26 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.8-3
+- Add VirtualBox-6.1.0-VBoxRem.patch rfbz #5652
+- Remove pre-compiled headers
+- xalan-c-devel and xerces-c-devel are not needed anymore
+
* Wed May 20 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.8-2
- Fix for guest additions on EL7, now we use vboxservice.service to load modules.
Partial fix for rfbz #3966
3 years, 11 months
