diff --git a/goldendict-1.0.1-gcc47.patch b/goldendict-1.0.1-gcc47.patch new file mode 100644 index 0000000..6496d42 --- /dev/null +++ b/goldendict-1.0.1-gcc47.patch @@ -0,0 +1,23 @@ +diff -urN goldendict-1.0.1-src.orig/processwrapper.cc goldendict-1.0.1-src/processwrapper.cc +--- goldendict-1.0.1-src.orig/processwrapper.cc 2010-12-04 02:42:46.000000000 +0530 ++++ goldendict-1.0.1-src/processwrapper.cc 2012-08-04 20:51:45.835055609 +0530 +@@ -94,6 +94,8 @@ + + #else + ++#include ++ + unsigned int ProcessWrapper::currentProcessId() + { + return getpid(); +diff -urN goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp +--- goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp 2010-12-04 02:42:46.000000000 +0530 ++++ goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp 2012-08-04 20:48:47.761593825 +0530 +@@ -50,6 +50,7 @@ + #endif + #if defined(Q_OS_UNIX) + #include ++#include + #endif + + namespace QtLP_Private { diff --git a/goldendict.spec b/goldendict.spec index fcb94e0..d71d023 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,6 +1,6 @@ Name: goldendict Version: 1.0.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -10,6 +10,7 @@ URL: http://goldendict.berlios.de/ # git clone git://gitorious.org/goldendict/goldendict.git # git archive master --prefix=goldendict-`git log --pretty=format:"%h"| head -n1`/ |gzip > goldendict-`git log --pretty=format:"%h"|head -n1`.tar.gz Source0: %{name}-%{version}-src.tar.bz2 +Patch0: goldendict-1.0.1-gcc47.patch # Modify the Icon section in desktop file to comform package guideline. @@ -32,7 +33,7 @@ Scan popup functionality. %prep %setup -q -c -n goldendict-%{version}-src -#%patch0 -p1 +%patch0 -p1 -b .gcc47 %build @@ -45,7 +46,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} make install INSTALL_ROOT=%{buildroot} INSTALL="install -p" rm -rf %{buildroot}/%{_datadir}/app-install @@ -63,12 +63,7 @@ install -d %{buildroot}/%{_datadir}/goldendict/locale install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %doc LICENSE.txt %dir %{_datadir}/goldendict/ %dir %{_datadir}/goldendict/locale/ @@ -78,8 +73,10 @@ rm -rf %{buildroot} %{_datadir}/goldendict/locale/*.qm - %changelog +* Sat Aug 04 2012 Parag Nemade - 1.0.1-7 +- Fix FTBFS for gcc-4.7 + * Thu Jul 19 2012 Fedora Release Engineering - 1.0.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild