The package rpms/ocp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ocp.git/commit/?id=fd3fb9ff056f2b....
Change:
-%ifarch %{ix86}
Thanks.
Full change:
============
commit fd3fb9ff056f2bad859812f49db629ded690159e
Author: Charles R. Anderson <cra(a)alum.wpi.edu>
Date: Sat Mar 26 14:33:12 2022 -0400
Remove possibility to build i386 assembly version
New upstream on github
Update to 0.2.1
diff --git a/.gitignore b/.gitignore
index 3c98ad8..353b674 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ opencp25image1.zip
/ocp-0.1.22-20150224gita07bf5d.tar.bz2
/opencubicplayer-code-e62ae525f16712fdbb9f655383071d0d683d3dc9.zip
/opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91.zip
+/ocp-0.2.1.tar.bz2
diff --git a/ocp-0.1.20-docdir.patch b/ocp-0.1.20-docdir.patch
deleted file mode 100644
index 1aedbc0..0000000
--- a/ocp-0.1.20-docdir.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -up ocp-0.1.20/doc/texi/Makefile.docdir ocp-0.1.20/doc/texi/Makefile
---- ocp-0.1.20/doc/texi/Makefile.docdir 2010-05-17 05:55:16.000000000 -0400
-+++ ocp-0.1.20/doc/texi/Makefile 2013-08-06 18:04:28.506454302 -0400
-@@ -19,12 +19,12 @@ install: all
- mkdir -p "$(DESTDIR)$(INFODIR)"
- $(CP) ocp.info.gz "$(DESTDIR)$(INFODIR)"
- install-info --dir-file="$(DESTDIR)$(INFODIR)/dir"
"$(DESTDIR)$(INFODIR)/ocp.info.gz" || true
-- mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
-- $(CP) -R ocp.html/* "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
-+ mkdir -p "$(DESTDIR)$(DOCDIR)/html"
-+ $(CP) -R ocp.html/* "$(DESTDIR)$(DOCDIR)/html"
- uninstall:
- install-info --delete --dir-file="$(DESTDIR)$(INFODIR)/dir"
"$(DESTDIR)$(INFODIR)/ocp.info.gz"
- rm -f "$(DESTDIR)$(INFODIR)/ocp.info.gz"
-- rm -Rf "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
-+ rm -Rf "$(DESTDIR)$(DOCDIR)/html"
- else
- all:
-
-diff -up ocp-0.1.20/Makefile.in.docdir ocp-0.1.20/Makefile.in
---- ocp-0.1.20/Makefile.in.docdir 2010-05-17 05:55:17.000000000 -0400
-+++ ocp-0.1.20/Makefile.in 2013-08-06 18:00:54.994677835 -0400
-@@ -35,8 +35,8 @@ endif
-
-
- install: all
-- mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
-- $(CP) AUTHORS BUGS COPYING CREDITS KEYBOARD_REMAPS SUID TODO
"$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
-+ mkdir -p "$(DESTDIR)$(DOCDIR)"
-+ $(CP) AUTHORS BUGS COPYING CREDITS KEYBOARD_REMAPS SUID TODO
"$(DESTDIR)$(DOCDIR)"
- mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data"
- $(CP) ocp.hlp "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data"
- mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/etc"
-@@ -131,7 +131,7 @@ endif
- $(MAKE) -C stuff TOPDIR=../$(TOPDIR) uninstall
- $(MAKE) -C medialib TOPDIR=../$(TOPDIR) uninstall
- $(MAKE) -C doc TOPDIR="../$(TOPDIR)" uninstall
-- rm -Rf "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
"$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(LIBDIR)"
"$(DESTDIR)$(BINDIR)/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(BINDIR)/ocp"
"$(DESTDIR)$(BINDIR)/ocp-curses" "$(DESTDIR)$(BINDIR)/ocp-sdl"
"$(DESTDIR)$(BINDIR)/ocp-vcsa" "$(DESTDIR)$(BINDIR)/ocp-x11"
"$(DESTDIR)$(BINDIR)/ultrafix.sh"
-+ rm -Rf "$(DESTDIR)$(DOCDIR)"
"$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(LIBDIR)"
"$(DESTDIR)$(BINDIR)/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(BINDIR)/ocp"
"$(DESTDIR)$(BINDIR)/ocp-curses" "$(DESTDIR)$(BINDIR)/ocp-sdl"
"$(DESTDIR)$(BINDIR)/ocp-vcsa" "$(DESTDIR)$(BINDIR)/ocp-x11"
"$(DESTDIR)$(BINDIR)/ultrafix.sh"
- rm -f "$(DESTDIR)$(PREFIX)/share/applications/opencubicplayer.desktop"
"$(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/opencubicplayer.xpm"
"$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/opencubicplayer.xpm"
-
- dirs:
-diff -up ocp-0.1.20/Rules.make.in.docdir ocp-0.1.20/Rules.make.in
---- ocp-0.1.20/Rules.make.in.docdir 2010-05-17 05:55:16.000000000 -0400
-+++ ocp-0.1.20/Rules.make.in 2013-08-06 18:00:54.994677835 -0400
-@@ -4,6 +4,7 @@ PREFIX=@PREFIX@
- LIBDIR=@LIBDIR@
- INFODIR=@INFODIR@
- BINDIR=@BINDIR@
-+DOCDIR=@docdir@
- SYSCONFDIR=@SYSCONFDIR@
- DESKTOP_FILE_INSTALL=@DESKTOP_FILE_INSTALL@
-
diff --git a/ocp-0.1.20-no-i386-asm.patch b/ocp-0.1.20-no-i386-asm.patch
deleted file mode 100644
index e13ba2e..0000000
--- a/ocp-0.1.20-no-i386-asm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ocp-0.1.20/config.h.in.noi386asm ocp-0.1.20/config.h.in
---- ocp-0.1.20/config.h.in.noi386asm 2010-05-17 05:55:17.000000000 -0400
-+++ ocp-0.1.20/config.h.in 2011-06-05 20:59:44.866924202 -0400
-@@ -125,7 +125,7 @@
- #undef HAVE_RESIZETERM
-
- #if (defined(_X86) || defined(__i386__)) && !defined(__APPLE__)
--#define I386_ASM 1
-+/* #define I386_ASM */
- #endif
-
- /* #define I386_ASM_EMU 1 */
diff --git a/ocp-0.1.20-timidity-parse-config.patch
b/ocp-0.1.20-timidity-parse-config.patch
deleted file mode 100644
index d77d117..0000000
--- a/ocp-0.1.20-timidity-parse-config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up ocp-0.1.20/playgmi/gmitimidity.c.timidity ocp-0.1.20/playgmi/gmitimidity.c
---- ocp-0.1.20/playgmi/gmitimidity.c.timidity 2010-05-17 05:55:16.000000000 -0400
-+++ ocp-0.1.20/playgmi/gmitimidity.c 2011-06-01 23:36:26.491647508 -0400
-@@ -56,7 +56,7 @@ static void parse_config(FILE *input, in
- if ((pos=strchr(line, '#')))
- *pos=0;
- base=line;
-- while ((*base)&&(*base==' '))
-+ while ((*base)&&isspace(*base))
- base++;
- if (!base)
- continue;
-@@ -184,7 +184,7 @@ static int loadpatchTimidity( struct min
- fprintf(stderr, "[timidity] not entry configured for program %d\n",
program);
- return errFileMiss;
- }
-- for (i=DirectoryStackIndex-1;i>=0;i--)
-+ for (i=DirectoryStackIndex;i>=0;i--)
- {
- snprintf(path, sizeof(path), "%s/%s.pat", DirectoryStack[i],
midInstrumentNames[program]);
- if ((file=fopen(path, "r"))!=NULL)
-@@ -220,7 +220,7 @@ static int addpatchTimidity( struct mins
- fprintf(stderr, "[timidity] not entry configured for program %d\n",
program);
- return errFileMiss;
- }
-- for (i=DirectoryStackIndex-1;i>=0;i--)
-+ for (i=DirectoryStackIndex;i>=0;i--)
- {
- snprintf(path, sizeof(path), "%s/%s.pat", DirectoryStack[i],
midInstrumentNames[program]);
- if ((file=fopen(path, "r"))!=NULL)
diff --git a/ocp-0.1.21-pat-use-first-sample.patch
b/ocp-0.1.21-pat-use-first-sample.patch
deleted file mode 100644
index 6c0d5cf..0000000
--- a/ocp-0.1.21-pat-use-first-sample.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up ocp-0.1.21/playgmi/gmipat.c.pat ocp-0.1.21/playgmi/gmipat.c
---- ocp-0.1.21/playgmi/gmipat.c.pat 2011-11-17 16:46:08.000000000 -0500
-+++ ocp-0.1.21/playgmi/gmipat.c 2013-12-27 23:46:56.436929356 -0500
-@@ -370,7 +370,8 @@ addpatchPAT (FILE *file,
- if (lh.samples!=1)
- {
- fprintf(stderr, "[*.PAT loader] # Samples != 1\n");
-- return errFormStruc;
-+ /* return errFormStruc; */
-+ lh.samples=1; /* only use the first sample */
- }
-
- if ((st=loadsamplePAT(file, ins, sn, ph.voices, 0, sampnum, 0, sip, samplenum)))
diff --git a/ocp-0.1.22-timidity-parse-config.patch
b/ocp-0.1.22-timidity-parse-config.patch
deleted file mode 100644
index f4304d9..0000000
--- a/ocp-0.1.22-timidity-parse-config.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -up ocp-0.1.22-20150223gitbceb98e/playgmi/gmitimidity.c.timidity
ocp-0.1.22-20150223gitbceb98e/playgmi/gmitimidity.c
---- ocp-0.1.22-20150223gitbceb98e/playgmi/gmitimidity.c.timidity 2015-02-23
22:38:38.000000000 -0500
-+++ ocp-0.1.22-20150223gitbceb98e/playgmi/gmitimidity.c 2015-02-24 00:04:03.464743077
-0500
-@@ -200,7 +200,7 @@ static int loadpatchTimidity( struct min
- if (len >= 4)
- needpat = strcasecmp(midInstrumentNames[program]+len-4, ".pat");
-
-- if (midInstrumentNames[program][0] != '/') /* Is the path absolute? */
-+ if (midInstrumentNames[program][0] == '/') /* Is the path absolute? */
- {
- snprintf(path, sizeof(path), "%s%s", midInstrumentNames[program],
needpat?".pat":"");
-
-@@ -241,28 +241,41 @@ static int addpatchTimidity( struct mins
- int retval;
- char path[PATH_MAX+NAME_MAX];
- int i;
-+ int needpat = 1;
-+ int len;
-
- if (!*midInstrumentNames[program])
- {
- fprintf(stderr, "[timidity] not entry configured for program %d\n",
program);
- return errFileMiss;
- }
-- for (i=DirectoryStackIndex-1;i>=0;i--)
-+
-+ len = strlen(midInstrumentNames[program]);
-+ if (len >= 4)
-+ needpat = strcasecmp(midInstrumentNames[program]+len-4, ".pat");
-+
-+ if (midInstrumentNames[program][0] == '/') /* Is the path absolute? */
- {
-- int needpat = 1;
-- int len = strlen(midInstrumentNames[program]);
-- if (len >= 4)
-- needpat = strcasecmp(midInstrumentNames[program]+len-4, ".pat");
-- snprintf(path, sizeof(path), "%s/%s%s", DirectoryStack[i],
midInstrumentNames[program], needpat?".pat":"");
-- if ((file=fopen(path, "r"))!=NULL)
-- break;
-+ snprintf(path, sizeof(path), "%s%s", midInstrumentNames[program],
needpat?".pat":"");
-+
-+ if ((file=fopen(path, "r"))==NULL)
-+ {
-+ fprintf(stderr, "[timidity] '%s': failed to open file\n", path);
-+ }
-+ } else {
-+ for (i=DirectoryStackIndex-1;i>=0;i--)
-+ {
-+ snprintf(path, sizeof(path), "%s/%s%s", DirectoryStack[i],
midInstrumentNames[program], needpat?".pat":"");
-+ if ((file=fopen(path, "r"))!=NULL)
-+ break;
-+ fprintf(stderr, "[timidity] '%s': failed to open file (we might try
other directory prefixes before we give up)\n", path);
-+ }
- }
- if (!file)
- {
-- fprintf(stderr, "[timidity] '%s': failed to open file\n",
midInstrumentNames[program]);
-+ fprintf(stderr, "[timidity] failed to open instrument %s\n",
midInstrumentNames[program]);
- return errFileMiss;
- }
--
- fprintf(stderr, "[timidity] loading file %s\n", path);
- retval=addpatchPAT(file, ins, program, sn, sampnum, sip, samplenum);
- fclose(file);
diff --git a/ocp-0.1.22-no-gcc-version-check.patch b/ocp-0.2.1-no-gcc-version-check.patch
similarity index 60%
rename from ocp-0.1.22-no-gcc-version-check.patch
rename to ocp-0.2.1-no-gcc-version-check.patch
index c124c18..8e3f480 100644
--- a/ocp-0.1.22-no-gcc-version-check.patch
+++ b/ocp-0.2.1-no-gcc-version-check.patch
@@ -1,7 +1,7 @@
-diff -up
opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.ac.no-gcc-version-check
opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.ac
----
opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.ac.no-gcc-version-check 2020-01-30
13:12:45.762107178 -0500
-+++ opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.ac 2020-01-30
13:13:31.678063513 -0500
-@@ -110,31 +110,6 @@ dnl restore prefix and exec_prefix
+diff -up ocp-0.2.1/configure.ac.no-gcc-version-check ocp-0.2.1/configure.ac
+--- ocp-0.2.1/configure.ac.no-gcc-version-check 2020-02-08 19:05:13.993537420 -0500
++++ ocp-0.2.1/configure.ac 2020-02-08 19:07:17.088275191 -0500
+@@ -123,31 +123,6 @@ dnl restore prefix and exec_prefix
exec_prefix=$exec_prefix_save
])
@@ -14,7 +14,7 @@ diff -up
opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure
- '')
- AC_MSG_ERROR([not found]);
- ;;
-- 2.95.[[2-9]]|2.95.[[2-9]][[-.]]*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*|5.*)
+- 2.95.[[2-9]]|2.95.[[2-9]][[-]].*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*|5.*|6.*|7*|8*|9*|10*)
- _cc_major=`echo $cc_version | cut -d '.' -f 1`
- _cc_minor=`echo $cc_version | cut -d '.' -f 2`
- _cc_mini=`echo $cc_version | cut -d '.' -f 3`
@@ -33,10 +33,10 @@ diff -up
opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure
AC_MSG_CHECKING([for broken signed char to signed int in loops (gcc version 4.1.1)])
AC_RUN_IFELSE(
[AC_LANG_SOURCE([
-diff -up
opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.no-gcc-version-check
opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure
----
opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.no-gcc-version-check 2020-01-30
13:12:45.764107176 -0500
-+++ opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure 2020-01-30
13:13:43.004052695 -0500
-@@ -4602,33 +4602,6 @@ test "x$exec_prefix" = xNONE && exec_pre
+diff -up ocp-0.2.1/configure.no-gcc-version-check ocp-0.2.1/configure
+--- ocp-0.2.1/configure.no-gcc-version-check 2020-02-08 19:05:13.994537418 -0500
++++ ocp-0.2.1/configure 2020-02-08 19:06:53.973324507 -0500
+@@ -6141,33 +6141,6 @@ test "x$exec_prefix" = xNONE && exec_pre
@@ -50,7 +50,7 @@ diff -up
opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure
- '')
- as_fn_error $? "not found" "$LINENO" 5;
- ;;
-- 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*)
+- 2.95.[2-9]|2.95.[2-9][-].*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*|6.*|7*|8*|9*|10*)
- _cc_major=`echo $cc_version | cut -d '.' -f 1`
- _cc_minor=`echo $cc_version | cut -d '.' -f 2`
- _cc_mini=`echo $cc_version | cut -d '.' -f 3`
diff --git a/ocp-0.2.1-no-i386-asm.patch b/ocp-0.2.1-no-i386-asm.patch
new file mode 100644
index 0000000..c56983b
--- /dev/null
+++ b/ocp-0.2.1-no-i386-asm.patch
@@ -0,0 +1,12 @@
+diff -up opencubicplayer-47ee5f8669c9bf88b64852f3ab50d9a244c3932f/config.h.in.noi386asm
opencubicplayer-47ee5f8669c9bf88b64852f3ab50d9a244c3932f/config.h.in
+---
opencubicplayer-47ee5f8669c9bf88b64852f3ab50d9a244c3932f/config.h.in.noi386asm 2020-02-08
18:53:55.627986645 -0500
++++ opencubicplayer-47ee5f8669c9bf88b64852f3ab50d9a244c3932f/config.h.in 2020-02-08
18:55:42.158758052 -0500
+@@ -161,7 +161,7 @@
+ #undef HAVE_RESIZE_TERM
+
+ #if (defined(_X86) || defined(__i386__)) && !defined(__APPLE__)
+-#define I386_ASM 1
++/* #define I386_ASM */
+ #endif
+
+ /* #define I386_ASM_EMU 1 */
diff --git a/ocp.spec b/ocp.spec
index d953686..3987b97 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,12 +1,14 @@
-%global commit0 849cc42c9446f68935269d6cc039dfd46e620f91
-%global gittag0 0.1.22
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+#global commit0 47ee5f8669c9bf88b64852f3ab50d9a244c3932f
+#global gittag0 0.2.1
+#global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
+%define _legacy_common_support 1
%global _hardened_build 1
Name: ocp
-Version: 0.1.22
-Release: 0.31.git%{shortcommit0}%{?dist}
+Version: 0.2.1
+Release: 2%{?dist}
+#Release: 0.1.git%%{shortcommit0}%%{?dist}
Summary: Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
# 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -14,15 +16,15 @@ Summary: Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
# Graphics and animations are CC-BY.
License: GPLv2+ and CC-BY
URL:
http://stian.cubic.org/project-ocp.php
-#Source0:
http://stian.cubic.org/ocp/ocp-%%{version}.tar.bz2
-Source0:
http://sourceforge.net/code-snapshots/git/o/op/opencubicplayer/code.git/o...
+Source0:
http://stian.cubic.org/ocp/ocp-%{version}.tar.bz2
+#Source0:
http://sourceforge.net/code-snapshots/git/o/op/opencubicplayer/code.git/o...
+#Source0:
https://github.com/mywave82/opencubicplayer/archive/%{commit0}/opencubicp...
Source1:
ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
Source2:
ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
-Patch0: ocp-0.1.20-no-i386-asm.patch
-Patch1: ocp-0.1.21-pat-use-first-sample.patch
-Patch2: ocp-0.1.22-no-gcc-version-check.patch
+Patch0: ocp-0.2.1-no-i386-asm.patch
+Patch1: ocp-0.2.1-no-gcc-version-check.patch
-BuildRequires: make
+BuildRequires: make
BuildRequires: adplug-devel
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
@@ -43,13 +45,6 @@ BuildRequires: zlib-devel
# For the hicolor icon directories
Requires: hicolor-icon-theme
-Requires(post): info
-Requires(preun): info
-%ifarch %{ix86}
-Requires(post): /usr/sbin/semanage
-Requires(post): /sbin/restorecon
-%endif
-
%description
Open Cubic Player is a music file player ported from DOS that supports
Amiga MOD module formats and many variants, such as MTM, STM, 669,
@@ -60,12 +55,10 @@ visualizations.
%prep
-%setup -q -n opencubicplayer-code-%{commit0}
-%if %{?_with_i386asm:0}%{!?_with_i386asm:1}
+%setup -q
+#-n opencubicplayer-%%{commit0}
%patch0 -p1 -b .noi386asm
-%endif
-%patch1 -p1 -b .pat
-%patch2 -p1 -b .no-gcc-version-check
+%patch1 -p1 -b .no-gcc-version-check
unzip %{SOURCE1}
mv license.txt license-images.txt
unzip %{SOURCE2}
@@ -96,10 +89,6 @@ make
mkdir -p %{buildroot}/etc
%make_install
-# rename ultrafix.sh script to make it obvious that it belongs to this
-# package and avoid conflicts.
-mv %{buildroot}%{_bindir}/ultrafix.sh %{buildroot}%{_bindir}/ocp-ultrafix.sh
-
# mv config to /etc (ocp will search here if it isn't found in the original
location)
mv %{buildroot}%{_datadir}/%{name}-%{version}/etc/ocp.ini %{buildroot}/etc/ocp.ini
rmdir %{buildroot}%{_datadir}/%{name}-%{version}/etc
@@ -133,7 +122,6 @@ cp -p license-images.txt license-videos.txt %{buildroot}%{_pkgdocdir}
%{_bindir}/ocp-sdl
%{_bindir}/ocp-vcsa
%{_bindir}/ocp-x11
-%{_bindir}/ocp-ultrafix.sh
%{_infodir}/ocp.info*
%{_datadir}/icons/hicolor/16x16/apps/*
%{_datadir}/icons/hicolor/48x48/apps/*
@@ -141,42 +129,14 @@ cp -p license-images.txt license-videos.txt
%{buildroot}%{_pkgdocdir}
%config(noreplace) /etc/ocp.ini
-%post
-%ifarch %{ix86}
-%if %{?_with_i386asm:1}%{!?_with_i386asm:0}
-# This is the i386 assembly version. We need to allow text relocations.
-semanage fcontext -a -t textrel_shlib_t
'%{_libdir}/ocp-.*/(autoload/)?.*devwmix\.so' 2>/dev/null || :
-semanage fcontext -a -t textrel_shlib_t
'%{_libdir}/ocp-.*/(autoload/)?.*devwmixf\.so' 2>/dev/null || :
-semanage fcontext -a -t textrel_shlib_t
'%{_libdir}/ocp-.*/(autoload/)?.*mcpbase\.so' 2>/dev/null || :
-semanage fcontext -a -t textrel_shlib_t
'%{_libdir}/ocp-.*/(autoload/)?.*mixclip\.so' 2>/dev/null || :
-semanage fcontext -a -t unconfined_execmem_exec_t '%{_bindir}/ocp-[0-9].*'
2>/dev/null || :
-%else
-# This is the i386 non-assembly version. We don't need nor want to allow text
relocations.
-semanage fcontext -d -t textrel_shlib_t
'%{_libdir}/ocp-.*/(autoload/)?.*devwmix\.so' 2>/dev/null || :
-semanage fcontext -d -t textrel_shlib_t
'%{_libdir}/ocp-.*/(autoload/)?.*devwmixf\.so' 2>/dev/null || :
-semanage fcontext -d -t textrel_shlib_t
'%{_libdir}/ocp-.*/(autoload/)?.*mcpbase\.so' 2>/dev/null || :
-semanage fcontext -d -t textrel_shlib_t
'%{_libdir}/ocp-.*/(autoload/)?.*mixclip\.so' 2>/dev/null || :
-semanage fcontext -d -t unconfined_execmem_exec_t '%{_bindir}/ocp-[0-9].*'
2>/dev/null || :
-%endif
-restorecon -R %{_libdir}/ocp-* || :
-%endif
-
-
-%postun
-if [ $1 -eq 0 ]; then # final removal
-
-%ifarch %{ix86}
-%if %{?_with_i386asm:1}%{!?_with_i386asm:0}
- semanage fcontext -d -t textrel_shlib_t
'%{_libdir}/ocp-.*/(autoload/)?.*devwmix\.so' 2>/dev/null || :
- semanage fcontext -d -t textrel_shlib_t
'%{_libdir}/ocp-.*/(autoload/)?.*devwmixf\.so' 2>/dev/null || :
- semanage fcontext -d -t textrel_shlib_t
'%{_libdir}/ocp-.*/(autoload/)?.*mcpbase\.so' 2>/dev/null || :
- semanage fcontext -d -t textrel_shlib_t
'%{_libdir}/ocp-.*/(autoload/)?.*mixclip\.so' 2>/dev/null || :
- semanage fcontext -d -t unconfined_execmem_exec_t '%{_bindir}/ocp-[0-9].*'
2>/dev/null || :
-%endif
-%endif
-fi
-
%changelog
+* Sat Mar 26 2022 Charles R. Anderson <cra(a)alum.wpi.edu> - 0.2.1-2
+- Remove possibility to build i386 assembly version
+
+* Thu Mar 17 2022 Charles R. Anderson <cra(a)alum.wpi.edu> - 0.2.1-1
+- New upstream on github
+- Update to 0.2.1
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.1.22-0.31.git849cc42
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index b266627..33a9378 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-c69076f0392015878df34eefdfb4967e
opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91.zip
-4df5f894e070b20d8cd65a1a620258cb opencp25ani1.zip
-72bd5f59382e927ff5b5ba1b840777df opencp25image1.zip
+SHA512 (ocp-0.2.1.tar.bz2) =
fd8e6f29cf9512810919bc97f2f41ec4b964acbb1662a7952371d81f2880b0dc05e884450d47fd2c8fe1a6447c3ec8c3a3b1f52eb0d0e75a2b5a46c233b133cd
+SHA512 (opencp25ani1.zip) =
60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
+SHA512 (opencp25image1.zip) =
705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423
commit 9bf9ed1382b91b4d84143853fdf15bcbceb70ec4
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 20 22:01:50 2022 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/ocp.spec b/ocp.spec
index a93c3b0..d953686 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
Name: ocp
Version: 0.1.22
-Release: 0.30.git%{shortcommit0}%{?dist}
+Release: 0.31.git%{shortcommit0}%{?dist}
Summary: Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
# 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -177,6 +177,9 @@ if [ $1 -eq 0 ]; then # final removal
fi
%changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.1.22-0.31.git849cc42
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.1.22-0.30.git849cc42
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit 8c9a4a7f13a95f8f32d0639753fcf0cf116e68bf
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 22 16:53:49 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/ocp.spec b/ocp.spec
index 019f4ae..a93c3b0 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
Name: ocp
Version: 0.1.22
-Release: 0.29.git%{shortcommit0}%{?dist}
+Release: 0.30.git%{shortcommit0}%{?dist}
Summary: Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
# 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -177,6 +177,9 @@ if [ $1 -eq 0 ]; then # final removal
fi
%changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.1.22-0.30.git849cc42
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.1.22-0.29.git849cc42
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild