- do not list %{_desktopdir}/* -- dangerous, could list directories unexpectedly

[packages/audacity.git] / audacity.spec

diff --git a/audacity.spec b/audacity.spec
index 12d9a53cef464ef140d8d569ebd7063b6c38fbba..d9815a841ac598071da4a53755e38a27a6713aca 100644 (file)
--- a/audacity.spec
+++ b/audacity.spec
@@ -1,23 +1,21 @@
-#
-# Conditional build:
-%bcond_with    gtk1    # use wxGTK instead of wxGTK2
-#
 Summary:       Audacity - manipulate digital audio waveforms
 Summary(pl):   Audacity - narzêdzie do obróbki plików d¼wiêkowych
 Summary(ru):   Êðîññïëàòôîðìåííûé çâóêîâîé ðåäàêòîð
 Name:          audacity
-Version:       1.2.3
+Version:       1.2.4b
 Release:       2
 License:       GPL
 Vendor:                Dominic Mazzoni <dominic@minorninth.com>
 Group:         X11/Applications/Sound
 Source0:       http://dl.sourceforge.net/audacity/%{name}-src-%{version}.tar.gz
-# Source0-md5: dbfc1b401420aa694753d35acb5a8a28
+# Source0-md5: 37df5b6119302f7ab77ca16d25311756
 Source1:       %{name}.desktop
 Source2:       %{name}-icon.png
 Patch0:                %{name}-system-expat.patch
 Patch1:                %{name}-not_require_lame-libs-devel.patch
 Patch2:                %{name}-opt.patch
+Patch3:                %{name}-types.patch
+Patch4:                %{name}-gcc4.patch
 URL:           http://audacity.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -33,8 +31,7 @@ BuildRequires:        libsndfile-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libvorbis-devel >= 1:1.0
 BuildRequires: which
-%{?with_gtk1:BuildRequires:    wxGTK-devel >= 2.4.0}
-%{?!with_gtk1:BuildRequires:   wxGTK2-devel >= 2.4.0}
+BuildRequires: wxGTK2-devel >= 2.6.0
 BuildRequires: zip
 Requires:      lame-libs
 Requires:      libid3tag >= 0.15.0b-2
@@ -66,12 +63,14 @@ Audacity - 
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
 cp -f /usr/share/automake/config.sub lib-src/soundtouch/config
 %{__autoconf}
-export WX_CONFIG="`which wxgtk%{!?_with_gtk1:2}-2.4-config`"
+export WX_CONFIG="`which wx-gtk2-ansi-config`"
 %configure \
        --with-help \
        --with-id3tag=system \
@@ -80,9 +79,12 @@ export WX_CONFIG="`which wxgtk%{!?_with_gtk1:2}-2.4-config`"
        --with-libsndfile=system \
        --with-libflac=system \
        --with-vorbis=system
+cd lib-src/soundtouch
+%{__autoconf}
+%configure
+cd ../..
 
 %{__make} \
-       CCC="%{__cxx} -fno-rtti" \
        OPTFLAGS="%{rpmcflags}"
 
 %install
@@ -96,6 +98,8 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
+mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{zh,zh_CN}
+
 %find_lang %{name}
 
 %clean
@@ -107,5 +111,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/audacity
 %{_datadir}/%{name}
 %{_mandir}/man1/*.1*
-%{_desktopdir}/*
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/*