[obs-studio/f34] (5 commits) ...Merge branch 'master' into f35
by Neal Gompa
Summary of changes:
04503a8... Update to 27.2.0~rc1 (*)
a45849f... Exclude ppc64le due to missing luajit (*)
cdb94c3... Update to 27.2.0~rc4 (*)
f762fa1... Update to 27.2.0 final (*)
cacf6a3... Merge branch 'master' into f35 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
[obs-studio/f35: 5/5] Merge branch 'master' into f35
by Neal Gompa
commit cacf6a34dedbde36af63d01d28bea59f36e513b8
Merge: 4dd2f42 f762fa1
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Mon Feb 14 18:33:01 2022 -0500
Merge branch 'master' into f35
obs-studio.spec | 24 ++++++++++++++++++------
sources | 4 ++--
2 files changed, 20 insertions(+), 8 deletions(-)
---
2 years, 10 months
[obs-studio/f35] (5 commits) ...Merge branch 'master' into f35
by Neal Gompa
Summary of changes:
04503a8... Update to 27.2.0~rc1 (*)
a45849f... Exclude ppc64le due to missing luajit (*)
cdb94c3... Update to 27.2.0~rc4 (*)
f762fa1... Update to 27.2.0 final (*)
cacf6a3... Merge branch 'master' into f35
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
[obs-studio] Update to 27.2.0 final
by Neal Gompa
commit f762fa1c53c842eeb2282a18b9688701e949d077
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Mon Feb 14 18:29:58 2022 -0500
Update to 27.2.0 final
obs-studio.spec | 9 ++++++---
sources | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 65a14c8..6335642 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -6,13 +6,13 @@
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
Name: obs-studio
-Version: 27.2.0~rc4
+Version: 27.2.0
Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
URL: https://obsproject.com/
-Source0: https://github.com/obsproject/obs-studio/archive/%{version_no_tilde}/%{na...
+Source0: https://github.com/obsproject/obs-studio/archive/%{version}/%{name}-%{ver...
Source1: https://github.com/obsproject/obs-vst/archive/%{commit1}/obs-vst-%{shortc...
%if 0%{?fedora} && 0%{?fedora} > 35
@@ -89,7 +89,7 @@ Header files for Open Broadcaster Software
%prep
-%autosetup -p1 -n %{name}-%{version_no_tilde}
+%autosetup -p1
# rpmlint reports E: hardcoded-library-path
# replace OBS_MULTIARCH_SUFFIX by LIB_SUFFIX
@@ -141,6 +141,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%{_includedir}/obs/
%changelog
+* Mon Feb 14 2022 Neal Gompa <ngompa(a)fedoraproject.org> - 27.2.0-1
+- Update to 27.2.0 final
+
* Tue Feb 08 2022 Neal Gompa <ngompa(a)fedoraproject.org> - 27.2.0~rc4-1
- Update to 27.2.0~rc4
diff --git a/sources b/sources
index b468140..689c2ce 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (obs-studio-27.2.0-rc4.tar.gz) = c1324e4a2902a884a289f29ac6a1d377dad23742b6e8ccddf5ac889500c72bc575d18e77e7bf8b5684f49345217d8f81b3243de4daec6df3441f63d388022a00
+SHA512 (obs-studio-27.2.0.tar.gz) = 0f56e12d429c3208a9d200d085606dd401952a9a37d03ecf70e46d932fb8e907906b53c3a4ea7c9e10a3cbb3001bbd569163457d5bcb41eb8cce984b3c2b4d90
SHA512 (obs-vst-8ad3f64.tar.gz) = b3608e856668671d9e245c7bc5bfa24c5ed2a53cf78d71ca210885bea64d4057644e97d21c8ad0c08595c1ee7556a894a3684aa286279f75c618f60bd868505e
2 years, 10 months
[vice/f36] New upstream release 3.6.1
by jwrdegoede
Summary of changes:
4c8e0da... New upstream release 3.6.1 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
[vice] New upstream release 3.6.1
by jwrdegoede
commit 4c8e0da2e3f87fb9724eb7dd96c9a8dae56ed8f6
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon Feb 14 23:26:21 2022 +0100
New upstream release 3.6.1
.gitignore | 1 +
sources | 5 +-
vice-cflags-ldflags-mixup.patch | 25 ++++--
vice-datadir.patch | 23 -----
vice.rpmlintrc | 14 +++
vice.spec | 188 ++++++++++++++++++++++------------------
x128.desktop | 10 ---
x64.desktop | 10 ---
xcbm-ii.desktop | 10 ---
xpet.desktop | 10 ---
xplus4.desktop | 10 ---
xvic.desktop | 10 ---
12 files changed, 138 insertions(+), 178 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ea58a2..cf3d0e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ vice-2.4.28.tar.gz
/vice-3.1.tar.gz
/vice-3.2.tar.gz
/vice-3.4.tar.gz
+/vice-3.6.1.tar.gz
diff --git a/sources b/sources
index deb1268..800343e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-SHA512 (vice-3.4.tar.gz) = 3d42e7bbe15ec6efac918d11e354052048dac8efdeedc64bb724cb8aaf2dd8ec7a2fc176ddbc93722ce7c680f06d3966efc10587c24e9643238315ded025c4b8
-SHA512 (vice-largeicons.tar.bz2) = c17e8dd44ee04b1af8f9a3adf91e1a5e0292adde23f263c3df7c0abe8d2a1060f8bf53ce9d4d79206ae21514c164c73ddda577cfcae7b4c1059d0fe782e9ef6e
-SHA512 (vice-miniicons.tar.bz2) = d3552ff91898ff6e79dbcf53945966b65d572440ae6b8bffe0beda95cc65ea1e997b02d2fed51b93dd69a20129661465945322196f48e794a1db925fae4af731
-SHA512 (vice-normalicons.tar.bz2) = 7f5c4a6482d8ca4b5e5797f7ac16330087dedaf512a83372a94b710018f558ee6202e462b91a3dfadc782f26b1b57f1c0c1df50263e996b7c75fadd8db862c3c
+SHA512 (vice-3.6.1.tar.gz) = 9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
diff --git a/vice-cflags-ldflags-mixup.patch b/vice-cflags-ldflags-mixup.patch
index d376785..6affb5e 100644
--- a/vice-cflags-ldflags-mixup.patch
+++ b/vice-cflags-ldflags-mixup.patch
@@ -1,10 +1,9 @@
-Patch configure.proto to not use its own CFLAGS with our LDFLAGS when checking
-time_t size, this results in a compilation error building the test.
-Note we patch configure.proto as configure.ac gets generated from that.
-diff -up vice-3.4.gtk/configure.proto~ vice-3.4.gtk/configure.proto
---- vice-3.4.gtk/configure.proto~ 2020-08-22 16:39:21.000000000 +0200
-+++ vice-3.4.gtk/configure.proto 2020-08-22 16:45:20.070343974 +0200
-@@ -429,7 +429,6 @@ fi
+Patch configure.ac to not use its own CFLAGS with our LDFLAGS when checking
+time_t size / size of int, this results in a compilation error building the test.
+diff -durN vice-3.6.0-orig/configure.ac vice-3.6.0/configure.ac
+--- vice-3.6.0-orig/configure.ac 2021-12-24 20:27:40.000000000 +0100
++++ vice-3.6.0/configure.ac 2021-12-26 17:02:12.549832428 +0100
+@@ -528,7 +528,6 @@
old_CFLAGS="$CFLAGS"
@@ -12,3 +11,15 @@ diff -up vice-3.4.gtk/configure.proto~ vice-3.4.gtk/configure.proto
dnl Do these checks before any Gtk3 flags are added
AC_MSG_CHECKING(for time_t in time.h)
AC_CACHE_VAL(bu_cv_decl_time_t_time_h,
+diff -up vice-3.6.1/src/resid-dtv/configure.in~ vice-3.6.1/src/resid-dtv/configure.in
+--- vice-3.6.1/src/resid-dtv/configure.in~ 2022-01-24 01:13:25.000000000 +0100
++++ vice-3.6.1/src/resid-dtv/configure.in 2022-02-08 11:38:31.075122918 +0100
+@@ -40,7 +40,7 @@ AC_PROG_CXX([c++ g++ clang++])
+ dnl Set CXXFLAGS for g++. Use -fno-exceptions if supported.
+ if test "$GXX" = yes; then
+ if test "$ac_test_CXXFLAGS" != set; then
+- CXXFLAGS="-g -Wall -O2 -funroll-loops -fomit-frame-pointer -fno-exceptions"
++ CXXFLAGS="$CXXFLAGS -g -Wall -O2 -funroll-loops -fomit-frame-pointer -fno-exceptions"
+ AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
+ AC_TRY_COMPILE([],
+ [int test;],
diff --git a/vice.rpmlintrc b/vice.rpmlintrc
new file mode 100644
index 0000000..9de8476
--- /dev/null
+++ b/vice.rpmlintrc
@@ -0,0 +1,14 @@
+addFilter("incorrect-fsf-address")
+addFilter("no-manual-page-for-binary")
+addFilter("no-documentation")
+addFilter("binary-or-shlib-calls-gethostbyname")
+addFilter("files-duplicate")
+addFilter("no-binary")
+addFilter("use-of-RPM_SOURCE_DIR")
+# Because new rpmlint is very stupid about debuginfo pkgs <sigh>
+addFilter("dangling-relative-symlink")
+addFilter("shared-library-without-dependency-information")
+addFilter("hidden-file-or-dir")
+addFilter("missing-PT_GNU_STACK-section")
+addFilter("unstripped-binary-or-object")
+addFilter("statically-linked-binary")
diff --git a/vice.spec b/vice.spec
index 6a39bcf..ef6c698 100644
--- a/vice.spec
+++ b/vice.spec
@@ -1,40 +1,36 @@
%define _legacy_common_support 1
Name: vice
-Version: 3.4
-Release: 4%{?dist}
+Version: 3.6.1
+Release: 1%{?dist}
Summary: Emulator for a variety of Commodore 8bit machines
Group: Applications/Emulators
License: GPLv2+
URL: http://vice-emu.sourceforge.net/
Source0: http://downloads.sourceforge.net/vice-emu/%{name}-%{version}.tar.gz
-Source1: x128.desktop
-Source2: x64.desktop
-Source3: xcbm-ii.desktop
-Source4: xpet.desktop
-Source5: xplus4.desktop
-Source6: xvic.desktop
-Source7: vice-miniicons.tar.bz2
-Source8: vice-normalicons.tar.bz2
-Source9: vice-largeicons.tar.bz2
-Source10: x64.appdata.xml
-Source11: x128.metainfo.xml
-Source12: xcbm-ii.metainfo.xml
-Source13: xpet.metainfo.xml
-Source14: xplus4.metainfo.xml
-Source15: xvic.metainfo.xml
-Patch1: vice-datadir.patch
-Patch2: vice-cflags-ldflags-mixup.patch
+Source1: x64.appdata.xml
+Source2: x128.metainfo.xml
+Source3: xcbm-ii.metainfo.xml
+Source4: xpet.metainfo.xml
+Source5: xplus4.metainfo.xml
+Source6: xvic.metainfo.xml
+Patch0: vice-cflags-ldflags-mixup.patch
+
+BuildRequires: gcc-c++
+BuildRequires: automake
BuildRequires: gtk3-devel
BuildRequires: SDL2-devel
+BuildRequires: SDL2_image-devel
BuildRequires: libXext-devel
BuildRequires: libXrandr-devel
BuildRequires: libGL-devel
BuildRequires: glew-devel
-BuildRequires: giflib-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
+# The video recording code does not work with the new ffmpeg in F36
+%if 0%{?fedora} < 36
BuildRequires: ffmpeg-devel
+%endif
BuildRequires: x264-devel
BuildRequires: lame-devel
BuildRequires: flac-devel
@@ -52,11 +48,13 @@ BuildRequires: perl
BuildRequires: gettext
BuildRequires: info
BuildRequires: texinfo
+BuildRequires: texinfo-tex
BuildRequires: xa
+BuildRequires: dos2unix
+BuildRequires: xdg-utils
BuildRequires: desktop-file-utils
BuildRequires: xorg-x11-font-utils
BuildRequires: libappstream-glib
-BuildRequires: gcc-c++ automake
Requires: %{name}-x64 = %{version}-%{release}
Requires: %{name}-x128 = %{version}-%{release}
@@ -93,8 +91,9 @@ based sid music players.
%package x64
Summary: Vice Commodore 64 Emulator
-Provides: %{name}-engine
+Provides: %{name}-engine = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release}
+Requires: hicolor-icon-theme
%description x64
Vice Commodore 64 Emulator.
@@ -102,8 +101,9 @@ Vice Commodore 64 Emulator.
%package x128
Summary: Vice Commodore 128 Emulator
-Provides: %{name}-engine
+Provides: %{name}-engine = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release}
+Requires: hicolor-icon-theme
%description x128
Vice Commodore 128 Emulator.
@@ -111,8 +111,9 @@ Vice Commodore 128 Emulator.
%package xcbm-ii
Summary: Vice CBM-II (C610) Emulator
-Provides: %{name}-engine
+Provides: %{name}-engine = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release}
+Requires: hicolor-icon-theme
%description xcbm-ii
Vice CBM-II (C610) Emulator.
@@ -120,8 +121,9 @@ Vice CBM-II (C610) Emulator.
%package xpet
Summary: Vice Commodore PET Emulator
-Provides: %{name}-engine
+Provides: %{name}-engine = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release}
+Requires: hicolor-icon-theme
%description xpet
Vice Commodore PET Emulator.
@@ -129,8 +131,9 @@ Vice Commodore PET Emulator.
%package xplus4
Summary: Vice Commodore Plus-4 Emulator
-Provides: %{name}-engine
+Provides: %{name}-engine = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release}
+Requires: hicolor-icon-theme
%description xplus4
Vice Commodore Plus-4 Emulator.
@@ -138,8 +141,9 @@ Vice Commodore Plus-4 Emulator.
%package xvic
Summary: Vice Commodore VIC-20 Emulator
-Provides: %{name}-engine
+Provides: %{name}-engine = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release}
+Requires: hicolor-icon-theme
%description xvic
Vice Commodore VIC-20 Emulator.
@@ -150,15 +154,12 @@ Vice Commodore VIC-20 Emulator.
sed -i 's/\r//' `find -name "*.h"`
sed -i 's/\r//' `find -name "*.c"`
sed -i 's/\r//' `find -name "*.cc"`
-for i in man/*.1 doc/*.info* README AUTHORS; do
- iconv -f ISO-8859-1 -t UTF8 $i > $i.tmp
- touch -r $i $i.tmp
- mv $i.tmp $i
-done
-# Avoid "make distclean" removing this, as we need it
-mv doc/%{name}.pdf .
./autogen.sh
+# Fix desktop file generation
+sed -i "s/\([a-zA-Z0-9]*\)_[0-9]*\.svg/\1/" \
+ src/arch/gtk3/data/unix/Makefile.am
+
%build
# The build fails with linking errors when enabling LTO.
@@ -170,7 +171,13 @@ mv doc/%{name}.pdf .
# works around this, but this breaks LTO. So lets just disable LTO for now.
%define _lto_cflags %{nil}
-COMMON_FLAGS="--enable-ethernet --enable-parsid --enable-libieee1284 --without-oss --disable-arch --enable-external-ffmpeg"
+# The video recording code does not work with the new ffmpeg in F36
+# https://sourceforge.net/p/vice-emu/bugs/1697/
+%if 0%{?fedora} >= 36
+COMMON_FLAGS="--enable-x64 --enable-ethernet --enable-libieee1284 --disable-arch --enable-lame --with-mpg123 --with-flac --with-vorbis --with-jpeg"
+%else
+COMMON_FLAGS="--enable-x64 --enable-ethernet --enable-libieee1284 --disable-arch --enable-external-ffmpeg --enable-lame --with-mpg123 --with-flac --with-vorbis --with-jpeg"
+%endif
# Some of the code uses GNU / XOPEN libc extensions
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE=1"
@@ -178,9 +185,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE=1"
# Build SDL version
%configure --enable-sdlui2 $COMMON_FLAGS
-# Ensure the system versions of these are used
-mkdir src/lib/bak
-mv src/lib/lib* src/lib/ffmpeg src/lib/bak
%make_build
# Rename / save SDL binaries
for i in src/x*; do
@@ -188,18 +192,17 @@ for i in src/x*; do
done
# Reset source tree for building GTK version
-mv src/lib/bak/* src/lib
make distclean
# Build GTK version
-%configure --enable-native-gtk3ui $COMMON_FLAGS
-# Ensure the system versions of these are used
-rm -r src/lib/lib* src/lib/ffmpeg
+%configure --enable-native-gtk3ui --enable-desktop-files $COMMON_FLAGS
%make_build
%install
-%make_install VICEDIR=%{_datadir}/%{name}
+# Avoid the Makefiles .desktop file install as that installs them into
+# $HOME/.local/share/applications
+%make_install XDG_DESKTOP_MENU=/usr/bin/true
# Manual install SDL version
for i in src/x*.sdl; do
install -p -m 755 $i $RPM_BUILD_ROOT%{_bindir}
@@ -209,24 +212,17 @@ pushd data
cp -a --parents $i $RPM_BUILD_ROOT%{_datadir}/%{name}
done
popd
-
-rm $RPM_BUILD_ROOT%{_infodir}/dir
+# We cannot do this in %%prep because the autogen code for infocontrib.h expects
+# vice.texi to still be in ISO-8859-15
+FILE=$RPM_BUILD_ROOT%{_docdir}/%{name}/vice.texi
+iconv -f ISO-8859-15 -t UTF8 $FILE > $FILE.tmp
+touch -r $FILE $FILE.tmp
+mv $FILE.tmp $FILE
# vice installs a bunch of docs under /usr/share/doc/vice which are not really
# end user oriented. Remove these.
rm $RPM_BUILD_ROOT%{_docdir}/%{name}/*.txt
-rm $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYING
rm $RPM_BUILD_ROOT%{_docdir}/%{name}/GTK3-*.md
-rm $RPM_BUILD_ROOT%{_docdir}/%{name}/Lato-*
-
-# Fixup wrongly installed images for the html-docs
-mkdir $RPM_BUILD_ROOT%{_docdir}/%{name}/images
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/{*.png,*.gif,*.svg} \
- $RPM_BUILD_ROOT%{_docdir}/%{name}/images
-
-# For the manual entry in the help menu
-install -p -m 644 %{name}.pdf $RPM_BUILD_ROOT%{_docdir}/%{name}
-ln -s ../doc/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
# for use of the -data package with libsidplay bases sid players
mkdir -p $RPM_BUILD_ROOT%{_datadir}/sidplayfp
@@ -234,29 +230,42 @@ for i in basic chargen kernal; do
ln -s ../vice/C64/$i $RPM_BUILD_ROOT%{_datadir}/sidplayfp/$i
done
-# below is the desktop file and icon stuff.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+# Patch desktop files
+sed -i 's!Exec=/usr/bin/!Exec=!' \
+ src/arch/gtk3/data/unix/vice-org-*.desktop
+sed -i 's!Icon=/usr/share/vice/common/!Icon=!' \
+ src/arch/gtk3/data/unix/vice-org-*.desktop
+
+# Install desktop files
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+for i in src/arch/gtk3/data/unix/vice-org-*.desktop; do
+ desktop-file-install \
+ --add-category=Game \
+ --add-category=Emulator \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $i
+done
+
+# Install icons
+for c in C128 C64 CBM2 DTV PET Plus4 SCPU SID VIC20; do
+ for i in 16 24 32 48 64 256 ; do
+ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps
+ install -p -m 644 data/common/${c}_${i}.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/${c}.png
+ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
+ install -p -m 0644 data/common/${c}_*.svg \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/${c}.svg
+ done
+done
+
+# Install AppData files
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
for i in x64 x128 xcbm-ii xpet xplus4 xvic; do
- desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_SOURCE_DIR/$i.desktop
- install -p -m 0644 $RPM_SOURCE_DIR/$i.*.xml $RPM_BUILD_ROOT%{_datadir}/appdata
+ install -p -m 0644 $RPM_SOURCE_DIR/$i.*.xml \
+ $RPM_BUILD_ROOT%{_datadir}/appdata
appstream-util validate-relax --nonet \
$RPM_BUILD_ROOT%{_datadir}/appdata/$i.*.xml
done
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-tar xvfj %{SOURCE7}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-tar xvfj %{SOURCE8}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-tar xvfj %{SOURCE9}
-# remove "icon" from the icons name they are already in the icons dir.
-pushd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
-for i in */apps/*icon.png; do mv $i `echo $i|sed s/icon//`; done
-popd
%files
@@ -268,40 +277,48 @@ popd
%{_bindir}/cartconv
%{_bindir}/petcat
%{_bindir}/vsid
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_infodir}/%{name}.info*
-%{_mandir}/man1/*.1.gz
+%{_datadir}/applications/vice-org-vsid.desktop
+%{_datadir}/icons/hicolor/*/apps/SID.*
%files x64
%{_bindir}/x64*
%{_bindir}/xscpu64*
%{_datadir}/appdata/x64.appdata.xml
-%{_datadir}/applications/x64.desktop
+%{_datadir}/applications/vice-org-x64*.desktop
+%{_datadir}/applications/vice-org-xscpu64.desktop
+%{_datadir}/icons/hicolor/*/apps/C64.*
+%{_datadir}/icons/hicolor/*/apps/DTV.*
+%{_datadir}/icons/hicolor/*/apps/SCPU.*
%files x128
%{_bindir}/x128*
%{_datadir}/appdata/x128.metainfo.xml
-%{_datadir}/applications/x128.desktop
+%{_datadir}/applications/vice-org-x128.desktop
+%{_datadir}/icons/hicolor/*/apps/C128.*
%files xcbm-ii
%{_bindir}/xcbm*
%{_datadir}/appdata/xcbm-ii.metainfo.xml
-%{_datadir}/applications/xcbm-ii.desktop
+%{_datadir}/applications/vice-org-xcbm*.desktop
+%{_datadir}/icons/hicolor/*/apps/CBM2.*
%files xpet
%{_bindir}/xpet*
%{_datadir}/appdata/xpet.metainfo.xml
-%{_datadir}/applications/xpet.desktop
+%{_datadir}/applications/vice-org-xpet.desktop
+%{_datadir}/icons/hicolor/*/apps/PET.*
%files xplus4
%{_bindir}/xplus4*
%{_datadir}/appdata/xplus4.metainfo.xml
-%{_datadir}/applications/xplus4.desktop
+%{_datadir}/applications/vice-org-xplus4.desktop
+%{_datadir}/icons/hicolor/*/apps/Plus4.*
%files xvic
%{_bindir}/xvic*
%{_datadir}/appdata/xvic.metainfo.xml
-%{_datadir}/applications/xvic.desktop
+%{_datadir}/applications/vice-org-xvic.desktop
+%{_datadir}/icons/hicolor/*/apps/VIC20.*
%files data
%{_datadir}/%{name}
@@ -309,6 +326,9 @@ popd
%changelog
+* Mon Feb 14 2022 Andrea Musuruane <musuruan(a)gmail.com> - 3.6.1-1
+- New upstream release 3.6.1
+
* Thu Feb 10 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
@@ -321,7 +341,7 @@ popd
* Sat Aug 22 2020 Hans de Goede <j.w.r.degoede(a)gmail.com> - 3.4-1
- New upstream release 3.4
- Fix Fedora 33 FTBFS
-- Remove obsolete gtk-icon-cache and instlal-info scriptlets
+- Remove obsolete gtk-icon-cache and install-info scriptlets
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
2 years, 10 months
