- up to 1.2.0-pre2

- disabled build with system expat (incompatiblity?)
- disabled build with system id3tag (same as above)
- help file is back
- it won't builds with -fnoexeptions (removed)
- .desktop moved to desktopdir
- builds and works ok
  NOTE: needs some investigation about expat and id3tag

Changed files:
    audacity.spec -> 1.35

diff --git a/audacity.spec b/audacity.spec
index a52737cf940a53dce439b8a348f12eeb4ac12fa1..ddf0f60eb08123dc0c93cc11e0f8ac420c9dd6fa 100644 (file)
--- a/audacity.spec
+++ b/audacity.spec
@@ -6,13 +6,14 @@ 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.1.3
-Release:       2
+Version:       1.2.0
+%define                _pre pre2
+Release:       0.%{_pre}.1
 License:       GPL
 Vendor:                Dominic Mazzoni <dominic@minorninth.com>
 Group:         X11/Applications/Sound
-Source0:       http://dl.sourceforge.net/%{name}/%{name}-src-%{version}.tgz
-# Source0-md5: ec00d14cb2d7b3a28aab7e6aa098acf3
+Source0:       http://dl.sourceforge.net/sourceforge/%{name}/%{name}-src-%{version}-%{_pre}.tar.bz2
+# Source0-md5: 4cb15dbb0b8d295c4bd205d089a91a48
 Source1:       %{name}.desktop
 Source2:       %{name}-icon.png
 Patch0:                %{name}-system-expat.patch
@@ -21,7 +22,7 @@ Patch2:               %{name}-not_require_lame-libs-devel.patch
 Patch3:                %{name}-opt.patch
 URL:           http://audacity.sourceforge.net/
 BuildRequires: autoconf
-BuildRequires: expat-devel
+#BuildRequires:        expat-devel
 BuildRequires: fftw-devel >= 2.1.4
 BuildRequires: flac-devel
 BuildRequires: gettext-devel
@@ -31,7 +32,7 @@ BuildRequires:        libsamplerate-devel
 BuildRequires: libsndfile-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libvorbis-devel >= 1:1.0
-BuildRequires: libid3tag-devel
+#BuildRequires:        libid3tag-devel
 %{?_with_gtk1:BuildRequires:   wxGTK-devel >= 2.4.0}
 %{!?_with_gtk1:BuildRequires:  wxGTK2-devel >= 2.4.0}
 BuildRequires: zip
@@ -60,10 +61,10 @@ Audacity - 
 ïëàãèíîâ, ê ëþáîé ÷àñòè çâóêîâîãî ôàéëà.
 
 %prep
-%setup -q -n %{name}-src-%{version}
-%patch0 -p1
+%setup -q -n %{name}-src-%{version}-%{_pre}
+#%%patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%%patch2 -p1
 %patch3 -p1
 
 %build
@@ -71,7 +72,6 @@ Audacity - 
 export WX_CONFIG="`which wxgtk%{!?_with_gtk1:2}-2.4-config`"
 %configure \
        --with-help \
-       --with-id3tag=system \
        --with-libmad=system \
        --with-libsamplerate=system \
        --with-libsndfile=system \
@@ -79,22 +79,21 @@ export WX_CONFIG="`which wxgtk%{!?_with_gtk1:2}-2.4-config`"
        --with-vorbis=system
 
 %{__make} \
-       CCC="%{__cxx} -fno-exceptions -fno-rtti" \
+       CCC="%{__cxx} -fno-rtti" \
        OPTFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Multimedia,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        INSTALL_PATH=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Multimedia
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
-# not built in this version
-#install audacity-help.htb $RPM_BUILD_ROOT%{_datadir}/%{name}
+install audacity-1.2-help.htb $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %find_lang %{name}
 
@@ -107,5 +106,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/audacity
 %{_datadir}/%{name}
 %{_mandir}/man1/*.1*
-%{_applnkdir}/*/*
+%{_desktopdir}/*
 %{_pixmapsdir}/*