- solved linking with external expat library

- due to changes in included id3tag lib it can't be build with system lib
- new style bcond

Changed files:
    audacity.spec -> 1.36

diff --git a/audacity.spec b/audacity.spec
index ddf0f60eb08123dc0c93cc11e0f8ac420c9dd6fa..b0d3f8685281a673e7f014012eaa27f2afbf9f66 100644 (file)
--- a/audacity.spec
+++ b/audacity.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-# _with_gtk1   - use wxGTK instead of wxGTK2
+%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
@@ -32,9 +32,9 @@ BuildRequires:        libsamplerate-devel
 BuildRequires: libsndfile-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libvorbis-devel >= 1:1.0
-#BuildRequires:        libid3tag-devel
-%{?_with_gtk1:BuildRequires:   wxGTK-devel >= 2.4.0}
-%{!?_with_gtk1:BuildRequires:  wxGTK2-devel >= 2.4.0}
+BuildRequires: libid3tag-devel
+%{?with_gtk1:BuildRequires:    wxGTK-devel >= 2.4.0}
+%{?without_gtk1:BuildRequires: wxGTK2-devel >= 2.4.0}
 BuildRequires: zip
 Requires:      lame-libs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,9 +62,9 @@ Audacity - 
 
 %prep
 %setup -q -n %{name}-src-%{version}-%{_pre}
-#%%patch0 -p1
+%patch0 -p1
 %patch1 -p1
-#%%patch2 -p1
+%patch2 -p1
 %patch3 -p1
 
 %build
@@ -72,6 +72,7 @@ Audacity - 
 export WX_CONFIG="`which wxgtk%{!?_with_gtk1:2}-2.4-config`"
 %configure \
        --with-help \
+       --with-id3tag=local \
        --with-libmad=system \
        --with-libsamplerate=system \
        --with-libsndfile=system \