From 52d9c34f33dfc5782b247baea1b77879fa54af71 Mon Sep 17 00:00:00 2001 From: Terje Røsten Date: May 05 2015 16:34:36 +0000 Subject: FTBFS --- diff --git a/beediff.spec b/beediff.spec index 7de7674..5d9b8b9 100644 --- a/beediff.spec +++ b/beediff.spec @@ -1,15 +1,15 @@ Summary: Visual tool for comparing and merging files Name: beediff Version: 1.9 -Release: 12%{?dist} +Release: 13%{?dist} Group: Development/Tools License: GPLv2+ URL: http://www.beesoft.org/index.php?id=beediff Source0: http://www.beesoft.org/download/beediff_%{version}_src.tar.gz Source1: beediff.desktop -BuildRequires: qt4-devel desktop-file-utils +BuildRequires: qt4-devel +BuildRequires: desktop-file-utils Requires: diffutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This package provides a visual application (beediff) for comparing and merging files. User have a possibility to work with two text @@ -21,30 +21,27 @@ efficient. %prep %setup -q -n %{name} -%{__sed} -i.bak -e 's/^QMAKE_CXXFLAGS_RELEASE.*/QMAKE_CXXFLAGS_RELEASE = %{optflags}/' beediff.pro +sed -i -e 's|^QMAKE_CXXFLAGS_RELEASE.*|QMAKE_CXXFLAGS_RELEASE = %{optflags}|' beediff.pro %build qmake-qt4 -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} -%{__install} -D -m 0755 %{name} %{buildroot}%{_bindir}/%{name} -%{__install} -D -p -m 0644 img/%{name}.png \ - %{buildroot}%{_datadir}/pixmaps/%{name}.png +install -D -m 0755 beediff %{buildroot}%{_bindir}/beediff +install -D -p -m 0644 img/beediff.png %{buildroot}%{_datadir}/pixmaps/beediff.png desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1} -%clean -%{__rm} -rf %{buildroot} - %files -%defattr(-, root, root, -) %doc licence.txt ChangeLog.txt -%{_bindir}/%{name} -%{_datadir}/pixmaps/%{name}.png -%{_datadir}/applications/%{name}.desktop +%{_bindir}/beediff +%{_datadir}/pixmaps/beediff.png +%{_datadir}/applications/beediff.desktop %changelog +* Tue May 05 2015 Terje Rosten - 1.9-13 +- FTBFS + * Fri Aug 15 2014 Fedora Release Engineering - 1.9-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild @@ -80,7 +77,7 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1} - move desktop file - add smp flags -* Wed Sep 15 2008 Terje Rosten - 1.9-1 +* Mon Sep 15 2008 Terje Rosten - 1.9-1 - initial package