[avogadro] avogadro-1.1.1
Rex Dieter
rdieter at fedoraproject.org
Sat Jan 25 07:01:04 UTC 2014
commit 87f0a2136b316f85f7a58fbb046e57e25df83565
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sat Jan 25 01:01:23 2014 -0600
avogadro-1.1.1
.gitignore | 2 +-
avogadro-1.0.3-mkspecs-dir.patch | 12 ---
avogadro-1.1.1-mkspecs-dir.patch | 12 +++
...no-strip.patch => avogadro-1.1.1-no-strip.patch | 10 +-
avogadro-1.1.1-pkgconfig_eigen.patch | 8 ++
avogadro.spec | 100 +++++++++-----------
sources | 2 +-
7 files changed, 70 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fda2bc4..8956c91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-avogadro-1.0.1.tar.bz2
/avogadro-1.0.3.tar.bz2
+/avogadro-1.1.1.tar.bz2
diff --git a/avogadro-1.1.1-mkspecs-dir.patch b/avogadro-1.1.1-mkspecs-dir.patch
new file mode 100644
index 0000000..45c6164
--- /dev/null
+++ b/avogadro-1.1.1-mkspecs-dir.patch
@@ -0,0 +1,12 @@
+diff -up avogadro-1.1.1/CMakeLists.txt.mkspecs-dir avogadro-1.1.1/CMakeLists.txt
+--- avogadro-1.1.1/CMakeLists.txt.mkspecs-dir 2014-01-24 23:43:01.618510517 -0600
++++ avogadro-1.1.1/CMakeLists.txt 2014-01-24 23:44:03.236844746 -0600
+@@ -547,7 +547,7 @@ if(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF)
+ # )
+ install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/avogadro.prf"
+- DESTINATION "${CMAKE_INSTALL_PREFIX}/${QT_MKSPECS_RELATIVE}/features"
++ DESTINATION "${QT_MKSPECS_DIR}/features"
+ )
+ # endif ("${QT_MKSPECS_DIR}" MATCHES ^$"${CMAKE_INSTALL_PREFIX}/")
+ else()
diff --git a/avogadro-1.0.3-no-strip.patch b/avogadro-1.1.1-no-strip.patch
similarity index 63%
rename from avogadro-1.0.3-no-strip.patch
rename to avogadro-1.1.1-no-strip.patch
index 8e9821a..490dd58 100644
--- a/avogadro-1.0.3-no-strip.patch
+++ b/avogadro-1.1.1-no-strip.patch
@@ -1,8 +1,8 @@
-diff -ur avogadro-1.0.3/CMakeLists.txt avogadro-1.0.3-no-strip/CMakeLists.txt
---- avogadro-1.0.3/CMakeLists.txt 2011-04-25 07:29:58.000000000 +0200
-+++ avogadro-1.0.3-no-strip/CMakeLists.txt 2011-04-27 18:44:02.000000000 +0200
-@@ -98,7 +98,7 @@
- endif (NOT APPLE)
+diff -up avogadro-1.1.1/CMakeLists.txt.no-strip avogadro-1.1.1/CMakeLists.txt
+--- avogadro-1.1.1/CMakeLists.txt.no-strip 2014-01-24 23:14:44.473840038 -0600
++++ avogadro-1.1.1/CMakeLists.txt 2014-01-24 23:15:46.869166459 -0600
+@@ -114,7 +114,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+ endif()
# Set up additional build flags for particular build types. These will be added to CMAKE_CXX_FLAGS,
# they will not replace them.
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s")
diff --git a/avogadro-1.1.1-pkgconfig_eigen.patch b/avogadro-1.1.1-pkgconfig_eigen.patch
new file mode 100644
index 0000000..a5b2af4
--- /dev/null
+++ b/avogadro-1.1.1-pkgconfig_eigen.patch
@@ -0,0 +1,8 @@
+diff -up avogadro-1.1.1/avogadro.pc.in.eigen avogadro-1.1.1/avogadro.pc.in
+--- avogadro-1.1.1/avogadro.pc.in.eigen 2013-12-06 09:50:04.000000000 -0600
++++ avogadro-1.1.1/avogadro.pc.in 2014-01-25 00:37:45.732007852 -0600
+@@ -9,3 +9,4 @@ Description: Avogadro libraries
+ Version: @Avogadro_VERSION_FULL@
+ Libs: -L${libdir} -lavogadro
+ Cflags: -I${pkgincludedir}
++Requires.private: eigen2
diff --git a/avogadro.spec b/avogadro.spec
index 1d8bd30..24e1811 100644
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -1,34 +1,37 @@
%{!?python_sitelib:%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-#define ENABLE_TESTS -DENABLE_TESTS:BOOL=ON
+%define ENABLE_TESTS -DENABLE_TESTS:BOOL=ON
Name: avogadro
-Version: 1.0.3
-Release: 21%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
Summary: An advanced molecular editor for chemical purposes
-Group: Applications/Editors
License: GPLv2
URL: http://avogadro.openmolecules.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-# Fix qmake mkspecs installation directory (broken in 1.0.3)
-Patch0: avogadro-1.0.3-mkspecs-dir.patch
+# Fix qmake mkspecs installation directory
+Patch0: avogadro-1.1.1-mkspecs-dir.patch
# Remove -Wl,-s from the compiler flags, fixes -debuginfo (#700080)
-Patch1: avogadro-1.0.3-no-strip.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: avogadro-1.1.1-no-strip.patch
+# avogadro.pc missing eigen dependency
+Patch2: avogadro-1.1.1-pkgconfig_eigen.patch
BuildRequires: boost-devel >= 1.35
BuildRequires: cmake >= 2.6.0
BuildRequires: desktop-file-utils
BuildRequires: docbook-utils
BuildRequires: numpy
+# can theoretically use eigen3, but currently ftbfs if it is found -- rex
BuildRequires: pkgconfig(eigen2) >= 2.0.3
BuildRequires: pkgconfig(glew) >= 1.5.0
BuildRequires: pkgconfig(openbabel-2.0) >= 2.2.2
BuildRequires: pkgconfig(QtGui) pkgconfig(QtNetwork) pkgconfig(QtOpenGL)
BuildRequires: sip-devel
+%if 0%{?ENABLE_TESTS:1}
+BuildRequires: dbus-x11 xorg-x11-server-Xvfb
+%endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -42,114 +45,97 @@ a powerful plugin architecture.
%package libs
Summary: Shared libraries for Avogadro
-Group: System Environment/Libraries
%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
-
%description libs
This package contains the shared libraries for the
molecular editor Avogadro.
-
%package devel
Summary: Development files for Avogadro
-Group: Development/Libraries
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# all this stuff is in the link interface in AvogadroLibraryDeps.cmake
-# ... and it probably shouldn't. FIXME -- rex
-Requires: qt4-devel glew-devel python-devel boost-devel
-
%description devel
This package contains files to develop applications using
-Avogadros libraries.
+Avogadro libraries.
%prep
%setup -q
%patch0 -p1 -b .mkspecs-dir
%patch1 -p1 -b .no-strip
-
-# nuke unpatched copy, use working version included in cmake instead -- Rex
-rm -f cmake/modules/FindPythonLibs.cmake
+%patch2 -p1 -b .pkgconfig_eigen2
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{cmake} %{?ENABLE_TESTS} -DENABLE_GLSL:BOOL=ON -DENABLE_PYTHON:BOOL=ON \
- %{_cmake_skip_rpath} ..
+%{cmake} \
+ %{?ENABLE_TESTS} \
+ -DENABLE_GLSL:BOOL=ON \
+ -DENABLE_PYTHON:BOOL=ON \
+ -DENABLE_RPATH:BOOL=OFF \
+ -DENABLE_VERSIONED_PLUGIN_DIR:BOOL=OFF \
+ ..
popd
make %{?_smp_mflags} -C %{_target_platform}
%install
-rm -rf $RPM_BUILD_ROOT
-make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
-sed -i -e 's!/usr//usr/!/usr/!g' \
- $RPM_BUILD_ROOT%{_libdir}/avogadro/AvogadroConfig.cmake
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang libavogadro --with-qt --without-mo
%find_lang avogadro --with-qt --without-mo
%check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/avogadro.desktop
-# all of these currently require an active X session, so will fail
-# in mock
-%{?ENABLE_TESTS:make test -C %{_target_platform} ||:}
-
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+desktop-file-validate %{buildroot}%{_datadir}/applications/avogadro.desktop
+%if 0%{?ENABLE_TESTS:1}
+xvfb-run -a dbus-launch --exit-with-session make test ARGS="--output-on-failure" -C %{_target_platform} ||:
+%endif
%files -f avogadro.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING
%{_bindir}/avogadro
%{_bindir}/avopkg
%{_datadir}/avogadro/builder/
+%{_datadir}/avogadro/crystals/
%{_datadir}/avogadro/fragments/
%{_datadir}/pixmaps/avogadro-icon.png
%{_datadir}/applications/avogadro.desktop
%{_mandir}/man1/avogadro.1*
%{_mandir}/man1/avopkg.1*
-# find_lang doesn't support ca at valencia for qm files
-%lang(ca at valencia) %{_datadir}/avogadro/i18n/avogadro_ca at valencia.qm
%files devel
-%defattr(-,root,root,-)
%{_includedir}/avogadro/
%{_libdir}/libavogadro.so
+%{_libdir}/libavogadro_OpenQube.so
+%{_libdir}/pkgconfig/avogadro.pc
%{_libdir}/avogadro/*.cmake
-%{_libdir}/avogadro/1_0/*.cmake
-# Check at some point if these have been upstreamed, as of 2.8.0 they haven't.
-# KDE ships copies of the same stuff, but this package is Qt-only. -- Kevin
-%{_libdir}/avogadro/1_0/cmake/
+%{_libdir}/avogadro/cmake/
%{_qt4_prefix}/mkspecs/features/avogadro.prf
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
%files libs -f libavogadro.lang
-%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING
+# package python bits elsewhere/separately? -- rex
%{python_sitearch}/Avogadro.so
%{_datadir}/libavogadro/
%dir %{_datadir}/avogadro/
%dir %{_datadir}/avogadro/i18n/
%{_libdir}/libavogadro.so.1*
+%{_libdir}/libavogadro_OpenQube.so.0*
%dir %{_libdir}/avogadro/
-%dir %{_libdir}/avogadro/1_0/
-%{_libdir}/avogadro/1_0/colors/
-%{_libdir}/avogadro/1_0/extensions/
-%{_libdir}/avogadro/1_0/engines/
-%{_libdir}/avogadro/1_0/tools/
-# find_lang doesn't support ca at valencia for qm files
-%lang(ca at valencia) %{_datadir}/avogadro/i18n/libavogadro_ca at valencia.qm
+%{_libdir}/avogadro/colors/
+%{_libdir}/avogadro/extensions/
+%{_libdir}/avogadro/engines/
+%{_libdir}/avogadro/tools/
%changelog
+* Sat Jan 25 2014 Rex Dieter <rdieter at fedoraproject.org> 1.1.1-1
+- avogadro-1.1.1
+
* Mon Nov 18 2013 Dave Airlie <airlied at redhat.com> - 1.0.3-21
- rebuilt for GLEW 1.10
diff --git a/sources b/sources
index 0aca501..55ddfe1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92c2702c1980f70fb6d87a1a58147911 avogadro-1.0.3.tar.bz2
+1223bb18f50dccd2c60538aa90d58c7a avogadro-1.1.1.tar.bz2
More information about the scm-commits
mailing list