12:06 p.m.
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12488
Modified Files:
.cvsignore audacity-freeworld.spec sources
Added Files:
audacity-2.0.6-non-dl-ffmpeg.patch
Log Message:
update to upstream release 2.0.6
update non-dl-ffmpeg.patch to match this version
audacity-2.0.6-non-dl-ffmpeg.patch:
FFmpeg.h | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE audacity-2.0.6-non-dl-ffmpeg.patch ---
--- audacity-src-2.0.6/src/FFmpeg.h.orig 2015-01-11 19:53:49.892024743 +1100
+++ audacity-src-2.0.6/src/FFmpeg.h 2015-01-11 19:56:22.301395755 +1100
@@ -42,6 +42,7 @@
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
+ #include <libavformat/avio.h>
#include <libavutil/fifo.h>
#include <libavutil/mathematics.h>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 14 Sep 2013 14:34:28 -0000 1.16
+++ .cvsignore 12 Jan 2015 12:06:57 -0000 1.17
@@ -1 +1 @@
-audacity-minsrc-2.0.4.tar.xz
+audacity-minsrc-2.0.6.tar.xz
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- audacity-freeworld.spec 30 Aug 2014 23:59:06 -0000 1.31
+++ audacity-freeworld.spec 12 Jan 2015 12:06:57 -0000 1.32
@@ -1,7 +1,7 @@
Name: audacity-freeworld
-Version: 2.0.4
-Release: 4%{?dist}
+Version: 2.0.6
+Release: 1%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -12,18 +12,19 @@
# use for upstream source releases:
#Source0:
http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%#{version}-...
-Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.xz
+Source0: http://downloads.sourceforge.net/audacity/audacity-minsrc-%{version}.tar.xz
%define tartopdir audacity-src-%{version}
Patch1: audacity-2.0.4-libmp3lame-default.patch
-Patch2: audacity-1.3.9-libdir.patch
+# Patch2: audacity-1.3.9-libdir.patch
# add audio/x-flac
# remove audio/mpeg, audio/x-mp3
# enable startup notification
# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
Patch3: audacity-2.0.2-desktop.in.patch
-Patch4: audacity-2.0.3-non-dl-ffmpeg.patch
-Patch5: audacity-2.0.4-equalization-segfault.patch
+Patch4: audacity-2.0.6-non-dl-ffmpeg.patch
+# BZ#1076795:
+# Patch5: audacity-2.0.4-equalization-segfault.patch
Provides: audacity-nonfree = %{version}-%{release}
Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -48,7 +49,8 @@
BuildRequires: zlib-devel
BuildRequires: wxGTK-devel
BuildRequires: libmad-devel
-BuildRequires: ffmpeg-compat-devel
+#B#uildRequires: ffmpeg-compat-devel
+BuildRequires: ffmpeg-devel
BuildRequires: lame-devel
BuildRequires: twolame-devel
# For new symbols in portaudio
@@ -68,7 +70,7 @@
# Substitute hardcoded library paths.
%patch1 -b .libmp3lame-default
-%patch2 -p1 -b .libdir
+# %patch2 -p1 -b .libdir
for i in src/effects/ladspa/LoadLadspa.cpp src/AudacityApp.cpp src/export/ExportMP3.cpp
do
sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
@@ -83,8 +85,8 @@
done
%patch3 -b .desktop.old
-%patch4 -p1 -b .2.0.3-non-dl-ffmpeg
-%patch5 -b .2.0.4-equalization-segfault
+%patch4 -p1 -b .2.0.6-non-dl-ffmpeg
+# %patch5 -b .2.0.4-equalization-segfault
%build
@@ -142,21 +144,25 @@
%post
umask 022
-update-mime-database %{_datadir}/mime &> /dev/null || :
+# update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
%postun
umask 022
-update-mime-database %{_datadir}/mime &> /dev/null || :
+# update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%files -f %{realname}.lang
@@ -167,6 +173,7 @@
%{_datadir}/%{realname}/plug-ins/
%{_mandir}/man*/*
%{_datadir}/applications/*
+%{_datadir}/appdata/%{realname}.appdata.xml
%{_datadir}/pixmaps/*
%{_datadir}/icons/hicolor/*/apps/%{realname}.*
%{_datadir}/mime/packages/*
@@ -175,6 +182,10 @@
%changelog
+* Mon Jan 12 2015 David Timms <iinet.net.au@dtimms> - 2.0.6-1
+- update to upstream release 2.0.6
+- update non-dl-ffmpeg.patch to match this version
+
* Sat Aug 30 2014 Sérgio Basto <sergio(a)serjux.com> - 2.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 14 Sep 2013 14:34:28 -0000 1.16
+++ sources 12 Jan 2015 12:06:57 -0000 1.17
@@ -1 +1 @@
-739e4e12a8a4f30e305f04493099ff5b audacity-minsrc-2.0.4.tar.xz
+fb7b39a1ec8cb562be5ee65725af8832 audacity-minsrc-2.0.6.tar.xz