rpms/scidavis/F-13 scidavis.spec,1.37,1.38
supercyper
supercyper at fedoraproject.org
Sun May 2 07:45:17 UTC 2010
Author: supercyper
Update of /cvs/pkgs/rpms/scidavis/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11465
Modified Files:
scidavis.spec
Log Message:
fix building
Index: scidavis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scidavis/F-13/scidavis.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- scidavis.spec 2 May 2010 07:27:53 -0000 1.37
+++ scidavis.spec 2 May 2010 07:45:16 -0000 1.38
@@ -14,7 +14,6 @@ Patch2: %{name}-manual.patch
URL: http://scidavis.sourceforge.net/
License: GPLv2+
Group: Applications/Engineering
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gsl-devel
BuildRequires: muParser-devel
#BuildRequires: qt4-devel
@@ -32,6 +31,7 @@ BuildRequires: dblatex
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
Requires: kde-filesystem
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description
SciDAVis is a user-friendly data analysis and visualization program primarily
@@ -95,7 +95,7 @@ desktop-file-install --vendor "" \
#add mime-type icons
for i in %{buildroot}%{_datadir}/icons/hicolor/*/
do
- install -m 644 -Dp $i/apps/%{name}.png $i/mimetypes/application-x-sciprj.png
+ install -m 644 -Dp $i/apps/%{name}.png $i/mimetypes/application-x-sciprj.png || \
install -m 644 -Dp $i/apps/%{name}.svg $i/mimetypes/application-x-sciprj.svg
done
More information about the scm-commits
mailing list