Accepting request 77331 from home:Heinervdm:branches:Education
Remove libQtWebKit-devel and add Fedora packages * libQtWebKit is not required to build fritzing * added some if's to make this package build for fedora too OBS-URL: https://build.opensuse.org/request/show/77331 OBS-URL: https://build.opensuse.org/package/show/Education/fritzing?expand=0&rev=3
This commit is contained in:
parent
ea0c7001f6
commit
fd7d41f149
@ -18,8 +18,11 @@ Source2: fritzing.1
|
|||||||
# will require a more thorough approach from the Fritzing team eventually.
|
# will require a more thorough approach from the Fritzing team eventually.
|
||||||
#Patch0: fritzing-fix-app-folder.patch
|
#Patch0: fritzing-fix-app-folder.patch
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: libQtWebKit-devel
|
|
||||||
BuildRequires: libqt4-devel
|
BuildRequires: libqt4-devel
|
||||||
|
%if 0%{?fedora}
|
||||||
|
BuildRequires: qt gcc-c++ libstdc++-devel
|
||||||
|
%endif
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -36,7 +39,15 @@ sed -i 's/\r//' README.txt
|
|||||||
#%patch0
|
#%patch0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%if 0%{?mandriva_version}
|
||||||
|
export PATH=/usr/lib/qt4/bin:$PATH
|
||||||
|
export QTDIR=%{_prefix}/lib/qt4/
|
||||||
|
%endif
|
||||||
|
%if 0%{?fedora} || 0%{?rhel_version}
|
||||||
|
qmake-qt4
|
||||||
|
%else
|
||||||
qmake
|
qmake
|
||||||
|
%endif
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
Loading…
x
Reference in New Issue
Block a user