From 0dbcf2acdb44586d5eee9edb9ae29c47d49a4a1f Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Jun 18 2012 17:38:12 +0000 Subject: Upgrade to 3.3-alpha1. --- diff --git a/.gitignore b/.gitignore index 0ab2579..7b63bac 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /audacious-plugins-3.2.1.tar.bz2 /audacious-plugins-3.2.2.tar.bz2 /audacious-plugins-3.2.3.tar.bz2 +/audacious-plugins-3.3-alpha1.tar.bz2 diff --git a/README.licenses b/README.licenses new file mode 100644 index 0000000..b4fdda5 --- /dev/null +++ b/README.licenses @@ -0,0 +1,65 @@ +aac +adplug LGPLv2+ +alarm GPLv2+ +albumart MIT +alsa BSD +amidi-plug GPLv2+ +aosd GPLv2+ +asx GPLv2+ +audpl BSD +blur_scope GPLv2+ +bs2b GPLv2+ +cairo-spectrum MIT +cdaudio-ng GPLv3 +cd-menu-items GPLv3 +compressor BSD +console LGPLv2+ +crossfade BSD +crystalizer MIT +cue GPLv3 +echo_plugin +ffaudio +filewriter GPLv2+ +flacng GPLv3 +gio BSD +gnomeshortcuts GPLv2+ +gtkui GPLv3 +hotkey GPLv2+ +jack LGPLv2+ +ladspa BSD +lirc GPLv2+ +lyricwiki MIT +m3u GPLv2+ +Makefile +metronom GPLv2+ +mixer BSD +mms +modplug Public Domain +mpg123 +mpris2 BSD +neon GPLv2+ +notify GPLv3+ +oss4 +pls GPLv3 +psf BSD +pulse_audio GPLv2+ +resample BSD +scrobbler +sdlout BSD +search-tool BSD +sid +skins GPLv3 +sndfile GPLv2+ +sndio +song_change +speed-pitch BSD +statusicon GPLv2+ +stereo_plugin +tonegen GPLv2+ +unix-io BSD +voice_removal MIT +vorbis LGPLv2+ +vtx GPLv2+ +wavpack +xsf BSD +xspf GPLv2+ diff --git a/audacious-plugins-3.0-alpha1-enable-gnomeshortcuts.patch b/audacious-plugins-3.0-alpha1-enable-gnomeshortcuts.patch deleted file mode 100644 index 64398d8..0000000 --- a/audacious-plugins-3.0-alpha1-enable-gnomeshortcuts.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur audacious-plugins-fedora-3.0-alpha1-orig/src/gnomeshortcuts/gnomeshortcuts.c audacious-plugins-fedora-3.0-alpha1/src/gnomeshortcuts/gnomeshortcuts.c ---- audacious-plugins-fedora-3.0-alpha1-orig/src/gnomeshortcuts/gnomeshortcuts.c 2011-06-12 03:42:34.000000000 +0200 -+++ audacious-plugins-fedora-3.0-alpha1/src/gnomeshortcuts/gnomeshortcuts.c 2011-06-14 13:55:18.676505864 +0200 -@@ -46,6 +46,7 @@ - AUD_GENERAL_PLUGIN - ( - .name = "Gnome Shortcuts", -+ .enabled_by_default = TRUE, - .init = init, - .about = about, - .cleanup = cleanup diff --git a/audacious-plugins-3.3-alpha1-enable-gnomeshortcuts.patch b/audacious-plugins-3.3-alpha1-enable-gnomeshortcuts.patch new file mode 100644 index 0000000..d7b94ee --- /dev/null +++ b/audacious-plugins-3.3-alpha1-enable-gnomeshortcuts.patch @@ -0,0 +1,11 @@ +diff -Nurb --strip-trailing-cr audacious-plugins-3.3-alpha1-orig/src/gnomeshortcuts/gnomeshortcuts.c audacious-plugins-3.3-alpha1/src/gnomeshortcuts/gnomeshortcuts.c +--- audacious-plugins-3.3-alpha1-orig/src/gnomeshortcuts/gnomeshortcuts.c 2012-06-17 15:54:33.000000000 +0200 ++++ audacious-plugins-3.3-alpha1/src/gnomeshortcuts/gnomeshortcuts.c 2012-06-18 19:00:59.850713197 +0200 +@@ -48,6 +48,7 @@ + AUD_GENERAL_PLUGIN + ( + .name = N_("Gnome Shortcuts"), ++ .enabled_by_default = TRUE, + .domain = PACKAGE, + .about_text = about, + .init = init, diff --git a/audacious-plugins.spec b/audacious-plugins.spec index 1d41556..c749e8b 100644 --- a/audacious-plugins.spec +++ b/audacious-plugins.spec @@ -4,31 +4,32 @@ %endif %{?aud_plugin_dep} -%global tar_ver %{version} +%global tar_ver %{version}-alpha1 # Minimum audacious/audacious-plugins version in inter-package dependencies. -%global aud_ver 3.2 +%global aud_ver 3.3 Name: audacious-plugins -Version: 3.2.3 -Release: 2%{?dist} +Version: 3.3 +Release: 0.1.alpha1%{?dist} Summary: Plugins for the Audacious audio player Group: Applications/Multimedia URL: http://audacious-media-player.org/ -# LGPLv2+: adplug, bio2jack, console -# MIT: crystalizer, dockalbumart, ladspa, lyricwiki, mixer, voice_removal -# BSD: alsa, compressor, crossfade, psf, resample, unix-io, xsf -License: GPLv2 and GPLv2+ and LGPLv2+ and MIT and GPLv3 +# list of license per plugin in README.licences +License: GPLv2+ and LGPLv2+ and GPLv3 and MIT and BSD Source0: http://distfiles.audacious-media-player.org/audacious-plugins-%{tar_ver}.tar.bz2 +%if 0%{?fedora} <= 17 Source1: audacious-sid.desktop +%endif Source2: audacious-amidi.desktop +Source3: README.licenses # Fedora customization Patch0: audacious-plugins-3.0-alpha1-xmms-skindir.patch # Fedora customization (RFE bz #632388) -Patch1: audacious-plugins-3.0-alpha1-enable-gnomeshortcuts.patch +Patch1: audacious-plugins-3.3-alpha1-enable-gnomeshortcuts.patch # Fedora customization: add default system-wide module_path Patch2: audacious-plugins-3.1-beta1-ladspa.patch @@ -53,15 +54,12 @@ BuildRequires: libcdio-devel BuildRequires: libcue-devel BuildRequires: SDL-devel BuildRequires: lirc-devel -#BuildRequires: bluez-libs-devel BuildRequires: libcddb-devel BuildRequires: libmtp-devel BuildRequires: libxml2-devel BuildRequires: libnotify-devel BuildRequires: libbs2b-devel BuildRequires: curl-devel -# 3.1-beta2: smb transport disabled by default, would need --enable-smb -#BuildRequires: libsmbclient-devel # experimental, disabled by default BuildRequires: neon-devel @@ -248,6 +246,9 @@ update-desktop-database &> /dev/null || : %changelog +* Mon Jun 18 2012 Michael Schwendt - 3.3-0.1.alpha1 +- Upgrade to 3.3-alpha1. + * Wed May 30 2012 Michael Schwendt - 3.2.3-2 - Fedora 18 only: Kill -sid subpackage, don't build libsidplay1 plugin anymore. diff --git a/sources b/sources index 6f25a06..dbd6b63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9645637fb108f4d5cc47e72d194c5574 audacious-plugins-3.2.3.tar.bz2 +fae8e1291d17b9fc3bb536bc26f05b16 audacious-plugins-3.3-alpha1.tar.bz2