|
@@ -1,4 +1,4 @@
|
|
|
-%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.6.3)
|
|
|
|
|
|
|
+%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.7.1)
|
|
|
%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
|
|
%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
|
|
|
|
|
|
|
|
%define ENABLE_TESTS -DENABLE_TESTS:BOOL=ON
|
|
%define ENABLE_TESTS -DENABLE_TESTS:BOOL=ON
|
|
@@ -6,12 +6,19 @@
|
|
|
Name: avogadro
|
|
Name: avogadro
|
|
|
Summary: An advanced molecular editor for chemical purposes
|
|
Summary: An advanced molecular editor for chemical purposes
|
|
|
Version: 1.0.1
|
|
Version: 1.0.1
|
|
|
-Release: 5%{?_dist_release}
|
|
|
|
|
|
|
+Release: 6%{?_dist_release}
|
|
|
|
|
|
|
|
Group: Applications/Editors
|
|
Group: Applications/Editors
|
|
|
License: GPLv2
|
|
License: GPLv2
|
|
|
URL: http://avogadro.openmolecules.net/
|
|
URL: http://avogadro.openmolecules.net/
|
|
|
|
|
+
|
|
|
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
|
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
|
|
|
|
+# fix FTBFS with SIP 4.11 (Gentoo#335644)
|
|
|
|
|
+# patch submitted: http://bugs.gentoo.org/attachment.cgi?id=247308 (upstream is
|
|
|
|
|
+# CCed on the Gentoo bug)
|
|
|
|
|
+Patch0: avogadro-1.0.1-sip411.patch
|
|
|
|
|
+# fix crash with current SIP and Python 2.7 (#642248)
|
|
|
|
|
+Patch1: avogadro-1.0.1-pycapsule.patch
|
|
|
|
|
|
|
|
BuildRequires: cmake >= 2.6.0
|
|
BuildRequires: cmake >= 2.6.0
|
|
|
BuildRequires: qt4-designer >= 4.5.1
|
|
BuildRequires: qt4-designer >= 4.5.1
|
|
@@ -49,7 +56,7 @@ molecular editor Avogadro.
|
|
|
Summary: Development files for Avogadro
|
|
Summary: Development files for Avogadro
|
|
|
Group: Development/Libraries
|
|
Group: Development/Libraries
|
|
|
Requires: %{name}-libs = %{version}-%{release}
|
|
Requires: %{name}-libs = %{version}-%{release}
|
|
|
-Requires: qt4-devel
|
|
|
|
|
|
|
+Requires: qt4-devel = %{_qt4_version}
|
|
|
|
|
|
|
|
%description devel
|
|
%description devel
|
|
|
This package contains files to develop applications using
|
|
This package contains files to develop applications using
|
|
@@ -58,6 +65,8 @@ Avogadros libraries.
|
|
|
|
|
|
|
|
%prep
|
|
%prep
|
|
|
%setup -q
|
|
%setup -q
|
|
|
|
|
+%patch0 -p1 -b .sip411
|
|
|
|
|
+%patch1 -p1 -b .pycapsule
|
|
|
|
|
|
|
|
# nuke unpatched copy, use working version included in cmake instead -- Rex
|
|
# nuke unpatched copy, use working version included in cmake instead -- Rex
|
|
|
rm -f cmake/modules/FindPythonLibs.cmake
|
|
rm -f cmake/modules/FindPythonLibs.cmake
|
|
@@ -129,6 +138,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/avogadro.desktop
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
|
+* Wed Feb 23 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.1-6
|
|
|
|
|
+- rebuilt with qt4-4.7.1
|
|
|
|
|
+- added Patch0 and 1 from Fedora
|
|
|
|
|
+
|
|
|
* Tue Jan 18 2011 Shu KONNO <owa@bg.wakwak.com> - 1.0.1-5
|
|
* Tue Jan 18 2011 Shu KONNO <owa@bg.wakwak.com> - 1.0.1-5
|
|
|
- rebuilt with libboost-1.45.0
|
|
- rebuilt with libboost-1.45.0
|
|
|
|
|
|
inagaki