rpms/ocp/devel ocp.spec,1.1,1.2
Charles R. Anderson
cra at fedoraproject.org
Tue Nov 11 00:56:08 UTC 2008
- Previous message (by thread): rpms/rarian/F-10 rarian-0.8.1-categories.patch, NONE, 1.1 rarian.spec, 1.17, 1.18
- Next message (by thread): rpms/libsvm/devel import.log, 1.2, 1.3 libsvm-2.88.patch, 1.2, 1.3 libsvm.spec, 1.31, 1.32
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cra
Update of /cvs/pkgs/rpms/ocp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8118
Modified Files:
ocp.spec
Log Message:
- Add missing Requires: hicolor-icon-theme for the hicolor icon
directories
- remove wmconfig bits in a more succinct way
- rename ultrafix.sh to ocp-ultrafix.sh to prevent possible conflicts
- add comments about the applied patches and their upstream status
Index: ocp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocp/devel/ocp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocp.spec 11 Nov 2008 00:12:54 -0000 1.1
+++ ocp.spec 11 Nov 2008 00:55:37 -0000 1.2
@@ -1,21 +1,47 @@
Name: ocp
Version: 0.1.15
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Open Cubic Player for MOD/S3M/XM/IT/SID/MIDI music files
Group: Applications/Multimedia
# Lack of any specific mention of a GPL version, so any version applies.
# See doc/texi/ocp.text.in and doc/texi/faq.texi.
# "OCP is published under the GNU General Public License (GPL)."
+# 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
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -33,6 +59,9 @@
BuildRequires: texinfo
BuildRequires: zlib-devel
+# For the hicolor icon directories
+Requires: hicolor-icon-theme
+
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -79,13 +108,16 @@
mkdir -p %{buildroot}
make install DESTDIR=%{buildroot}
+# 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
# remove wmconfig stuff
-rm -rf %{buildroot}/etc/X11/wmconfig/
-rmdir %{buildroot}/etc/X11
+rm -rf %{buildroot}/etc/X11
# move icons to hicolor theme folder
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,48x48}/apps
@@ -117,7 +149,7 @@
%{_libdir}/%{name}-%{version}
%{_bindir}/ocp-%{version}
%{_bindir}/ocp
-%{_bindir}/ultrafix.sh
+%{_bindir}/ocp-ultrafix.sh
%{_infodir}/ocp.info*
%{_datadir}/icons/hicolor/16x16/apps/*
%{_datadir}/icons/hicolor/48x48/apps/*
@@ -141,6 +173,13 @@
%changelog
+* Mon Nov 10 2008 Charles R. Anderson <cra at wpi.edu> 0.1.15-4
+- Add missing Requires: hicolor-icon-theme for the hicolor icon
+ directories
+- remove wmconfig bits in a more succinct way
+- rename ultrafix.sh to ocp-ultrafix.sh to prevent possible conflicts
+- add comments about the applied patches and their upstream status
+
* Sun Nov 02 2008 Charles R. Anderson <cra at wpi.edu> 0.1.15-3
- fix condmad.patch: add HAVE_MAD & HAVE_ID3TAG to Rules.make.in
- update desktop file patch (keep Terminal=false change,
- Previous message (by thread): rpms/rarian/F-10 rarian-0.8.1-categories.patch, NONE, 1.1 rarian.spec, 1.17, 1.18
- Next message (by thread): rpms/libsvm/devel import.log, 1.2, 1.3 libsvm-2.88.patch, 1.2, 1.3 libsvm.spec, 1.31, 1.32
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list