commit a25751d1aa4934fee65101883082550c365378e2
Author: Jakub Bogusz <[email protected]>
Date: Thu Jul 30 06:28:32 2020 +0200
- linguist patch replaced by setting QTDIR (fixes x32 build); release 11
avogadro-linguist.patch | 11 -----------
avogadro.spec | 5 ++---
2 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/avogadro.spec b/avogadro.spec
index 400af97..408c0c8 100644
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -2,12 +2,11 @@ Summary: An advanced molecular editor for chemical
purposes
Summary(pl.UTF-8): Zaawansowany edytor molekularny do zastosowań
chemicznych
Name: avogadro
Version: 1.2.0
-Release: 10
+Release: 11
License: GPL v2+
Group: Applications/Editors
Source0:
http://downloads.sourceforge.net/avogadro/%{name}-%{version}.tar.gz
# Source0-md5: 3206068fc27bd3b717c568ee72f1e5ec
-Patch0: %{name}-linguist.patch
Patch1: %{name}-cmake.patch
Patch2: %{name}-moc-boost.patch
Patch3: gcc6.patch
@@ -85,7 +84,6 @@ Avogadro.
%prep
%setup -q
-%patch0 -p0
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -96,6 +94,7 @@ Avogadro.
%build
install -d build
cd build
+export QTDIR=%{_libdir}/qt4
%cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_GLSL=ON \
diff --git a/avogadro-linguist.patch b/avogadro-linguist.patch
deleted file mode 100644
index 968675b..0000000
--- a/avogadro-linguist.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/modules/FindLinguist.cmake.orig 2010-07-30 23:48:18.577541674
+0200
-+++ cmake/modules/FindLinguist.cmake 2010-07-30 23:48:35.507554042 +0200
-@@ -39,6 +39,8 @@
-
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
- $ENV{QTDIR}/bin
-+ /usr/lib64/qt4/bin
-+ /usr/lib/qt4/bin
- )
-
- if(QT_LCONVERT_EXECUTABLE)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/avogadro.git/commitdiff/a25751d1aa4934fee65101883082550c365378e2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
