rpms/ocp/devel .cvsignore, 1.2, 1.3 ocp.spec, 1.4, 1.5 sources, 1.2, 1.3 ocp-0.1.15-alsa.patch, 1.1, NONE ocp-0.1.15-condmad.patch, 1.1, NONE ocp-0.1.15-docdir.patch, 1.1, NONE ocp-0.1.15-gcc43.patch, 1.1, NONE ocp-0.1.15-info-dir.patch, 1.1, NONE ocp-0.1.15-symlink.patch, 1.1, NONE ocp-desktop.patch, 1.1, NONE
Charles R. Anderson
cra at fedoraproject.org
Wed Jan 20 04:31:12 UTC 2010
Author: cra
Update of /cvs/pkgs/rpms/ocp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10289
Modified Files:
.cvsignore ocp.spec sources
Removed Files:
ocp-0.1.15-alsa.patch ocp-0.1.15-condmad.patch
ocp-0.1.15-docdir.patch ocp-0.1.15-gcc43.patch
ocp-0.1.15-info-dir.patch ocp-0.1.15-symlink.patch
ocp-desktop.patch
Log Message:
Update to pre-0.1.19 snapshot 20100110. Spec now automagically handles
snapshot releases.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 11 Nov 2008 00:12:54 -0000 1.2
+++ .cvsignore 20 Jan 2010 04:31:12 -0000 1.3
@@ -1 +1 @@
-ocp-0.1.15.tar.bz2
+ocp-snapshot-20100110.tar.bz2
Index: ocp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocp/devel/ocp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocp.spec 25 Jul 2009 20:07:27 -0000 1.4
+++ ocp.spec 20 Jan 2010 04:31:12 -0000 1.5
@@ -1,6 +1,10 @@
+%define snapshot 20100110
+%define version 0.1.19
+%define release %{?snapshot:0.1.%{snapshot}snap}%{!?snapshot:1}%{?dist}
+
Name: ocp
-Version: 0.1.15
-Release: 6%{?dist}
+Version: %{version}
+Release: %{release}
Summary: Open Cubic Player for MOD/S3M/XM/IT/SID/MIDI music files
Group: Applications/Multimedia
@@ -10,52 +14,23 @@ Group: Applications/Multimedia
# Requested upstream to include license header at the top of every
# source file 2008/07/08.
License: GPL+
-URL: http://stian.lunafish.org/coding-ocp.php
-Source: http://stian.lunafish.org/ocp/%{name}-%{version}.tar.bz2
-# In desktop file, use UTF-8, Terminal=false and icon theme naming.
-# Submitted upstream 2008/07/08.
-Patch0: ocp-desktop.patch
-# GCC 4.3 is more strict with regards to requiring the proper includes
-# for standard library functions. Add include <cstdlib> and
-# <string.h> to oplplay.cpp. Submitted upstream 2008/06/24.
-Patch1: ocp-0.1.15-gcc43.patch
-# There is a bug in the ALSA PulseAudio plugin that causes
-# snd_pcm_hw_params_any to return a positive value instead of 0. This
-# breaks many applications including ocp. As a workaround, check for
-# err < 0 instead. See:
-#
-# https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3880
-#
-# Also, with ALSA_DEBUG defined, there was an error caused by using
-# "device" instead of "alsaMixerName". I also changed the default mixer
-# device to "default" instead of the hardcoded value "hw:0".
-# Submitted upstream 2008/06/24.
-Patch2: ocp-0.1.15-alsa.patch
-# Make libmad and libid3tag support conditional via the configure
-# script. Submitted upstream 2008/06/24.
-Patch3: ocp-0.1.15-condmad.patch
-# Add a directory entry to ocp.texi.in for use with install-info.
-# Submitted upstream 2008/06/24.
-Patch4: ocp-0.1.15-info-dir.patch
-# Install standard documentation under /usr/share/doc/
-# Submitted upstream 2008/06/24.
-Patch5: ocp-0.1.15-docdir.patch
-# Use relative symlink instead of absolute symlink for /usr/bin/ocp.
-# Submitted upstream 2008/06/24.
-Patch6: ocp-0.1.15-symlink.patch
+URL: http://stian.cubic.org/coding-ocp.php
+%define source %{name}-%{?snapshot:snapshot-%{snapshot}}%{!?snapshot:%{version}}
+Source: http://stian.cubic.org/ocp/%{source}.tar.bz2
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: adplug-devel
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: flac-devel
-BuildRequires: libid3tag-devel
BuildRequires: libsidplay-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
@@ -75,15 +50,8 @@ visualizations.
%prep
-%setup -q
-%patch0 -p1 -b .desktop
-%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .alsa
-%patch3 -p1 -b .condmad
-%patch4 -p1 -b .info-dir
-%patch5 -p1 -b .docdir
-%patch6 -p1 -b .symlink
-autoconf
+%setup -q -n %{source}
+
%build
%configure --with-x11 \
@@ -94,8 +62,8 @@ autoconf
--with-oss \
--with-lzw \
--with-flac \
+ --with-sdl \
--without-mad \
- --with-id3tag \
--with-libiconv=auto
make
@@ -105,7 +73,7 @@ make
%install
rm -rf %{buildroot}
-mkdir -p %{buildroot}
+mkdir -p %{buildroot}/etc
make install DESTDIR=%{buildroot}
# rename ultrafix.sh script to make it obvious that it belongs to this
@@ -119,14 +87,11 @@ rmdir %{buildroot}%{_datadir}/%{name}-%{
# remove wmconfig stuff
rm -rf %{buildroot}/etc/X11
-# move icons to hicolor theme folder
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,48x48}/apps
-mv %{buildroot}%{_datadir}/pixmaps/opencubicplayer.xpm %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ocp.xpm
-mv %{buildroot}%{_datadir}/pixmaps/mini/opencubicplayer_mini.xpm %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/ocp.xpm
-rm -rf %{buildroot}%{_datadir}/pixmaps
+# remove info/dir
+rm -f %{buildroot}/%{_infodir}/dir
# rename desktop file to name.desktop to match packaging guidelines
-mv %{buildroot}%{_datadir}/applications/opencubicplayer.desktop \
+mv %{buildroot}%{_datadir}/applications/*opencubicplayer.desktop \
%{buildroot}%{_datadir}/applications/ocp.desktop
desktop-file-install --vendor="fedora" \
--add-category="Audio" \
@@ -149,6 +114,10 @@ rm -rf %{buildroot}
%{_libdir}/%{name}-%{version}
%{_bindir}/ocp-%{version}
%{_bindir}/ocp
+%{_bindir}/ocp-curses
+%{_bindir}/ocp-sdl
+%{_bindir}/ocp-vcsa
+%{_bindir}/ocp-x11
%{_bindir}/ocp-ultrafix.sh
%{_infodir}/ocp.info*
%{_datadir}/icons/hicolor/16x16/apps/*
@@ -173,8 +142,30 @@ gtk-update-icon-cache -qf %{_datadir}/ic
%changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.15-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Jan 19 2010 Charles R. Anderson <cra at wpi.edu> 0.1.19-0.1.20100110snap
+- 0.1.19-0.1.20100110snap
+
+* Tue Jan 19 2010 Charles R. Anderson <cra at wpi.edu> 0.1.18-1
+- 0.1.18
+- enable SDL: ocp-sdl
+
+* Tue Oct 06 2009 Charles R. Anderson <cra at wpi.edu> 0.1.17-20090926snap
+- snapshot 20090926
+- adds ocp-curses, ocp-sdl, ocp-vcsa, and ocp-x11 binaries
+
+* Tue Oct 06 2009 Charles R. Anderson <cra at wpi.edu> 0.1.17-1
+- 0.1.17-1
+
+* Sat Sep 12 2009 Charles R. Anderson <cra at wpi.edu> 0.1.17-0.20090730cvs
+- snapshot 20090730
+
+* Mon Mar 02 2009 Charles R. Anderson <cra at wpi.edu> 0.1.16-1
+- 0.1.16-1
+- upstreamed patches: alsa condmad docdir gcc43 info-dir symlink
+- upstreamed: move icons to hicolor theme
+- remove info/dir from buildroot
+- patch configure.ac to correctly find byteswap.h
+- no longer BR libid3tag
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.15-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 11 Nov 2008 00:12:54 -0000 1.2
+++ sources 20 Jan 2010 04:31:12 -0000 1.3
@@ -1 +1 @@
-b936f236b41e7f1184e401f5e099debe ocp-0.1.15.tar.bz2
+760d9f4be60002f8b5b5c51cc00661e4 ocp-snapshot-20100110.tar.bz2
--- ocp-0.1.15-alsa.patch DELETED ---
--- ocp-0.1.15-condmad.patch DELETED ---
--- ocp-0.1.15-docdir.patch DELETED ---
--- ocp-0.1.15-gcc43.patch DELETED ---
--- ocp-0.1.15-info-dir.patch DELETED ---
--- ocp-0.1.15-symlink.patch DELETED ---
--- ocp-desktop.patch DELETED ---
More information about the scm-commits
mailing list