From a1981e47ad8cd72b04f15fcd9b348ffcbbf42d8d8d25b075784d1c79d636ddba Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Fri, 31 Aug 2012 08:44:27 +0000 Subject: [PATCH] Accepting request 132109 from home:RedDwarf:branches:multimedia:apps - Update to version 2.0.2 * A significant bug that caused clicks on split lines has been fixed * There are improvements to several toolbars and to some Nyquist effects - Update to version 2.0.1 * Keyboard shortcuts can now be allocated to effects * Nyquist plug-ins can be added to Chains - Run spec-cleaner - Use pkgconfig() style BuildRequires - Remove conditionals for unsupported openSUSE versions - Remove taglib build dependency. Not used any more - Remove libsamplerate dependency. Upstream prefers included libresample - Remove custom icon. Upstream already has a transparent version. - Add audacity-2.0.2-docdir.patch patch - Don't delete MIME type icon. Instead put it in %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-audacity-project.xpm - Add %icon_theme_cache_post, %mime_database_post and %desktop_database_post to %post - Recommend libmp3lame0, libavformat52, libavcodec52 and libavutil50 OBS-URL: https://build.opensuse.org/request/show/132109 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=62 --- audacity-2.0.2-docdir.patch | 25 ++++++ audacity-minsrc-2.0.0.tar.bz2 | 3 - audacity-minsrc-2.0.2.tar.bz2 | 3 + audacity.changes | 20 +++++ audacity.png | 3 - audacity.spec | 139 +++++++++++++++++----------------- 6 files changed, 118 insertions(+), 75 deletions(-) create mode 100644 audacity-2.0.2-docdir.patch delete mode 100644 audacity-minsrc-2.0.0.tar.bz2 create mode 100644 audacity-minsrc-2.0.2.tar.bz2 delete mode 100644 audacity.png diff --git a/audacity-2.0.2-docdir.patch b/audacity-2.0.2-docdir.patch new file mode 100644 index 0000000..a2dae4c --- /dev/null +++ b/audacity-2.0.2-docdir.patch @@ -0,0 +1,25 @@ +Index: Makefile.in +=================================================================== +--- Makefile.in.orig ++++ Makefile.in +@@ -10,6 +10,7 @@ MANDIR= @mandir@ + AUDACITY_NAME = @AUDACITY_NAME@ + EXTRAINSTALLTARGETS= @EXTRAINSTALLTARGETS@ + EXTRAUNINSTALLTARGETS= @EXTRAUNINSTALLTARGETS@ ++DOCDIR= @docdir@ + + .PHONY: all + all: audacity help/audacity.1.gz +@@ -31,9 +32,9 @@ install: audacity $(EXTRAINSTALLTARGETS) + $(INSTALL) -m 755 audacity $(DESTDIR)$(BINDIR)/$(AUDACITY_NAME) + + # install docs +- $(INSTALL) -d $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME) +- $(INSTALL) -m 644 README.txt $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/README.txt +- $(INSTALL) -m 644 LICENSE.txt $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/LICENSE.txt ++ $(INSTALL) -d $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 644 README.txt $(DESTDIR)$(DOCDIR)/README.txt ++ $(INSTALL) -m 644 LICENSE.txt $(DESTDIR)$(DOCDIR)/LICENSE.txt + + # install manpage + $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1 diff --git a/audacity-minsrc-2.0.0.tar.bz2 b/audacity-minsrc-2.0.0.tar.bz2 deleted file mode 100644 index 21b26ad..0000000 --- a/audacity-minsrc-2.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d849288ca5f90764d497953e7d2744e269bfbb6f71840762c66419e4c68aeb6a -size 6625078 diff --git a/audacity-minsrc-2.0.2.tar.bz2 b/audacity-minsrc-2.0.2.tar.bz2 new file mode 100644 index 0000000..9657396 --- /dev/null +++ b/audacity-minsrc-2.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac8a5ec62a5748de7f885fb3f82a6b6acdb26b28276827a678ec17ce65b9879d +size 6794285 diff --git a/audacity.changes b/audacity.changes index 0349dbb..5804517 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Aug 30 15:38:45 UTC 2012 - reddwarf@opensuse.org + +- Update to version 2.0.2 + * A significant bug that caused clicks on split lines has been fixed + * There are improvements to several toolbars and to some Nyquist effects +- Update to version 2.0.1 + * Keyboard shortcuts can now be allocated to effects + * Nyquist plug-ins can be added to Chains +- Run spec-cleaner +- Use pkgconfig() style BuildRequires +- Remove conditionals for unsupported openSUSE versions +- Remove taglib build dependency. Not used any more +- Remove libsamplerate dependency. Upstream prefers included libresample +- Remove custom icon. Upstream already has a transparent version. +- Add audacity-2.0.2-docdir.patch patch +- Don't delete MIME type icon. Instead put it in %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-audacity-project.xpm +- Add %icon_theme_cache_post, %mime_database_post and %desktop_database_post to %post +- Recommend libmp3lame0, libavformat52, libavcodec52 and libavutil50 + ------------------------------------------------------------------- Wed Mar 14 15:06:03 UTC 2012 - reddwarf@opensuse.org diff --git a/audacity.png b/audacity.png deleted file mode 100644 index 51160ff..0000000 --- a/audacity.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5af20a7bfc8c65f5ca71a3a0911d493ba39ff5a25d7b87b3af1f9d9ccd15531d -size 2127 diff --git a/audacity.spec b/audacity.spec index 6c93003..88cd7c3 100644 --- a/audacity.spec +++ b/audacity.spec @@ -21,50 +21,59 @@ %bcond_with twolame Name: audacity -BuildRequires: alsa-devel -BuildRequires: flac-devel +BuildRequires: desktop-file-utils BuildRequires: gcc-c++ -BuildRequires: jack-devel -BuildRequires: libexpat-devel -BuildRequires: libid3tag-devel -BuildRequires: libsamplerate-devel -BuildRequires: libsndfile-devel -BuildRequires: libvorbis-devel -# This would require to patch our portaudio package with "PortMixer"... an extra API that never got integrated in PortAudio. -#BuildRequires: portaudio-devel -BuildRequires: soundtouch-devel -BuildRequires: taglib-devel -BuildRequires: update-desktop-files -%if %suse_version > 1130 -BuildRequires: wxWidgets-wxcontainer-devel +BuildRequires: hicolor-icon-theme %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires -%else -BuildRequires: wxGTK-devel -%endif -BuildRequires: vamp-plugin-sdk-devel +BuildRequires: wxWidgets-devel +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(flac++) +BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0 +BuildRequires: pkgconfig(id3tag) +BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(shared-mime-info) +BuildRequires: pkgconfig(sndfile) +BuildRequires: pkgconfig(soundtouch) +BuildRequires: pkgconfig(vamp-hostsdk) +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(vorbisenc) +BuildRequires: pkgconfig(vorbisfile) +# This would require to patch our portaudio package with "PortMixer"... an extra API that never got integrated in PortAudio. +#BuildRequires: portaudio-devel %if %{with ffmpeg} -BuildRequires: libffmpeg-devel +BuildRequires: libffmpeg_oldabi-devel %endif %if %{with mad} -BuildRequires: libmad-devel +BuildRequires: pkgconfig(mad) %endif %if %{with twolame} -BuildRequires: libtwolame-devel +BuildRequires: pkgconfig(twolame) %endif -Version: 2.0.0 +Version: 2.0.2 Release: 0 Summary: A Free, Cross-Platform Digital Audio Editor License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Editors and Convertors Url: http://audacity.sourceforge.net/ -Source0: http://%{name}.googlecode.com/files/%{name}-minsrc-%{version}.tar.bz2 -Source1: %{name}.png -Source2: %{name}-license-nyquist -# PATCH-FIX-OPENSUSE %{name}-no_buildstamp.patch reddwarf@opensuse.org -- this patch removes the buildstamp -Patch0: %{name}-no_buildstamp.patch -Patch16: %{name}-implicit.patch +Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.bz2 +Source1: audacity-license-nyquist +# PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch reddwarf@opensuse.org -- this patch removes the buildstamp +Patch0: audacity-no_buildstamp.patch +# About the access to the bug tracker: "Generally we restrict Bugzilla accounts to experienced C++ developers, or to very experienced Audacity bug watchers who want to test our nightly builds regularly." +# Being a packager, it seems, it's not enough. I am not even going to discuss that stupid politic +# PATCH-FIX-UPSTREAM audacity-2.0.2-docdir.patch email wrote to feedback@audacityteam.org reddwarf@opensuse.org -- make configure honor --docdir +Patch1: audacity-2.0.2-docdir.patch +# PATCH-FIX-UPSTREAM audacity-implicit.patch email wrote to feedback@audacityteam.org reddwarf@opensuse.org -- Include ctype.h since it uses isdigit() +Patch2: audacity-implicit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: libmp3lame0 +Recommends: libavformat52 +Recommends: libavcodec52 +Recommends: libavutil50 %description Audacity is a program that manipulates digital audio wave forms. In @@ -74,57 +83,49 @@ and Ogg Vorbis. With Audacity, you can edit wave data larger than the physical memory size of your computer. %prep -%setup -q -n %{name}-src-%{version} +%setup -q -n audacity-src-%{version} %patch0 -%patch16 -%{__cp} %{S:2} LICENSE_NYQUIST.txt +%patch1 +%patch2 +cp %{SOURCE1} LICENSE_NYQUIST.txt +# Make sure we use the system versions +rm -r lib-src/libvamp/ +%if %{with ffmpeg} +rm -r lib-src/ffmpeg/ +%endif %build -%configure \ - --enable-unicode \ - --with-libvorbis=system \ -%if %{with ffmpeg} - --with-ffmpeg=system \ -%else - --without-ffmpeg \ -%endif -%if %{with mad} - --with-libmad=system \ -%else - --without-libmad \ -%endif -%if %{with twolame} - --with-libtwolame=system \ -%else - --without-libtwolame \ -%endif - --with-libsndfile=system \ - --with-libflac=system \ - --with-ladspa \ - --with-libid3tag=system \ - --with-libsamplerate=system -%{__make} %{?_smp_mflags} +%configure --docdir=%{_defaultdocdir}/audacity/ +make %{?_smp_mflags} %install -%makeinstall -%suse_update_desktop_file audacity -%{__install} -v -d -m755 %{buildroot}%{_datadir}/pixmaps -%{__install} -v -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps -#delete default icon we have nicer - transparent :) -%__rm %{buildroot}%{_datadir}/pixmaps/*.xpm -# we will add docs later in %files section -%__rm -rf %{buildroot}%{_datadir}/doc/audacity +%make_install +# email wrote to feedback@audacityteam.org +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/ +mv %{buildroot}%{_datadir}/pixmaps/gnome-mime-application-x-audacity-project.xpm %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-audacity-project.xpm +rm -r %{buildroot}%{_datadir}/pixmaps %find_lang %{name} +%post +%icon_theme_cache_post +%mime_database_post +%desktop_database_post + +%postun +%desktop_database_postun +%mime_database_postun +%icon_theme_cache_postun + %files -f %{name}.lang %defattr(-,root,root) %doc LICENSE.txt README.txt LICENSE_NYQUIST.txt -%doc %{_mandir}/man?/* +%{_defaultdocdir}/audacity/ +%{_mandir}/man1/audacity.1* %{_bindir}/audacity -%{_datadir}/audacity -%{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/*.png +%{_datadir}/audacity/ +%{_datadir}/applications/audacity.desktop %{_datadir}/mime/packages/audacity.xml -%{_datadir}/icons/hicolor/* +%{_datadir}/icons/hicolor/*/apps/audacity.* +%{_datadir}/icons/hicolor/*/mimetypes/application-x-audacity-project.* %changelog