[audex] add patch to fix ftbfs, cleanup spec
Peter Robinson
pbrobinson at fedoraproject.org
Sat Aug 11 10:58:00 UTC 2012
commit 8ae4b9f0c354398c15b92480789a8b87892b4aaf
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Sat Aug 11 12:57:53 2012 +0200
add patch to fix ftbfs, cleanup spec
audex-fixbuild.patch | 11 +++++++++++
audex-kde45-build.patch | 12 ------------
audex.spec | 21 ++++++++-------------
3 files changed, 19 insertions(+), 25 deletions(-)
---
diff --git a/audex-fixbuild.patch b/audex-fixbuild.patch
new file mode 100644
index 0000000..7ac018a
--- /dev/null
+++ b/audex-fixbuild.patch
@@ -0,0 +1,11 @@
+--- audex-0.74b1/utils/hashlist.h.orig 2012-08-11 12:40:04.828356839 +0200
++++ audex-0.74b1/utils/hashlist.h 2012-08-11 12:41:09.436690763 +0200
+@@ -21,6 +21,8 @@
+
+ #include <sys/fcntl.h>
+ #include <sys/mman.h>
++#include <sys/types.h>
++#include <unistd.h>
+
+ #include <QFile>
+ #include <QFileInfo>
diff --git a/audex.spec b/audex.spec
index 129a27a..3faa759 100644
--- a/audex.spec
+++ b/audex.spec
@@ -1,20 +1,17 @@
Name: audex
Version: 0.74
-Release: 0.4.beta1%{?dist}
+Release: 0.5.beta1%{?dist}
Summary: Audio ripper
Group: Applications/Multimedia
License: GPLv3+
URL: http://opensource.maniatek.de/audex/
+
Source0: http://opensource.maniatek.de/audex/files/audex-%{version}b1.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: audex-fixbuild.patch
BuildRequires: kdelibs4-devel desktop-file-utils gettext
BuildRequires: cdparanoia-devel kdemultimedia-devel
-## upstreamable patches
-# fix FTBFS with gcc-4.7.x
-Patch50: audex-0.74b1-gcc47.patch
-
%description
audex is a new audio grabber tool for CD-ROM drives based on KDE 4.
Although it is still under development, it is published as
@@ -24,7 +21,7 @@ may change on the way to its first stable 1.0-release.
%prep
%setup -qn audex-0.74b1
-%patch50 -p1 -b .gcc47
+%patch0 -p1 -b .fixbuild
%build
mkdir -p %{_target_platform}
@@ -32,10 +29,9 @@ pushd %{_target_platform}
%{cmake_kde4} ..
popd
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} V=1
%install
-%{__rm} -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang %{name}
@@ -59,11 +55,7 @@ fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files -f %{name}.lang
-%defattr(-,root,root,-)
%doc CHANGELOG LICENCE README TODO
%{_kde4_bindir}/audex
%{_kde4_datadir}/kde4/apps/solid/actions/audex-rip-audiocd.desktop
@@ -72,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
%{_kde4_datadir}/kde4/apps/audex
%changelog
+* Sat Aug 11 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.74-0.5.beta1
+- Add patch to fix FTBFS
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.74-0.4.beta1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list