[kodi-peripheral-joystick] Minor cleanups from package submission code review
by Wade Berrier
commit 7eead5d09c6bddc6a31d524e8df7c71e07809bd6
Author: Wade Berrier <wberrier(a)gmail.com>
Date: Mon Oct 23 22:31:02 2017 -0600
Minor cleanups from package submission code review
.gitignore | 1 +
kodi-peripheral-joystick.spec | 50 +++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 52 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..2283809 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/peripheral.joystick-1.3.2.tar.gz
diff --git a/kodi-peripheral-joystick.spec b/kodi-peripheral-joystick.spec
new file mode 100644
index 0000000..0971d21
--- /dev/null
+++ b/kodi-peripheral-joystick.spec
@@ -0,0 +1,50 @@
+%global kodi_addon peripheral.joystick
+%global kodi_version 17.4
+%global kodi_platform_version 17.0
+
+Name: kodi-peripheral-joystick
+Version: 1.3.2
+Release: 2%{?dist}
+Summary: Joystick Peripheral addon for Kodi
+
+Group: Applications/Multimedia
+License: GPLv2+
+URL: https://github.com/xbmc/%{kodi_addon}/
+Source0: %{url}/archive/%{kodi_addon}-%{version}.tar.gz
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: kodi-devel >= %{kodi_version}
+BuildRequires: kodi-platform-devel >= %{kodi_platform_version}
+BuildRequires: platform-devel
+Requires: kodi >= %{kodi_version}
+ExclusiveArch: i686 x86_64
+
+%description
+Joystick Peripheral Addon for Kodi
+
+
+%prep
+%autosetup -n %{kodi_addon}-%{version} -p0
+
+
+%build
+%cmake -DCMAKE_INSTALL_LIBDIR=%{_libdir}/kodi/ .
+%make_build
+
+
+%install
+%make_install
+
+
+%files
+%{_libdir}/kodi/addons/%{kodi_addon}/
+%{_datadir}/kodi/addons/%{kodi_addon}/
+
+
+%changelog
+* Sat Sep 16 2017 Wade Berrier <wberrier(a)gmail.com> - 1:1.3.2-2
+- Minor cleanups from package submission code review
+
+* Thu Aug 17 2017 Wade Berrier <wberrier(a)gmail.com> - 1:1.3.2-1
+- Initial package
diff --git a/sources b/sources
index e69de29..13455e8 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+f3c14ccd6fb4204ae701459869e514a2 peripheral.joystick-1.3.2.tar.gz
6 years, 6 months
[mplayer] Exclude ix86 (rfbz #4687)
by Leigh Scott
commit 767e04e087ed0c767b3b8c104c5d5d03df3a9309
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Oct 23 21:57:03 2017 +0100
Exclude ix86 (rfbz #4687)
mplayer.spec | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/mplayer.spec b/mplayer.spec
index a210ef2..9fafa45 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -7,9 +7,9 @@
Name: mplayer
Version: 1.3.0
%if 0%{?svn}
-Release: 42.%{?pre}%{?dist}
+Release: 43.%{?pre}%{?dist}
%else
-Release: 12%{?dist}
+Release: 13%{?dist}
%endif
Summary: Movie player playing most video formats and DVDs
@@ -43,6 +43,8 @@ Patch4: %{name}-fix-screenshot-crash.patch
Patch5: %{name}-fix-vo_png.patch
Patch6: %{name}-add-include_vdpau_x11.patch
+ExcludeArch: %{ix86}
+
BuildRequires: SDL-devel
BuildRequires: a52dec-devel
BuildRequires: aalib-devel
@@ -393,6 +395,9 @@ update-desktop-database &>/dev/null || :
%{_datadir}/mplayer/*.fp
%changelog
+* Mon Oct 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.0-13
+- Exclude ix86 (rfbz #4687)
+
* Tue Oct 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.0-12
- Rebuild for ffmpeg update
- Add build upstream build fix for newer ffmpeg
6 years, 6 months
[vice] New upstream release 3.1 (rfbz #4528 #4429)
by Leigh Scott
commit 67a4aead78d71d13f2c9391f115e3a81a7cfe6eb
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Oct 22 10:42:16 2017 +0100
New upstream release 3.1 (rfbz #4528 #4429)
.gitignore | 1 +
sources | 2 +-
vice-2.4.28-sdl-build-fix.patch | 11 ----------
vice-norpath.patch | 12 +++++------
vice.spec | 45 +++++++++++++++++++++++++++++------------
5 files changed, 40 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5bd5a6e..f9339a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ vice-normalicons.tar.bz2
vice-2.4.tar.gz
vice-2.4.24.tar.gz
vice-2.4.28.tar.gz
+/vice-3.1.tar.gz
diff --git a/sources b/sources
index 655855c..2df2c89 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
+f9018ca464b863da0bb1a82c56374432 vice-3.1.tar.gz
a4936bbfe1cc7b37d4fd93f0901de974 vice-largeicons.tar.bz2
c944e3eeaac9c3962983423f8e7609e7 vice-miniicons.tar.bz2
1e024cef652bc4bf929905b182ef689b vice-normalicons.tar.bz2
-533554f5d7680b85c0954e4d4811274a vice-2.4.28.tar.gz
diff --git a/vice-norpath.patch b/vice-norpath.patch
index 1bb4154..d5f84de 100644
--- a/vice-norpath.patch
+++ b/vice-norpath.patch
@@ -1,14 +1,14 @@
-diff -up vice-2.4.28/configure.norpath vice-2.4.28/configure
---- vice-2.4.28/configure.norpath 2016-06-27 18:52:10.952861895 +0200
-+++ vice-2.4.28/configure 2016-06-27 18:54:24.674315069 +0200
-@@ -24620,10 +24620,6 @@ _ACEOF
+diff -up vice-3.1/configure vice-3.1/configure.norpath
+--- vice-3.1/configure 2017-03-30 22:40:32.000000000 +0200
++++ vice-3.1/configure.norpath 2017-05-01 22:51:24.594241129 +0200
+@@ -25531,10 +25531,6 @@ _ACEOF
-# Add path with private dynamic ffmpeg libs to the search path
--rpath_line=`${CONFIG_SHELL-/bin/sh} config.rpath "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "$VICEDIR/lib"`
+-rpath_line=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "$VICEDIR/lib"`
-LDFLAGS="$LDFLAGS $rpath_line"
-
- ac_config_files="$ac_config_files Makefile vice.spec vice-gtk.spec vice-mint.spec vice-mint-sdl.spec build/Makefile build/amigaos/Makefile build/android/build-android.sh build/android/Makefile build/beos/Makefile build/macosx/Makefile build/mingw32/Makefile build/minix3/Makefile build/nextstep/Makefile build/openstep/Makefile build/openwatcom/Makefile build/qnx4/Makefile build/rhapsody/Makefile data/Makefile data/C128/Makefile data/C64/Makefile data/C64DTV/Makefile data/CBM-II/Makefile data/DRIVES/Makefile data/PET/Makefile data/PLUS4/Makefile data/SCPU64/Makefile data/PRINTER/Makefile data/VIC20/Makefile data/fonts/Makefile doc/Makefile doc/building/Makefile doc/html/Makefile doc/readmes/Makefile man/Makefile src/Makefile src/debug.h src/gentranslate_h.sh src/arch/Makefile src/arch/amigaos/Makefile src/arch/amigaos/genintl_h.sh src/arch/amigaos/info-files/Makefile src/arch/amigaos/info-files/morphos/Makefile src/arch/amigaos/mui/Makefile src/arch/android/Makefile src/arch/android/
AnVICE/AndroidManifest.xml src/arch/android/AnVICE/Makefile src/arch/android/AnVICE/.settings/Makefile src/arch/android/AnVICE/assets-proto/Makefile src/arch/android/AnVICE/jni/Makefile src/arch/android/AnVICE/jni/locnet/Makefile src/arch/android/AnVICE/jni/locnet_x64/Makefile src/arch/android/AnVICE/jni/locnet_x64dtv/Makefile src/arch/android/AnVICE/jni/locnet_x64sc/Makefile src/arch/android/AnVICE/jni/locnet_x128/Makefile src/arch/android/AnVICE/jni/locnet_xcbm2/Makefile src/arch/android/AnVICE/jni/locnet_xcbm5x0/Makefile src/arch/android/AnVICE/jni/locnet_xpet/Makefile src/arch/android/AnVICE/jni/locnet_xplus4/Makefile src/arch/android/AnVICE/jni/locnet_xscpu64/Makefile src/arch/android/AnVICE/jni/locnet_xvic/Makefile src/arch/android/AnVICE/jni/locnet_al/Makefile src/arch/android/AnVICE/jni/sdl/Makefile src/arch/android/AnVICE/jni/vice_c64cart/Makefile src/arch/android/AnVICE/jni/vice_c64exp/Makefile src/arch/android/AnVICE/jni/vice_cbm2common/Makefile src/arch/android/AnVICE/jn
i/vice_common/Makefile src/arch/android/AnVICE/jni/vice_commonall/Makefile src/arch/android/AnVICE/jni/vice_commoncart/Makefile src/arch/android/AnVICE/jni/vice_crtc/Makefile src/arch/android/AnVICE/jni/vice_iec/Makefile src/arch/android/AnVICE/jni/vice_ieeepar/Makefile src/arch/android/AnVICE/jni/vice_tape/Makefile src/arch/android/AnVICE/jni/vice_vicii/Makefile src/arch/android/AnVICE/jni/vice_viciisc/Makefile src/arch/android/AnVICE/jni/vice_x128/Makefile src/arch/android/AnVICE/jni/vice_x64/Makefile src/arch/android/AnVICE/jni/vice_x64dtv/Makefile src/arch/android/AnVICE/jni/vice_x64sc/Makefile src/arch/android/AnVICE/jni/vice_xcbm2/Makefile src/arch/android/AnVICE/jni/vice_xcbm5x0/Makefile src/arch/android/AnVICE/jni/vice_xpet/Makefile src/arch/android/AnVICE/jni/vice_xplus4/Makefile src/arch/android/AnVICE/jni/vice_xscpu64/Makefile src/arch/android/AnVICE/jni/vice_xvic/Makefile src/arch/android/AnVICE/res-proto/Makefile src/arch/android/AnVICE/res-proto/layout/Makefile src/arc
h/android/AnVICE/res-proto/values/Makefile src/arch/android/AnVICE/src-proto/Makefile src/arch/android/AnVICE/src-proto/com/Makefile src/arch/android/AnVICE/src-proto/com/locnet/Makefile src/arch/android/AnVICE/src-proto/com/locnet/vice/Makefile src/arch/beos/Makefile src/arch/msdos/Makefile src/arch/os2/Makefile src/arch/os2/dialogs/Makefile src/arch/os2/doc/Makefile src/arch/os2/fonts/Makefile src/arch/os2/icons/Makefile src/arch/os2/kbd/Makefile src/arch/os2/snippets/Makefile src/arch/os2/unused/Makefile src/arch/os2/unused/pm/Makefile src/arch/os2/watcom/Makefile src/arch/sdl/Makefile src/arch/sdl/dingoo-files/Makefile src/arch/sdl/msvc-files/Makefile src/arch/sdl/qnx4/Makefile src/arch/sdl/syllable-files/Makefile src/arch/sdl/win32-watcom/Makefile src/arch/unix/Makefile src/arch/unix/gui/Makefile src/arch/unix/hpux/Makefile src/arch/unix/minix/Makefile src/arch/unix/next_open_rhap/Makefile src/arch/unix/next_open_rhap/vice.info src/arch/unix/qnx4/Makefile src/arch/unix/qnx6/Mak
efile src/arch/unix/readline/Makefile src/arch/unix/sco_sol/Makefile src/arch/unix/skyos/Makefile src/arch/unix/skyos/icons/Makefile src/arch/unix/x11/Makefile src/arch/unix/x11/gnome/Makefile src/arch/unix/x11/xaw/Makefile src/arch/unix/x11/xaw/widgets/Makefile src/arch/unix/macosx/Makefile src/arch/unix/macosx/cocoa/Makefile src/arch/unix/macosx/cocoa/view/Makefile src/arch/unix/macosx/cocoa/menu/Makefile src/arch/unix/macosx/cocoa/dialog/Makefile src/arch/unix/macosx/Resources/Makefile src/arch/unix/macosx/Resources/English.lproj/Makefile src/arch/watcom-source-wrappers/Makefile src/arch/win32/Makefile src/arch/win32/vice-version.bat src/arch/win32/evc/Makefile src/arch/win32/mingw32/Makefile src/arch/win32/msvc/Makefile src/arch/win32/msvc/wpcap/Makefile src/arch/win32/msvc/wpcap/net/Makefile src/arch/win32/utils/Makefile src/arch/win32/vs_tmpl/Makefile src/arch/win32/watcom/Makefile src/c128/Makefile src/c64/Makefile src/c64/cart/Makefile src/c64dtv/Makefile src/scpu64/Makefile
src/cbm2/Makefile src/core/Makefile src/crtc/Makefile src/diskimage/Makefile src/drive/Makefile src/drive/iec/Makefile src/drive/iec/c64exp/Makefile src/drive/iec/plus4exp/Makefile src/drive/iec128dcr/Makefile src/drive/iecieee/Makefile src/drive/ieee/Makefile src/drive/tcbm/Makefile src/fileio/Makefile src/fsdevice/Makefile src/gfxoutputdrv/Makefile src/iecbus/Makefile src/imagecontents/Makefile src/joyport/Makefile src/lib/Makefile src/lib/ffmpeg/Makefile src/lib/p64/Makefile src/monitor/Makefile src/parallel/Makefile src/pet/Makefile src/platform/Makefile src/plus4/Makefile src/printerdrv/Makefile src/raster/Makefile src/rs232drv/Makefile src/rtc/Makefile src/samplerdrv/Makefile src/serial/Makefile src/sid/Makefile src/sounddrv/Makefile src/tape/Makefile src/tapeport/Makefile src/userport/Makefile src/vdc/Makefile src/vdrive/Makefile src/vic20/Makefile src/vic20/cart/Makefile src/vicii/Makefile src/viciisc/Makefile src/viciivsid/Makefile src/video/Makefile src/version.h po/Makef
ile.in"
+ ac_config_files="$ac_config_files Makefile vice.spec vice-gtk.spec vice-mint.spec vice-mint-sdl.spec build/Makefile build/amigaos/Makefile build/android/Makefile build/beos/Makefile build/macosx/Makefile build/mingw32/Makefile build/minix3/Makefile build/nextstep/Makefile build/openstep/Makefile build/openwatcom/Makefile build/qnx4/Makefile build/rhapsody/Makefile data/Makefile data/C128/Makefile data/C64/Makefile data/C64DTV/Makefile data/CBM-II/Makefile data/DRIVES/Makefile data/PET/Makefile data/PLUS4/Makefile data/SCPU64/Makefile data/PRINTER/Makefile data/VIC20/Makefile data/fonts/Makefile doc/Makefile doc/building/Makefile doc/html/Makefile doc/readmes/Makefile man/Makefile src/Makefile src/debug.h src/arch/Makefile src/arch/amigaos/Makefile src/arch/amigaos/info-files/Makefile src/arch/amigaos/info-files/morphos/Makefile src/arch/amigaos/mui/Makefile src/arch/android/Makefile src/arch/android/AnVICE/AndroidManifest.xml src/arch/android/AnVICE/Makefile src/arch/android/AnVICE
/.settings/Makefile src/arch/android/AnVICE/assets-proto/Makefile src/arch/android/AnVICE/jni/Makefile src/arch/android/AnVICE/jni/locnet/Makefile src/arch/android/AnVICE/jni/locnet_x64/Makefile src/arch/android/AnVICE/jni/locnet_x64dtv/Makefile src/arch/android/AnVICE/jni/locnet_x64sc/Makefile src/arch/android/AnVICE/jni/locnet_x128/Makefile src/arch/android/AnVICE/jni/locnet_xcbm2/Makefile src/arch/android/AnVICE/jni/locnet_xcbm5x0/Makefile src/arch/android/AnVICE/jni/locnet_xpet/Makefile src/arch/android/AnVICE/jni/locnet_xplus4/Makefile src/arch/android/AnVICE/jni/locnet_xscpu64/Makefile src/arch/android/AnVICE/jni/locnet_xvic/Makefile src/arch/android/AnVICE/jni/locnet_al/Makefile src/arch/android/AnVICE/jni/sdl/Makefile src/arch/android/AnVICE/jni/vice_x64/Makefile src/arch/android/AnVICE/jni/vice_x64_128_5x0/Makefile src/arch/android/AnVICE/jni/vice_x64_dtv_128_5x0/Makefile src/arch/android/AnVICE/jni/vice_x64_sc/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_128/Makefile s
rc/arch/android/AnVICE/jni/vice_x64_sc_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_pet_4/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2/Makefile src/arch/andr
oid/AnVICE/jni/vice_x64_sc_scpu_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2_pet_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_4/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_5x0_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64dtv/Makefile src/arch/android/AnVICE/jni/vice_x64sc/Makefile src/arch/android/AnVICE/jni/vice_x64sc_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64sc_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x128/Makefile src/arch/android/AnVICE/jni/vice_x128_2_5x0_pet/Makefile src/arch/android/AnVICE/jni/vice_xcbm2/Makefile src/arch/android/AnVICE/jni/vice_xcbm2_5x0/Makefile src/arch/android/AnVICE/jni/vice_xcbm2_pet/Makefile src/arch/android/AnVICE/jni/vice_xcbm5x0/Makefile src/arch/android/AnVICE/jni/vice_xpet/Makefile src/arch/android/AnVICE/jni/vice_xplus4/Ma
kefile src/arch/android/AnVICE/jni/vice_xscpu64/Makefile src/arch/android/AnVICE/jni/vice_xvic/Makefile src/arch/android/AnVICE/res-proto/Makefile src/arch/android/AnVICE/res-proto/layout/Makefile src/arch/android/AnVICE/res-proto/values/Makefile src/arch/android/AnVICE/src-proto/Makefile src/arch/android/AnVICE/src-proto/com/Makefile src/arch/android/AnVICE/src-proto/com/locnet/Makefile src/arch/android/AnVICE/src-proto/com/locnet/vice/Makefile src/arch/beos/Makefile src/arch/gtk3/Makefile src/arch/msdos/Makefile src/arch/os2/Makefile src/arch/os2/dialogs/Makefile src/arch/os2/doc/Makefile src/arch/os2/fonts/Makefile src/arch/os2/icons/Makefile src/arch/os2/kbd/Makefile src/arch/os2/snippets/Makefile src/arch/os2/unused/Makefile src/arch/os2/unused/pm/Makefile src/arch/os2/watcom/Makefile src/arch/sdl/Makefile src/arch/sdl/msvc-files/Makefile src/arch/sdl/qnx4/Makefile src/arch/sdl/sortix-files/Makefile src/arch/sdl/syllable-files/Makefile src/arch/sdl/win32-watcom/Makefile src/arc
h/unix/Makefile src/arch/unix/gui/Makefile src/arch/unix/minix/Makefile src/arch/unix/next_open_rhap/Makefile src/arch/unix/next_open_rhap/vice.info src/arch/unix/qnx4/Makefile src/arch/unix/qnx6/Makefile src/arch/unix/readline/Makefile src/arch/unix/sco_sol/Makefile src/arch/unix/skyos/Makefile src/arch/unix/skyos/icons/Makefile src/arch/unix/x11/Makefile src/arch/unix/x11/gnome/Makefile src/arch/unix/x11/xaw/Makefile src/arch/unix/x11/xaw/widgets/Makefile src/arch/unix/macosx/Makefile src/arch/unix/macosx/cocoa/Makefile src/arch/unix/macosx/cocoa/view/Makefile src/arch/unix/macosx/cocoa/menu/Makefile src/arch/unix/macosx/cocoa/dialog/Makefile src/arch/unix/macosx/Resources/Makefile src/arch/unix/macosx/Resources/English.lproj/Makefile src/arch/watcom-source-wrappers/Makefile src/arch/win32/Makefile src/arch/win32/vice-version.bat src/arch/win32/evc/Makefile src/arch/win32/mingw32/Makefile src/arch/win32/msvc/Makefile src/arch/win32/msvc/wpcap/Makefile src/arch/win32/msvc/wpcap/net
/Makefile src/arch/win32/utils/Makefile src/arch/win32/vs_tmpl/Makefile src/arch/win32/watcom/Makefile src/buildtools/Makefile src/c128/Makefile src/c64/Makefile src/c64/cart/Makefile src/c64dtv/Makefile src/scpu64/Makefile src/cbm2/Makefile src/core/Makefile src/crtc/Makefile src/diag/Makefile src/diskimage/Makefile src/drive/Makefile src/drive/iec/Makefile src/drive/iec/c64exp/Makefile src/drive/iec/plus4exp/Makefile src/drive/iec128dcr/Makefile src/drive/iecieee/Makefile src/drive/ieee/Makefile src/drive/tcbm/Makefile src/fileio/Makefile src/fsdevice/Makefile src/gfxoutputdrv/Makefile src/hwsiddrv/Makefile src/iecbus/Makefile src/imagecontents/Makefile src/iodrv/Makefile src/joyport/Makefile src/lib/Makefile src/lib/ffmpeg/Makefile src/lib/p64/Makefile src/mididrv/Makefile src/monitor/Makefile src/parallel/Makefile src/pet/Makefile src/platform/Makefile src/plus4/Makefile src/printerdrv/Makefile src/raster/Makefile src/rs232drv/Makefile src/rtc/Makefile src/samplerdrv/Makefile sr
c/serial/Makefile src/sid/Makefile src/socketdrv/Makefile src/sounddrv/Makefile src/tape/Makefile src/tapeport/Makefile src/userport/Makefile src/vdc/Makefile src/vdrive/Makefile src/vic20/Makefile src/vic20/cart/Makefile src/vicii/Makefile src/viciisc/Makefile src/viciivsid/Makefile src/video/Makefile src/version.h src/vice-version.sh po/Makefile.in"
cat >confcache <<\_ACEOF
diff --git a/vice.spec b/vice.spec
index 143bd21..69049d6 100644
--- a/vice.spec
+++ b/vice.spec
@@ -1,6 +1,6 @@
Name: vice
-Version: 2.4.28
-Release: 3%{?dist}
+Version: 3.1
+Release: 1%{?dist}
Summary: Emulator for a variety of Commodore 8bit machines
Group: Applications/Emulators
License: GPLv2+
@@ -24,16 +24,33 @@ Source15: xvic.metainfo.xml
Patch1: vice-2.4.24-datadir.patch
Patch2: vice-htmlview.patch
Patch3: vice-norpath.patch
-Patch4: vice-2.4.28-sdl-build-fix.patch
-BuildRequires: libXt-devel libXext-devel libXxf86vm-devel libXxf86dga-devel
+BuildRequires: libXt-devel
+BuildRequires: libXext-devel
+BuildRequires: libXxf86vm-devel
+BuildRequires: libXxf86dga-devel
BuildRequires: libXrandr-devel
-BuildRequires: giflib-devel libjpeg-devel libpng-devel
-BuildRequires: libgnomeui-devel gtkglext-devel vte-devel
-BuildRequires: ffmpeg-devel lame-devel
-BuildRequires: readline-devel SDL-devel alsa-lib-devel pulseaudio-libs-devel
-BuildRequires: libieee1284-devel libpcap-devel
-BuildRequires: bison flex gettext info desktop-file-utils xorg-x11-font-utils
+BuildRequires: giflib-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libgnomeui-devel
+BuildRequires: gtkglext-devel
+BuildRequires: vte-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: lame-devel
+BuildRequires: readline-devel
+BuildRequires: SDL-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: libieee1284-devel
+BuildRequires: libpcap-devel
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: gettext
+BuildRequires: info
+BuildRequires: desktop-file-utils
+BuildRequires: xorg-x11-font-utils
BuildRequires: libappstream-glib
+
Requires: %{name}-x64 = %{version}-%{release}
Requires: %{name}-x128 = %{version}-%{release}
Requires: %{name}-xcbm-ii = %{version}-%{release}
@@ -130,7 +147,6 @@ sed -i 's/\r//' `find -name "*.cc"`
%patch1 -p1 -z .datadir
%patch2 -p1 -z .htmlview
%patch3 -p1 -z .norpath
-%patch4 -p1 -z .norpath
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
@@ -154,14 +170,14 @@ pushd %{name}-%{version}.gtk
%configure --enable-gnomeui --enable-fullscreen $COMMON_FLAGS
# Ensure the system versions of these are used
rm -r src/lib/lib* src/lib/ffmpeg
- make %{?_smp_mflags}
+ %make_build
popd
pushd %{name}-%{version}.sdl
%configure --enable-sdlui $COMMON_FLAGS
# Ensure the system versions of these are used
rm -r src/lib/lib* src/lib/ffmpeg
- make %{?_smp_mflags}
+ %make_build
popd
@@ -295,6 +311,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Oct 22 2017 Roland Hermans <rolandh(a)users.sourceforge.net> - 3.1-1
+- New upstream release 3.1 (rfbz #4528 #4429)
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.4.28-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
6 years, 6 months
[megamario] New upstream release 1.7 (rfbz #4526)
by Leigh Scott
commit 82b1b8ea4b32e4d681d6da60df3a67949106dca4
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Oct 22 10:09:17 2017 +0100
New upstream release 1.7 (rfbz #4526)
.gitignore | 1 +
megamario.spec | 52 +++++++++++++++++++++++++++++-----------------------
sources | 2 +-
3 files changed, 31 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a8b8ec6..2b8f4a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
MegaMario_v1.5_w32_linux.zip
+/MegaMario_v1.7_full.zip
diff --git a/megamario.spec b/megamario.spec
index 2d4e060..2a61219 100644
--- a/megamario.spec
+++ b/megamario.spec
@@ -1,16 +1,19 @@
Name: megamario
-Version: 1.5
-Release: 9%{?dist}
+Version: 1.7
+Release: 1%{?dist}
Summary: Well known platform game clone
Group: Amusements/Games
-License: LGPL+
+License: LGPLv2
URL: http://mmario.sourceforge.net/
-Source0: http://downloads.sourceforge.net/mmario/MegaMario_v1.5_w32_linux.zip
+Source0: http://downloads.sourceforge.net/mmario/MegaMario_v%{version}_full.zip
Source1: %{name}.desktop
Patch0: megamario-1.5-compile-fix.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL_mixer-devel SDL_image-devel SDL_ttf-devel
-BuildRequires: ImageMagick desktop-file-utils
+
+BuildRequires: SDL_mixer-devel
+BuildRequires: SDL_image-devel
+BuildRequires: SDL_ttf-devel
+BuildRequires: ImageMagick
+BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
%description
@@ -26,21 +29,20 @@ sed -i 's/\r//' *.txt
%build
-make %{?_smp_mflags} PREFIX=%{_prefix} \
- CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
+%make_build PREFIX=%{_prefix} \
+ CFLAGS="$RPM_OPT_FLAGS -fsigned-char" \
+ LDFLAGS="-lSDL -lSDL_mixer -lSDL_ttf -lSDL_image -lGL $RPM_LD_FLAGS"
convert -transparent '#FF00FF' data/gfx/characters/small/player1r.PNG \
%{name}.png
%install
-rm -rf $RPM_BUILD_ROOT
make install PREFIX=$RPM_BUILD_ROOT%{_prefix}
# cruft removal
rm $RPM_BUILD_ROOT%{_datadir}/megamario/levels/1/1
-rm $RPM_BUILD_ROOT%{_datadir}/megamario/levels/11/maiin
+rm $RPM_BUILD_ROOT%{_datadir}/megamario/levels/11/mai
rm $RPM_BUILD_ROOT%{_datadir}/megamario/save.sav
-rm $RPM_BUILD_ROOT%{_datadir}/megamario/sfx/jump.gpk
-rm $RPM_BUILD_ROOT%{_datadir}/megamario/gfx/tiles/pipes/left/Desktop.ini
+
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -52,22 +54,22 @@ install -p -m 644 %{name}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%defattr(-,root,root,-)
-%doc CONTROLS.txt licence.txt readme.txt fixes_v1.5.txt
+%doc CONTROLS.txt readme.txt fixes_v%{version}.txt
+%license licence.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
@@ -75,6 +77,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
%changelog
+* Sun Oct 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.7-1
+- New upstream release 1.7 (rfbz #4526)
+- Clean up spec file
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/sources b/sources
index 26dbb85..d976ec8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-45853daeba399fe67bcb289d3543641d MegaMario_v1.5_w32_linux.zip
+9550b20f7c2754cd8f94ebf309becf62 MegaMario_v1.7_full.zip
6 years, 6 months
