rpms/audacious/devel .cvsignore, 1.14, 1.15 audacious.spec, 1.48, 1.49 sources, 1.14, 1.15 audacious-1.5.1-default-skin.patch, 1.1, NONE audacious-1.5.1-desktop-name.patch, 1.1, NONE audacious-1.5.1-libsad-header.patch, 1.1, NONE audacious-1.5.1-playlist-length.patch, 1.1, NONE audacious-1.5.1-playlist-play-clicked.patch, 1.1, NONE audacious-1.5.1-xmms-skins.patch, 1.1, NONE
Michael Schwendt
mschwendt at fedoraproject.org
Tue Jul 14 17:09:26 UTC 2009
Author: mschwendt
Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5427
Modified Files:
.cvsignore audacious.spec sources
Removed Files:
audacious-1.5.1-default-skin.patch
audacious-1.5.1-desktop-name.patch
audacious-1.5.1-libsad-header.patch
audacious-1.5.1-playlist-length.patch
audacious-1.5.1-playlist-play-clicked.patch
audacious-1.5.1-xmms-skins.patch
Log Message:
fresh package for Audacious 2.1 final - skip 2.0.1 because it doesn't include alsa-ng (like our patched 1.5.1 pkgs) and suffers from bugs and race conditions which are fixed in 2.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore 7 Jun 2008 20:54:14 -0000 1.14
+++ .cvsignore 14 Jul 2009 17:09:26 -0000 1.15
@@ -1 +1 @@
-audacious-1.5.1.tgz
+audacious-2.1.tgz
Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- audacious.spec 6 Jun 2009 16:42:42 -0000 1.48
+++ audacious.spec 14 Jul 2009 17:09:26 -0000 1.49
@@ -1,98 +1,79 @@
# Minimum audacious/audacious-plugins version in inter-package
-# dependencies. We have 1.5.1 for both, so we enforce 1.5.1.
-%define aud_ver 1.5.1
+# dependencies.
+# We enforce 2.1 as 2.0.1 or older is insufficient.
+%define aud_ver 2.1
+
+Name: audacious
+Version: 2.1
+Release: 1%{?dist}
+
+License: GPLv3
+Summary: GTK2 based media player similar to XMMS
+URL: http://audacious-media-player.org/
+Group: Applications/Multimedia
+
+Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: gettext
+BuildRequires: glib2-devel
+BuildRequires: gtk2-devel
+BuildRequires: libmowgli-devel
+BuildRequires: mcs-devel
+BuildRequires: libxml2-devel
+BuildRequires: dbus-devel dbus-glib-devel
+BuildRequires: libSM-devel
+BuildRequires: desktop-file-utils
+
+# disabled by default
+#BuildRequires: libsamplerate-devel
+
+# The automatic SONAME dependency is not enough
+# during version upgrades.
+Requires: audacious-libs = %{version}-%{release}
-Name: audacious
-Version: 1.5.1
-Release: 9%{?dist}
-Summary: GTK2 based media player similar to XMMS
-
-Group: Applications/Multimedia
-License: GPLv2
-URL: http://audacious-media-player.org/
-
-Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
-Patch0: audacious-1.5.1-xmms-skins.patch
-Patch1: audacious-1.5.1-default-skin.patch
-Patch10: audacious-1.5.1-libsad-header.patch
-Patch11: audacious-1.5.1-playlist-length.patch
-Patch12: audacious-1.5.1-playlist-play-clicked.patch
-Patch13: audacious-1.5.1-desktop-name.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: gtk2-devel >= 2.6
-BuildRequires: zlib-devel, desktop-file-utils >= 0.9
-BuildRequires: libglade2-devel >= 2.4
-BuildRequires: gettext
-BuildRequires: mcs-devel >= 0.7
-BuildRequires: libmowgli-devel >= 0.4
-BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
-
-Requires: audacious-plugins >= %{aud_ver}
-
-# last tagged f8-final
-Provides: audacious-docklet
-Obsoletes: audacious-docklet < 0.1.1-3
+Requires: audacious-plugins >= %{aud_ver}
# Skin packages can require this from xmms and all GUI compatible players
-Provides: xmms-gui
+Provides: xmms-gui
%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.
+based on Winamp 2.x skins.
-%package libs
-Summary: Library files for the Audacious media player
-Group: System Environment/Libraries
+%package libs
+Summary: Library files for the Audacious media player
+Group: System Environment/Libraries
-%description libs
+%description libs
Library files for the Audacious media player.
-%package devel
-Summary: Development files for the Audacious media player
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: glib2-devel, gtk2-devel >= 2.6, libglade2-devel >= 2.4
-Requires: mcs-devel
-Requires: libmowgli-devel
-Requires: pkgconfig
-Requires: dbus-glib-devel >= 0.60
+%package devel
+Summary: Development files for the Audacious media player
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: glib2-devel gtk2-devel
+Requires: dbus-glib-devel
+Requires: mcs-devel
+Requires: libmowgli-devel
+Requires: pkgconfig
-%description devel
+%description devel
Files needed when building software for the Audacious media player.
%prep
-%setup -q
-
-# Read xmms skins directory
-%patch0 -p1 -b .xmms-skins
-
-# Use bluecurve as default skin
-%patch1 -p1 -b .default-skin
-
-# Remove libSAD references from the public headers
-%patch10 -p1 -b libsad-header
-
-# Fix segfaults if no playlist exists
-%patch11 -p1 -b playlist-length
-
-# When passing a file on the command line, play the file, not the first playlist entry
-%patch12 -p1 -b playlist-play-clicked
-
-# /usr/bin/audacious looks for the fedora-audacious.desktop file
-%patch13 -p1 -b .desktop-name
+%setup -q -n %{name}-%{version}
sed -i '\,^.SILENT:,d' buildsys.mk.in
%build
-%configure \
+%configure \
+ --disable-sse2 \
--disable-rpath \
- --enable-chardet \
- --enable-dbus \
- --disable-sse2 \
--disable-dependency-tracking
make %{?_smp_mflags}
@@ -100,29 +81,25 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
%find_lang %{name}
-desktop-file-install --vendor fedora \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --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 \
- --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%{_libdir}/audacious
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/audacious.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+desktop-file-install \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --remove-mime-type audio/mp3 \
+ --remove-mime-type audio/mpeg \
+ --remove-mime-type audio/mpegurl \
+ --remove-mime-type audio/x-mp3 \
+ --remove-mime-type audio/x-mpeg \
+ --remove-mime-type audio/x-mpegurl \
+ --remove-mime-type audio/x-ms-wma \
+ --remove-mime-type audio/x-scpls \
+ --remove-category Application \
+ $RPM_BUILD_ROOT%{_datadir}/applications/audacious2.desktop
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-rm -rf $RPM_BUILD_ROOT%{_includedir}/libSAD
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/audacious2.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
%clean
@@ -151,153 +128,34 @@ gtk-update-icon-cache %{_datadir}/icons/
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
-%{_bindir}/audacious
-%{_bindir}/audtool
+%{_bindir}/audacious2
+%{_bindir}/audtool2
%{_datadir}/audacious/
%{_mandir}/man[^3]/*
-%{_datadir}/applications/*
+%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/48x48/apps/*
%files libs
%defattr(-,root,root,-)
-%{_libdir}/audacious/
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/audacious/
+%{_includedir}/libaudcore/
+%{_includedir}/libSAD/
%{_libdir}/*.so
-%{_libdir}/pkgconfig/*
+%{_libdir}/pkgconfig/*.pc
%changelog
-* Sat Jun 6 2009 Michael Schwendt <mschwendt at fedoraproject.org>
-- Remove unapplied patches and verify that they have been merged.
-
-* Fri Jun 5 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-9
-- update post/postun/posttrans scriptlets to match guidelines
-- drop BR GConf2-devel
-- drop obsolete configure options
-- drop ancient Obsoletes/Provides for BMP
-- minor spec updates
-
-* Thu Jun 4 2009 Michael Schwendt <mschwendt at fedoraproject.org>
-- Patch /usr/bin/audacious to find fedora-audacious.desktop file.
-
-* Fri May 01 2009 Ralf Ertzinger <ralf at skytale.net> 1.5.1-8
-- Fix for "segfault with no playlist present" (BZ#475691)
-- Fix for broken playlist handling (BZ#475691), patch from
- http://launchpadlibrarian.net/19179891/audacious_1.5.1-3ubuntu1.1.debdiff
-
-* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.5.1-7
-- Add "xmms-gui" provides, to be required from xmms-skins package (#470135).
-
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Nov 17 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.1-5
-- Disable SSE2
-
-* Mon Oct 13 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.1-4
-- Remove lingering references to libSAD from the installed
- headers
-
-* Sat Sep 06 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.1-3
-- Remove libSAD headers from devel package, they were not meant
- to be public
-
-* Fri Jun 27 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.1-2
-- Add Requires: dbus-glib-devel to audacious-devel
-
-* Sat Jun 07 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.1-1
-- Update to 1.5.1
-
-* Mon Apr 07 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.0-1
-- Update to 1.5.0
-
-* Mon Feb 11 2008 Ralf Ertzinger <ralf at skytale.net> 1.4.6-1
-- Update to 1.4.6
-
-* Sat Dec 29 2007 Ralf Ertzinger <ralf at skytale.net> 1.4.5-1
-- Update to 1.4.5
-
-* Mon Dec 03 2007 Ralf Ertzinger <ralf at skytale.net> 1.4.4-1
-- Update to 1.4.4
-
-* Sat Dec 01 2007 Ralf Ertzinger <ralf at skytale.net> 1.4.2-3
-- Add patch to fix streams sometimes being left open
-- Obsolete: audacious-docklet
-
-* Thu Nov 19 2007 Ralf Ertzinger <ralf at skytale.net> 1.4.2-2
-- Update to 1.4.2
-
-* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.3.2-3
-- Rebuild for selinux ppc32 issue.
-
-* Sat Aug 25 2007 Ralf Ertzinger <ralf at skytale.net> 1.3.2-2
-- Clarify License: tag
-
-* Sat Apr 07 2007 Ralf Ertzinger <ralf at skytale.net> 1.3.2-1.fc7
-- Update to 1.3.2
-
-* Mon Apr 02 2007 Ralf Ertzinger <ralf at skytale.net> 1.3.1-2.fc7
-- Add missing Requires: to -devel package
-
-* Mon Apr 02 2007 Ralf Ertzinger <ralf at skytale.net> 1.3.1-1.fc7
-- Update to 1.3.1
-- Rebase still necessary patches
-
-* Sun Dec 24 2006 Ralf Ertzinger <ralf at skytale.net> 1.2.2-2.fc7
-- Remove audacious-1.1.1-controlsocket-name.patch due to request
- from upstream, xmms and audacious are not entirely compatible
-
-* Sun Nov 30 2006 Ralf Ertzinger <ralf at skytale.net> 1.2.2-1.fc7
-- Update to 1.2.2
-
-* 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
-
-* Wed Sep 06 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.2-1.fc6
-- 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
-
-* Mon Aug 14 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.1-4.fc6
-- Fix %%20 in playlist entries
-
-* Sun Jul 30 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.1-3.fc6
-- Bump for rebuild
-
-* Sun Jul 30 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.1-2.fc6
-- Change the name of the control socket to "xmms" instead of
- audacious. This makes programs that remote control xmms
- (and compatibles) work.
-
-* Sun Jul 30 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.1-1.fc6
-- Update to 1.1.1
-- Drop amidi path patch
-- Add shaded playlist skin patch (seems like audacious needs it,
- too)
-
-* Fri Jul 21 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.0-1.fc6
-- Update to 1.1.0 final
-- Rediff some patches
-
-* Sun Jul 9 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.0-0.2.dr2.fc6
-- Fix quoting of filenames
-
-* Thu Jun 29 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.0-0.1.dr2.fc6
-- Fixed version for Extras review
- - Build OSS, arts and jack output plugins
- - Split esd, arts and jack into separate packages
- - Fix rpath issue
- - Fix absolute symlinks
+* Tue Jul 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-1
+- Upgrade to 2.1 final.
-* Sat Jun 24 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.0-0.0.dr2.fc6
-- Initial build for Fedora Extras
+* Mon Jun 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-0.1.beta1
+- Upgrade to 2.1beta1.
+- Drop obsolete patches.
+
+* Fri Jun 5 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.1-0.1
+- Initial package for Audacious 2.0.1
+ based on a major spec overhaul of the older Fedora packages.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources 7 Jun 2008 20:54:14 -0000 1.14
+++ sources 14 Jul 2009 17:09:26 -0000 1.15
@@ -1 +1 @@
-3c206a6d06d49d8a68f0edd9933d2219 audacious-1.5.1.tgz
+03ab6a062e5909214841f90f767f1147 audacious-2.1.tgz
--- audacious-1.5.1-default-skin.patch DELETED ---
--- audacious-1.5.1-desktop-name.patch DELETED ---
--- audacious-1.5.1-libsad-header.patch DELETED ---
--- audacious-1.5.1-playlist-length.patch DELETED ---
--- audacious-1.5.1-playlist-play-clicked.patch DELETED ---
--- audacious-1.5.1-xmms-skins.patch DELETED ---
More information about the fedora-extras-commits
mailing list