From 8a33efc18232eafa26ecabddfd95e0fa8bc6fe6a Mon Sep 17 00:00:00 2001 From: Charles R. Anderson Date: Oct 31 2015 16:35:24 +0000 Subject: Update to latest git snapshot - Rework spec --- diff --git a/.gitignore b/.gitignore index e3d6f47..6feb691 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.rpm ocp-snapshot-20100110.tar.bz2 ocp-0.1.20.tar.bz2 ocp-0.1.21.tar.bz2 @@ -5,3 +6,4 @@ opencp25ani1.zip opencp25image1.zip /ocp-0.1.22-20150223gitbceb98e.tar.bz2 /ocp-0.1.22-20150224gita07bf5d.tar.bz2 +/opencubicplayer-code-e62ae525f16712fdbb9f655383071d0d683d3dc9.zip diff --git a/ocp.spec b/ocp.spec index 9c3f3cf..5af38fa 100644 --- a/ocp.spec +++ b/ocp.spec @@ -1,50 +1,45 @@ -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%global commit0 e62ae525f16712fdbb9f655383071d0d683d3dc9 +%global gittag0 0.1.22 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -Name: ocp -Version: 0.1.22 -%define checkout 20150224gita07bf5d -Release: 0.6.%{checkout}%{?dist} -Summary: Open Cubic Player for MOD/S3M/XM/IT/SID/MIDI music files +%global _hardened_build 1 + +Name: ocp +Version: 0.1.22 +Release: 0.7.git%{shortcommit0}%{?dist} +Summary: Open Cubic Player for MOD/S3M/XM/IT/MIDI music files -Group: Applications/Multimedia # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added # GPLv2+ license text to all source 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 -# To make Source0 snapshot: -# git clone git://git.code.sourceforge.net/p/opencubicplayer/code ocp-0.1.22-20150223gitbceb98e -# tar cvjf ocp-0.1.22-20150223gitbceb98e.tar.gz ocp-0.1.22-20150223gitbceb98e -Source0: ocp-%{version}-%{checkout}.tar.bz2 -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 -Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -BuildRequires: adplug-devel -BuildRequires: alsa-lib-devel -BuildRequires: desktop-file-utils -BuildRequires: flac-devel -%if 0%{?fedora} < 18 -BuildRequires: libsidplay-devel -%endif -BuildRequires: libvorbis-devel -BuildRequires: libX11-devel -BuildRequires: libXext-devel -BuildRequires: libXpm-devel -BuildRequires: libXxf86vm-devel -BuildRequires: ncurses-devel -BuildRequires: SDL-devel -BuildRequires: texinfo -BuildRequires: zlib-devel +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/opencubicplayer-code-%{commit0}.zip +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 + +BuildRequires: adplug-devel +BuildRequires: alsa-lib-devel +BuildRequires: desktop-file-utils +BuildRequires: flac-devel +BuildRequires: libvorbis-devel +BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: libXpm-devel +BuildRequires: libXxf86vm-devel +BuildRequires: ncurses-devel +BuildRequires: SDL-devel +BuildRequires: texinfo +BuildRequires: zlib-devel # For the hicolor icon directories -Requires: hicolor-icon-theme +Requires: hicolor-icon-theme -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +Requires(post): info +Requires(preun): info %ifarch %{ix86} Requires(post): /usr/sbin/semanage Requires(post): /sbin/restorecon @@ -60,7 +55,7 @@ visualizations. %prep -%setup -q -n ocp-%{version}-%{checkout} +%setup -q -n opencubicplayer-code-%{commit0} %if %{?_with_i386asm:0}%{!?_with_i386asm:1} %patch0 -p1 -b .noi386asm %endif @@ -74,9 +69,6 @@ mv license.txt license-videos.txt %build %configure --with-x11 \ --with-adplug \ -%if 0%{?fedora} < 18 - --with-sidplay \ -%endif --with-alsa \ --without-coreaudio \ --with-oss \ @@ -152,7 +144,7 @@ rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/ocp.info.gz %{_infodir}/dir || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %ifarch %{ix86} %if %{?_with_i386asm:1}%{!?_with_i386asm:0} @@ -182,8 +174,8 @@ fi %postun if [ $1 -eq 0 ] ; then # final removal - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %ifarch %{ix86} %if %{?_with_i386asm:1}%{!?_with_i386asm:0} @@ -198,10 +190,14 @@ fi %posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Oct 31 2015 Charles R. Anderson - 0.1.22-0.7.gite62ae525 +- Update to latest git snapshot +- Rework spec + * Wed Jun 17 2015 Fedora Release Engineering - 0.1.22-0.6.20150224gita07bf5d - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 3f10275..328151e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -6935b36724e5d018ce7251cb80f7d7e1 ocp-0.1.22-20150224gita07bf5d.tar.bz2 +85e145bbddd6648200c66f0d6f0e95da opencubicplayer-code-e62ae525f16712fdbb9f655383071d0d683d3dc9.zip 4df5f894e070b20d8cd65a1a620258cb opencp25ani1.zip 72bd5f59382e927ff5b5ba1b840777df opencp25image1.zip