Merge branch 'master' into f17
update to 2.5.1 build fix on other arches
This commit is contained in:
commit
5fbc5c10c3
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
||||
/texstudio-2.3.tar.gz
|
||||
/texstudio-2.4.tar.gz
|
||||
/texstudio-2.5.tar.gz
|
||||
/texstudio-2.5.1.orig.tar.gz
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
84818db5999d2724eba525aa6f116e8b texstudio-2.5.tar.gz
|
||||
375a794101a6a7b8f2f877d706401f48 texstudio-2.5.1.orig.tar.gz
|
||||
|
@ -1,5 +1,5 @@
|
||||
Name: texstudio
|
||||
Version: 2.5
|
||||
Version: 2.5.1
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: A feature-rich editor for LaTeX documents
|
||||
@ -41,7 +41,7 @@ it tries to be like an improved version of Texmaker,
|
||||
so it keeps it look&feel.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}%{version}
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch0 -p0 -b .hunspell
|
||||
%patch1 -p0 -b .qtsingle
|
||||
%patch2 -p0 -b .xdg
|
||||
@ -50,7 +50,11 @@ rm -rf {hunspell,qtsingleapplication}
|
||||
|
||||
%build
|
||||
export QTDIR=%{_libdir}/qt4
|
||||
qmake-qt4 CONFIG-=debug texstudio.pro
|
||||
qmake-qt4 CONFIG-=debug \
|
||||
%ifnarch %{ix86} x86_64 %{arm}
|
||||
NO_CRASH_HANDLER=1 \
|
||||
%endif
|
||||
texstudio.pro
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
@ -117,6 +121,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
|
||||
%doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt
|
||||
|
||||
%changelog
|
||||
* Thu Nov 22 2012 Johannes Lips <hannes@fedoraproject.org> 2.5.1-1
|
||||
- update to recent upstream version
|
||||
|
||||
* Mon Oct 29 2012 Dan Horák <dan[at]danny.cz> 2.5-2
|
||||
- disable internal crash handler on not supported arches
|
||||
|
||||
* Sat Oct 27 2012 Johannes Lips <hannes@fedoraproject.org> 2.5-1
|
||||
- update to recent upstream version
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user