rpms/audacious/devel audacious-1.2.1-relative-links.patch, NONE, 1.1 audacious-1.2.1-shaded-skin.patch, NONE, 1.1 audacious.spec, 1.16, 1.17 audacious-1.1.0-relative-links.patch, 1.2, NONE audacious-1.1.1-shaded-skin.patch, 1.1, NONE
Ralf Ertzinger (ertzing)
fedora-extras-commits at redhat.com
Sun Nov 26 18:34:19 UTC 2006
Author: ertzing
Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4231
Modified Files:
audacious.spec
Added Files:
audacious-1.2.1-relative-links.patch
audacious-1.2.1-shaded-skin.patch
Removed Files:
audacious-1.1.0-relative-links.patch
audacious-1.1.1-shaded-skin.patch
Log Message:
- Update to 1.2.1
- Split off libaudacious into a separate package to handle the
(now externally provided and built) plugins better
audacious-1.2.1-relative-links.patch:
--- NEW FILE audacious-1.2.1-relative-links.patch ---
diff -uNr audacious-1.2.1-orig/libaudacious/Makefile audacious-1.2.1/libaudacious/Makefile
--- audacious-1.2.1-orig/libaudacious/Makefile 2006-10-29 11:35:12.000000000 +0100
+++ audacious-1.2.1/libaudacious/Makefile 2006-10-29 11:35:50.000000000 +0100
@@ -47,7 +47,7 @@
install-posthook:
@mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0
- @ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0 \
+ @ln -sf libaudacious$(SHARED_SUFFIX).4.0.0 \
${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4
- @ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).4 \
+ @ln -sf libaudacious$(SHARED_SUFFIX).4 \
${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX)
audacious-1.2.1-shaded-skin.patch:
--- NEW FILE audacious-1.2.1-shaded-skin.patch ---
diff -uNr audacious-1.2.1-orig/audacious/widgets/skin.c audacious-1.2.1/audacious/widgets/skin.c
--- audacious-1.2.1-orig/audacious/widgets/skin.c 2006-10-29 11:35:14.000000000 +0100
+++ audacious-1.2.1/audacious/widgets/skin.c 2006-10-29 12:40:56.000000000 +0100
@@ -1795,7 +1795,7 @@
(i * 25) + 25, 0, 25, 14);
/* right corner */
- skin_draw_pixmap(skin, drawable, gc, SKIN_PLEDIT, 99, focus ? 57 : 42,
+ skin_draw_pixmap(skin, drawable, gc, SKIN_PLEDIT, 99, focus ? 42 : 57,
width - 50, 0, 50, 14);
}
Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- audacious.spec 9 Nov 2006 14:13:19 -0000 1.16
+++ audacious.spec 26 Nov 2006 18:33:48 -0000 1.17
@@ -1,55 +1,62 @@
Name: audacious
-Version: 1.1.2
-Release: 8%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
Summary: A GTK2 based media player similar to xmms
Group: Applications/Multimedia
License: GPL
URL: http://audacious-media-player.org/
-# The original source files contain various codecs which clash
-# with the FE license guidelines. They are removed in the -fedora-
-# file.
-# Source0: http://audacious-media-player.org/beta/audacious-1.1.0-dr2.tgz
-Source0: audacious-fedora-%{version}.tar.gz
+
+Source0: audacious-%{version}.tgz
Patch0: audacious-1.1.0-xmms-skins.patch
Patch1: audacious-1.1.0-default-skin.patch
-Patch2: audacious-1.1.0-no-rpath.patch
-Patch3: audacious-1.1.0-relative-links.patch
+# Patch2: audacious-1.1.0-no-rpath.patch
+Patch3: audacious-1.2.1-relative-links.patch
Patch4: audacious-1.1.0-quoting.patch
-Patch5: audacious-1.1.0-amidi-backend.patch
-Patch6: audacious-1.1.1-shaded-skin.patch
+# Patch5: audacious-1.1.0-amidi-backend.patch
+Patch6: audacious-1.2.1-shaded-skin.patch
Patch7: audacious-1.1.1-controlsocket-name.patch
-Patch8: audacious-1.1.1-playlist-twenty.patch
+# Patch8: audacious-1.1.1-playlist-twenty.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0
-BuildRequires: zlib-devel, desktop-file-utils >= 0.9, alsa-lib-devel
-BuildRequires: gnome-vfs2-devel, libglade2-devel >= 2.4, libsidplay-devel
-BuildRequires: libmpcdec-devel, libmusicbrainz-devel, GConf2-devel
-BuildRequires: taglib-devel >= 1.4, libogg-devel >= 1.0, flac-devel >= 1.1.2
-BuildRequires: libvisual-devel >= 0.2, SDL-devel >= 1.2.9
-BuildRequires: gettext, libsndfile-devel, curl-devel, libbinio-devel
-BuildRequires: arts-devel, libmodplug-devel, lirc-devel
-BuildRequires: jack-audio-connection-kit-devel, libsamplerate-devel
+BuildRequires: gtk2-devel >= 2.6
+BuildRequires: zlib-devel, desktop-file-utils >= 0.9
+BuildRequires: libglade2-devel >= 2.4
+BuildRequires: GConf2-devel
+BuildRequires: gettext
+
+Requires: audacious-plugins >= 1.2.0
-Requires(post): desktop-file-utils >= 0.9, /sbin/ldconfig
-Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig
+Requires(post): desktop-file-utils >= 0.9
+Requires(postun): desktop-file-utils >= 0.9
-Obsoletes: bmp <= 0.9.7.1, bmp-flac2 <= 009
-Provides: bmp = 0.9.7.1, bmp-flac2 = 009
+Obsoletes: bmp <= 0.9.7.1
+Provides: bmp = 0.9.7.1
%description
Audacious is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
BMP.
+
+%package libs
+Summary: Library files for Audacious
+Group: System Environment/Libraries
+
+%description libs
+Library files for Audacious
+
+
%package devel
Summary: Development files for Audacious
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel gtk2-devel gnome-vfs2-devel GConf2-devel
+Requires: %{name}-libs = %{version}-%{release}
+Requires: glib2-devel, gtk2-devel >= 2.6, GConf2-devel, libglade2-devel >= 2.4
Requires: pkgconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
Obsoletes: bmp-devel <= 0.9.7.1
Provides: bmp-devel = 0.9.7.1
@@ -57,38 +64,8 @@
Development files for Audacious
-%package jack
-Summary: Audacious output plugin for JACK sound service
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-
-%description jack
-This package provides an Audacious output plugin that uses the
-JACK sound service.
-
-
-%package esd
-Summary: Audacious output plugin for esd sound service
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-
-%description esd
-This package provides an Audacious output plugin that uses the
-ESD sound server.
-
-
-%package arts
-Summary: Audacious output plugin for KDE arts sound service
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-
-%description arts
-This package provides an Audacious output plugin that uses the
-KDE arts sound server.
-
-
%prep
-%setup -q -n %{name}-fedora-%{version}
+%setup -q
# Read xmms skins directory
%patch0 -p1 -b .xmms-skins
@@ -97,7 +74,7 @@
%patch1 -p1 -b .default-skin
# No rpath in binaries
-%patch2 -p1 -b .no-rpath
+# %patch2 -p1 -b .no-rpath
# Relative symlink paths
%patch3 -p1 -b .relative-links
@@ -115,17 +92,15 @@
%patch7 -p1 -b controlsocket-name
# Fix "%20" in playlist entries
-%patch8 -p1 -b playlist-twenty
+# %patch8 -p1 -b playlist-twenty
%build
%configure \
- --disable-rpath \
- --enable-gconf \
- --disable-gnome-vfs \
- --enable-amidiplug \
- --disable-amidiplug-dummy \
- --enable-chardet \
- --disable-dependency-tracking
+ --disable-rpath \
+ --enable-gconf \
+ --disable-gnome-vfs \
+ --enable-chardet \
+ --disable-dependency-tracking
make V=1 %{?_smp_mflags}
@@ -136,13 +111,17 @@
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
- --add-category Application \
+ --delete-original \
+ --remove-mime-type audio/x-scpls \
+ --remove-mime-type audio/x-mpegurl \
+ --remove-mime-type audio/mpegurl \
--remove-mime-type audio/mp3 \
--remove-mime-type audio/x-mp3 \
--remove-mime-type audio/mpeg \
--remove-mime-type audio/x-mpeg \
- --delete-original \
+ --remove-mime-type audio/x-wav \
+ --remove-mime-type application/x-ogg \
+ --remove-category Application \
$RPM_BUILD_ROOT%{_datadir}/applications/audacious.desktop
install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
@@ -155,7 +134,6 @@
%post
-/sbin/ldconfig
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -164,64 +142,43 @@
%postun
-/sbin/ldconfig
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/audacious
%{_bindir}/audtool
-%{_libdir}/*.so.*
-%{_libdir}/audacious
-%{_libdir}/amidi-plug
%{_datadir}/audacious
-%exclude %{_libdir}/audacious/Output/libjackout.so
-%exclude %{_libdir}/audacious/Output/libarts.so
-%exclude %{_libdir}/audacious/Output/libESD.so
%{_mandir}/man[^3]/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/48x48/apps/*
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/*.so.*
+
%files devel
%defattr(-,root,root,-)
%{_includedir}/audacious
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
-%files jack
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Output/libjackout.so
-
-%files arts
-%defattr(-,root,root,-)
-%{_bindir}/audacious-arts-helper
-%{_libdir}/audacious/Output/libarts.so
-
-%files esd
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Output/libESD.so
-
%changelog
-* Thu Nov 9 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.2-8.fc7
-- Drop the main window update patch
-
-* Tue Nov 7 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.2-7.fc7
-- Disable gnome-vfs, it causes too much trouble
-- Add --enable-chardet
-
-* Mon Nov 06 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.2-4.fc7
-- Decrease main window update frequency somewhat
-
-* Mon Nov 06 2006 Jindrich Novy <jnovy at redhat.com> 1.1.2-3.fc6
-- Rebuild because of the new curl
-- Don't BuildRequire desktop-file-utils twice
+* Sun Nov 26 2006 Ralf Ertzinger <ralf at skytale.net> 1.2.1-1.fc7
+- Update to 1.2.1
+- Split off libaudacious into a separate package to handle the
+ (now externally provided and built) plugins better
* Wed Oct 18 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.2-2.fc6
- Add Obsoletes/Provides for BMP
@@ -230,10 +187,10 @@
- Update to 1.1.2
* Thu Aug 17 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.1-6.fc6
-- Another go at the %20 problem
+- Another go at the %%20 problem
* Mon Aug 14 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.1-4.fc6
-- Fix %20 in playlist entries
+- Fix %%20 in playlist entries
* Sun Jul 30 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.1-3.fc6
- Bump for rebuild
--- audacious-1.1.0-relative-links.patch DELETED ---
--- audacious-1.1.1-shaded-skin.patch DELETED ---
More information about the scm-commits
mailing list