rpms/audacity/devel audacity-1.3.2-destdir.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 audacity.spec, 1.19, 1.20 sources, 1.7, 1.8
Gérard Milmeister (gemi)
fedora-extras-commits at redhat.com
Fri Jan 5 20:52:17 UTC 2007
Author: gemi
Update of /cvs/extras/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24443
Modified Files:
.cvsignore audacity.spec sources
Added Files:
audacity-1.3.2-destdir.patch
Log Message:
new version 1.3.2
audacity-1.3.2-destdir.patch:
--- NEW FILE audacity-1.3.2-destdir.patch ---
--- audacity-src-1.3.2-beta/locale/Makefile.in.destdir 2007-01-05 21:48:15.000000000 +0100
+++ audacity-src-1.3.2-beta/locale/Makefile.in 2007-01-05 21:48:29.000000000 +0100
@@ -17,7 +17,7 @@
INSTALL=@INSTALL@
AUDACITY_NAME=@AUDACITY_NAME@
ifdef DESTDIR
- INSTALL_PATH=$(top_srcdir)/$(DESTDIR)
+ INSTALL_PATH=$(DESTDIR)
else
INSTALL_PATH=
endif
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 2 Jan 2007 14:35:05 -0000 1.5
+++ .cvsignore 5 Jan 2007 20:51:46 -0000 1.6
@@ -1 +1 @@
-audacity-src-1.2.6.tar.gz
+audacity-src-1.3.2.tar.gz
Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- audacity.spec 2 Jan 2007 14:35:05 -0000 1.19
+++ audacity.spec 5 Jan 2007 20:51:47 -0000 1.20
@@ -1,15 +1,14 @@
Name: audacity
-Version: 1.2.6
+Version: 1.3.2
Release: 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.6.tar.gz
+Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.3.2.tar.gz
Source1: audacity.png
-Patch1: audacity-1.2.2-aboutdialog.patch
-Patch3: audacity-1.2.4b-missing-pango.patch
+Patch4: audacity-1.3.2-destdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libogg-devel
BuildRequires: libvorbis-devel
@@ -23,17 +22,12 @@
BuildRequires: libsndfile-devel
BuildRequires: libid3tag-devel
BuildRequires: desktop-file-utils
-%{?_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
+BuildRequires: wxGTK2-devel
+Requires(post): shared-mime-info, desktop-file-utils
+Requires(postun): shared-mime-info, desktop-file-utils
# 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)
@@ -46,9 +40,8 @@
Linux/*BSD, MacOS, and Windows.
%prep
-%setup -q -n %{name}-src-%{version}
-%patch1 -p1 -b .aboutdialog
-%{?_with_gtk2: %patch3 -p1 -b .missing-pango }
+%setup -q -n %{name}-src-%{version}-beta
+%patch4 -p1 -b .destdir
cp -a src/Languages.cpp src/Languages.cpp.orig
iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp
for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp
@@ -61,17 +54,12 @@
perl -pi -e 's|.define ALLOW_SSE.*||' lib-src/soundtouch/include/*.h
%endif
-%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
+%build
%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}
make
+
%install
rm -rf ${RPM_BUILD_ROOT}
make DESTDIR=${RPM_BUILD_ROOT} install
@@ -89,12 +77,12 @@
Comment=A multitrack audio editor
Encoding=UTF-8
X-Desktop-File-Install-Version=0.4
-MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;
+MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;application/x-audacity-project;
StartupWMClass=Audacity
EOF
-
-desktop-file-install --vendor fedora \
- --add-category X-Fedora \
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*
+desktop-file-install \
+ --vendor fedora \
--add-category Application \
--add-category GNOME \
--add-category AudioVideo \
@@ -103,25 +91,35 @@
%{find_lang} %{name}
+
%clean
rm -rf ${RPM_BUILD_ROOT}
+
%post
-/usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+%{_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+%{_bindir}/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+
%postun
-/usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+%{_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+%{_bindir}/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/audacity
-%{_mandir}/*/*
+%{_mandir}/man*/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
+%{_datadir}/mime/packages/*
%doc %{_datadir}/doc/*
%changelog
+* Fri Jan 5 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.3.2-1
+- new version 1.3.2
+
* Tue Jan 2 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.2.6-1
- new version 1.2.6
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 2 Jan 2007 14:35:05 -0000 1.7
+++ sources 5 Jan 2007 20:51:47 -0000 1.8
@@ -1 +1 @@
-5477ddca23592ae06cc3295f91961ec0 audacity-src-1.2.6.tar.gz
+bf63673140254f1283dfd55b61ff2422 audacity-src-1.3.2.tar.gz
More information about the fedora-extras-commits
mailing list