From 3024a5b4dd8fc8770af41f731d30a04f46af0d64 Mon Sep 17 00:00:00 2001 From: sagitter Date: Aug 24 2018 17:59:15 +0000 Subject: Release 1.91.0 --- diff --git a/.gitignore b/.gitignore index 766c822..fdbb6f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /avogadroapp-1.90.0.tar.gz /avogadroapp-74e1edebd83ebb4a37b8e8712c788903abe3f341.zip +/avogadroapp-1.91.0.tar.gz diff --git a/avogadro2.spec b/avogadro2.spec index 3f0bb0d..30473ab 100644 --- a/avogadro2.spec +++ b/avogadro2.spec @@ -1,20 +1,23 @@ -%global commit 74e1edebd83ebb4a37b8e8712c788903abe3f341 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20180713 - Name: avogadro2 -Version: 1.90.0 -Release: 14.%{commitdate}git%{shortcommit}%{?dist} +Version: 1.91.0 +Release: 1%{?dist} Summary: Advanced molecular editor - License: BSD URL: http://avogadro.openmolecules.net/ -Source0: https://github.com/OpenChemistry/avogadroapp/archive/%{commit}.zip#/avogadroapp-%{commit}.zip - +Source0: https://github.com/OpenChemistry/avogadroapp/archive/%{version}/avogadroapp-%{version}.tar.gz Source1: %{name}.appdata.xml -BuildRequires: cmake, chrpath, desktop-file-utils -BuildRequires: avogadro2-libs-devel, molequeue-devel, spglib-devel +%if 0%{?rhel} +BuildRequires: cmake3, epel-rpm-macros +%global ctest3 ctest3 +%else +BuildRequires: cmake +%global cmake3 %cmake +%global ctest3 ctest +%endif +BuildRequires: chrpath, desktop-file-utils +BuildRequires: avogadro2-libs-devel >= 1.91.0 +BuildRequires: molequeue-devel, spglib-devel BuildRequires: gcc, gcc-c++, doxygen BuildRequires: eigen3-devel, hdf5-devel, glew-devel BuildRequires: qt5-qtbase-devel, qt5-qttools-devel @@ -41,14 +44,14 @@ features and goals of the Avogadro project: * Flexible supporting a range of chemical data formats and packages %prep -%setup -q -n avogadroapp-%{commit} +%autosetup -n avogadroapp-%{version} %build mkdir build && pushd build export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" export CFLAGS="%{optflags} -I%{_includedir}/%{name}" export CXXFLAGS="%{optflags} -I%{_includedir}/%{name}" -%cmake -DCMAKE_BUILD_TYPE:STRING=Release \ +%{cmake3} -DCMAKE_BUILD_TYPE:STRING=Release \ -Wno-dev \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ -DENABLE_RPATH:BOOL=ON \ @@ -73,11 +76,11 @@ cp -a avogadro/icons/* %{buildroot}%{_datadir}/icons/%{name}/ %if 0%{?fedora} ## Install appdata file -mkdir -p %{buildroot}%{_datadir}/metainfo -install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/ +mkdir -p %{buildroot}%{_metainfodir} +install -pm 644 %{SOURCE1} %{buildroot}%{_metainfodir}/ %endif -%if 0%{?rhel} && 0%{?rhel} <= 7 +%if 0%{?rhel} %post /bin/touch --no-create %{_datadir}/icons/%{name} &>/dev/null || : @@ -92,10 +95,8 @@ fi %endif %check -pushd build -#ctest -V %if 0%{?fedora} -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml %endif %files @@ -103,13 +104,14 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %license LICENSE %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop -%if 0%{?fedora} -%{_datadir}/metainfo/*.appdata.xml -%endif +%{_metainfodir}/*.appdata.xml %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/%{name}/ %changelog +* Fri Aug 24 2018 Antonio Trande - 1.91.0-1 +- Release 1.91.0 + * Thu Aug 23 2018 Nicolas Chauvet - 1.90.0-14.20180713git74e1ede - Rebuilt for glew 2.1.0 diff --git a/sources b/sources index 47a87be..50b4793 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avogadroapp-74e1edebd83ebb4a37b8e8712c788903abe3f341.zip) = e0a785a6187da2223ecbbc8142bc854ee3ee32b3825c912d4d42e4845194b6214b86bf1630024f151c451a9802b04e2f534576ef1edc3f345f745d082a33f887 +SHA512 (avogadroapp-1.91.0.tar.gz) = f603a3aa81cb2b6347b4d8e3ac12c0ee54f7eafab9dd9fd106a34cf799340f3e56ea12e7731c9718e13dbb4547a67a882982b3109faf7bb3f3104af49351e204