Attachment 596004 Details for Bug 795945 – Updated git diff

[patch] Updated git diff

buildflags.patch (text/plain), 1.82 KB, created by Richard Shaw on 2012-07-03 16:01:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Shaw

Created: 2012-07-03 16:01:15 UTC

Size: 1.82 KB

patch

obsolete

>diff --git a/LinLog.spec b/LinLog.spec
>index d11acbb..7506759 100644
>--- a/LinLog.spec
>+++ b/LinLog.spec
>@@ -9,7 +9,6 @@ URL:            http://linlogbook.sourceforge.net/
> Source0:        http://downloads.sourceforge.net/linlogbook/%{name}-%{version}.tar.gz
> Source1:        %{name}.desktop
> Source2:        %{name}.png
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  qt4-devel >= 4.3, sqlite-devel >= 3, desktop-file-utils, libstdc++-devel
> #Requires:       
>@@ -22,10 +21,11 @@ used but it should be possible to use other databases like mysql, for instance.
> 
> %prep
> %setup -q -n %{name}
>+sed -i "s|CONFIG += debug|CONFIG += release|g" src/src.pro
> 
> 
> %build
>-qmake-qt4 -unix -o Makefile linlog.pro
>+qmake-qt4 -o Makefile linlog.pro
> make %{?_smp_mflags}
> 
> 
>@@ -40,24 +40,25 @@ cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
> desktop-file-install \
>         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
> mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
>-install -p -m 644 BaseTables.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
>-install -p -m 644 Example.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
>-install -p -m 644 Statistics.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
>+install -p -m 644 *.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
> 
> %files
>-%defattr(-,root,root,-)
> %doc ChangeLog COPYING LinLogDoc.pdf README 
> %{_bindir}/linlog
> %{_datadir}/pixmaps/%{name}.png
> %{_datadir}/applications/*%{name}.desktop
>-%{_datadir}/%{name}
>-%{_datadir}/%{name}/*.sql
>+%{_datadir}/%{name}/
>+
> 
> %changelog
>+* Tue Jun 03 2012 Richard Shaw <hobbes1069@gmail.com> 0.4-8
>+- Fix building to respect required build flags.
>+- Don't pull in sql files twice.
>+
> * Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4-8
> - Rebuilt for c++ ABI breakage
>

Actions: View | Diff

Attachments on bug 795945: 564782 | 596004