rpms/audacity/FC-5 audacity-1.3.0b-gcc41.patch, NONE, 1.1 audacity-1.3.0b-install.patch, NONE, 1.1 audacity-1.3.0b-lsrver.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 audacity.spec, 1.13, 1.14 sources, 1.5, 1.6
Gérard Milmeister (gemi)
fedora-extras-commits at redhat.com
Sun Mar 26 21:49:33 UTC 2006
Author: gemi
Update of /cvs/extras/rpms/audacity/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17363
Modified Files:
.cvsignore audacity.spec sources
Added Files:
audacity-1.3.0b-gcc41.patch audacity-1.3.0b-install.patch
audacity-1.3.0b-lsrver.patch
Log Message:
new version 1.3.0beta
audacity-1.3.0b-gcc41.patch:
--- NEW FILE audacity-1.3.0b-gcc41.patch ---
--- audacity-src-1.3.0b-beta/lib-src/soundtouch/include/SoundTouch.h.gcc41 2006-03-26 22:23:42.000000000 +0200
+++ audacity-src-1.3.0b-beta/lib-src/soundtouch/include/SoundTouch.h 2006-03-26 22:24:01.000000000 +0200
@@ -146,7 +146,7 @@
static const char *getVersionString();
/// Get SoundTouch library version Id
- static uint SoundTouch::getVersionId();
+ static uint getVersionId();
/// Sets new rate control value. Normal rate = 1.0, smaller values
/// represent slower rate, larger faster rates.
audacity-1.3.0b-install.patch:
--- NEW FILE audacity-1.3.0b-install.patch ---
--- audacity-src-1.3.0b-beta/locale/Makefile.in.install 2006-03-26 23:03:18.000000000 +0200
+++ audacity-src-1.3.0b-beta/locale/Makefile.in 2006-03-26 23:03:34.000000000 +0200
@@ -17,7 +17,7 @@
INSTALL=@INSTALL@
AUDACITY_NAME=@AUDACITY_NAME@
ifdef DESTDIR
- INSTALL_PATH=$(top_srcdir)/$(DESTDIR)
+ INSTALL_PATH=$(DESTDIR)
else
INSTALL_PATH=
endif
audacity-1.3.0b-lsrver.patch:
--- NEW FILE audacity-1.3.0b-lsrver.patch ---
--- audacity-src-1.3.0b-beta/configure.lsrver 2006-03-26 23:00:25.000000000 +0200
+++ audacity-src-1.3.0b-beta/configure 2006-03-26 23:01:10.000000000 +0200
@@ -5103,23 +5103,23 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for samplerate >= 0.15.0" >&5
-echo $ECHO_N "checking for samplerate >= 0.15.0... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for samplerate >= 0.1.2" >&5
+echo $ECHO_N "checking for samplerate >= 0.1.2... $ECHO_C" >&6
- if $PKG_CONFIG --exists "samplerate >= 0.15.0" ; then
+ if $PKG_CONFIG --exists "samplerate >= 0.1.2" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
echo "$as_me:$LINENO: checking SAMPLERATE_CFLAGS" >&5
echo $ECHO_N "checking SAMPLERATE_CFLAGS... $ECHO_C" >&6
- SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.15.0"`
+ SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.1.2"`
echo "$as_me:$LINENO: result: $SAMPLERATE_CFLAGS" >&5
echo "${ECHO_T}$SAMPLERATE_CFLAGS" >&6
echo "$as_me:$LINENO: checking SAMPLERATE_LIBS" >&5
echo $ECHO_N "checking SAMPLERATE_LIBS... $ECHO_C" >&6
- SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.15.0"`
+ SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.1.2"`
echo "$as_me:$LINENO: result: $SAMPLERATE_LIBS" >&5
echo "${ECHO_T}$SAMPLERATE_LIBS" >&6
else
@@ -5127,7 +5127,7 @@
SAMPLERATE_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate >= 0.15.0"`
+ SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate >= 0.1.2"`
fi
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Mar 2006 23:23:18 -0000 1.3
+++ .cvsignore 26 Mar 2006 21:49:32 -0000 1.4
@@ -1 +1 @@
-audacity-src-1.2.4b.tar.gz
+audacity-src-1.3.0b.tar.gz
Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- audacity.spec 17 Mar 2006 23:23:18 -0000 1.13
+++ audacity.spec 26 Mar 2006 21:49:32 -0000 1.14
@@ -1,35 +1,44 @@
Name: audacity
-Version: 1.2.4
-Release: 0.1.b%{?dist}
+Version: 1.3.0
+Release: 1.beta.1%{?dist}
Summary: A multitrack audio editor
Group: Applications/Multimedia
License: GPL
URL: http://audacity.sourceforge.net
-Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.4b.tar.gz
+Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.3.0b.tar.gz
Source1: audacity.png
-Patch1: audacity-1.2.2-aboutdialog.patch
-Patch2: audacity-1.2.3-gcc41.patch
-Patch3: audacity-1.2.4b-missing-pango.patch
+#Patch1: audacity-1.2.2-aboutdialog.patch
+#Patch2: audacity-1.2.3-gcc41.patch
+#Patch3: audacity-1.2.4b-missing-pango.patch
+Patch4: audacity-1.3.0b-gcc41.patch
+Patch5: audacity-1.3.0b-lsrver.patch
+Patch6: audacity-1.3.0b-install.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libogg-devel, libvorbis-devel, zlib-devel, perl
-BuildRequires: gettext, zip, flac-devel, ladspa-devel
-BuildRequires: libsamplerate-devel, libsndfile-devel
-BuildRequires: libid3tag-devel, desktop-file-utils
+BuildRequires: libogg-devel
+BuildRequires: libvorbis-devel
+BuildRequires: zlib-devel
+BuildRequires: perl
+BuildRequires: gettext
+BuildRequires: zip
+BuildRequires: flac-devel
+BuildRequires: ladspa-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libid3tag-devel
+BuildRequires: desktop-file-utils
+BuildRequires: wxGTK-devel >= 2.6.2
%{?_with_mp3:BuildRequires: libmad-devel}
-%{?_with_gtk2:BuildRequires: compat-wxGTK2-devel}
-%{!?_with_gtk2:BuildRequires: compat-wxGTK-devel}
# libwx_gtk2-2.4.so: undefined reference to `pango_x_get_context'
-%{?_with_gtk2: BuildRequires: pango-devel}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+#%{?_with_gtk2: BuildRequires: pango-devel}
+Requires(post): desktop-file-utils, shared-mime-info
+Requires(postun): desktop-file-utils, shared-mime-info
# Compile options:
# --with mp3 : enable mp3 support
# --with gtk2 : use GTK+ 2.x version of wxGTK, else GTK+ 1.x version
# --with portaudiov19 : enable version 19 of portaudio (disables portmixer)
-
%description
Audacity is a cross-platform multitrack audio editor. It allows you to
record sounds directly or to import Ogg, WAV, AIFF, AU, IRCAM, or MP3
@@ -38,29 +47,47 @@
and the audio I/O currently uses OSS under Linux. Audacity runs on
Linux/*BSD, MacOS, and Windows.
+
%prep
-%setup -q -n %{name}-src-%{version}b
-%patch1 -p1 -b .aboutdialog
-%patch2 -p1 -b .gcc4
-%{?_with_gtk2: %patch3 -p1 -b .missing-pango }
+%setup -q -n %{name}-src-%{version}b-beta
+#%patch1 -p1 -b .aboutdialog
+#%patch2 -p1 -b .gcc4
+#%{?_with_gtk2: %patch3 -p1 -b .missing-pango }
+%patch4 -p1 -b .gcc41
+%patch5 -p1 -b .lsrver
+%patch6 -p1 -b .install
+
+# convert Languages.cpp from latin1 to UTF-8
cp -a src/Languages.cpp src/Languages.cpp.orig
iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp
+
+# is this still necessary?
for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp
do
perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i
done
+
%build
# Push a softlink into PATH so the renamed wx-config inside
# the compat-wxGTK2-devel package is found and taken.
-%define mybindir __mybin__
-mkdir %{mybindir}
-ln -s $(which wx-2.4-config) %{mybindir}/wx-config
-export PATH=$(pwd)/%{mybindir}:$PATH
-
-%configure --with-help --with-libsndfile=system --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer}
+#%define mybindir __mybin__
+#mkdir %{mybindir}
+#ln -s $(which wx-2.4-config) %{mybindir}/wx-config
+#export PATH=$(pwd)/%{mybindir}:$PATH
+
+%configure \
+ --with-help \
+ --with-libsndfile=system \
+ --with-libflac=system \
+ --with-ladspa \
+ --with-vorbis=system \
+ --with-id3tag=system \
+ %{?_with_mp3:--with-libmad=system} \
+ %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer}
make
+
%install
rm -rf ${RPM_BUILD_ROOT}
make DESTDIR=${RPM_BUILD_ROOT} install
@@ -78,7 +105,7 @@
Comment=A multitrack audio editor
Encoding=UTF-8
X-Desktop-File-Install-Version=0.4
-MimeType=audio/*;application/ogg;application/x-ogg;audio/x-ogg
+MimeType=application/ogg;application/x-ogg;audio/x-ogg;audio/x-wav;audio/x-flac;audio/aiff;audio/x-aifc;audio/aiffc;audio/x-aiff;audio/basic;application/x-audacity-project
StartupWMClass=Audacity
EOF
@@ -95,12 +122,17 @@
%clean
rm -rf ${RPM_BUILD_ROOT}
+
%post
+/usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1 || :
/usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+
%postun
+/usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1 || :
/usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/*
@@ -108,9 +140,14 @@
%{_mandir}/*/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
+%{_datadir}/mime/packages/*
%doc %{_datadir}/doc/*
+
%changelog
+* Sun Mar 26 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.3.0-1.beta.1
+- new version 1.3.0beta
+
* Fri Mar 17 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-0.1.b
- Update to 1.2.4b (stable release).
- Follow upstream recommendation and use the GTK+ 1.x wxGTK.
@@ -163,4 +200,3 @@
* Sat Oct 25 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:1.2.0-pre2.fdr.1
- First Fedora release
-
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 17 Mar 2006 23:23:18 -0000 1.5
+++ sources 26 Mar 2006 21:49:32 -0000 1.6
@@ -1 +1 @@
-37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz
+d1c5a3359ad95eab6ca8b375972c1a91 audacity-src-1.3.0b.tar.gz
More information about the fedora-extras-commits
mailing list