From 6700dfe729adb0803bc2bcb97b791011e367700b Mon Sep 17 00:00:00 2001
From: sagitter <sagitter(a)fedoraproject.org>
Date: Jan 31 2018 20:31:45 +0000
Subject: Update to version 0.9.0
---
diff --git a/.gitignore b/.gitignore
index aefc90d..5c778ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/molequeue-eb397e7d80a7b275bc459d4285215421b0e09d8f.zip
+/molequeue-0.9.0.tar.gz
diff --git a/molequeue-fix_gcc7_compatibility.patch
b/molequeue-fix_gcc7_compatibility.patch
deleted file mode 100644
index 0e17109..0000000
--- a/molequeue-fix_gcc7_compatibility.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- cmake/GenerateExportHeader.orig.cmake 2016-12-22 21:34:10.000000000 +0100
-+++ cmake/GenerateExportHeader.cmake 2017-03-11 12:35:28.569073383 +0100
-@@ -164,12 +164,12 @@
- if(CMAKE_COMPILER_IS_GNUCXX)
- exec_program(${CMAKE_C_COMPILER} ARGS --version
- OUTPUT_VARIABLE _gcc_version_info)
-- string(REGEX MATCH "[3456]\\.[0-9]\\.[0-9]"
-+ string(REGEX MATCH "[34567]\\.[0-9]\\.[0-9]"
- _gcc_version "${_gcc_version_info}")
- # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
- # patch level, handle this here:
- if(NOT _gcc_version)
-- string(REGEX REPLACE ".*\\(GCC\\).* ([3456]\\.[0-9]) .*"
"\\1.0"
-+ string(REGEX REPLACE ".*\\(GCC\\).* ([34567]\\.[0-9]) .*"
"\\1.0"
- _gcc_version "${_gcc_version_info}")
- endif()
-
diff --git a/molequeue.spec b/molequeue.spec
index 015971e..de75864 100644
--- a/molequeue.spec
+++ b/molequeue.spec
@@ -1,16 +1,13 @@
-%global checkout eb397e7d80a7b275bc459d4285215421b0e09d8f
-%global date 20161222
+#%%global checkout eb397e7d80a7b275bc459d4285215421b0e09d8f
+#%%global date 20161222
Name: molequeue
Summary: Desktop integration of high performance computing resources
-Version: 0.8.0
-Release: 6.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
License: BSD
URL:
https://github.com/OpenChemistry/molequeue
-Source0:
https://github.com/OpenChemistry/molequeue/archive/%{checkout}.zip#/%{nam...
-
-# Fix CMake config file compatibility with GCC7
-Patch0: %{name}-fix_gcc7_compatibility.patch
+Source0:
https://github.com/OpenChemistry/molequeue/archive/%{version}.tar.gz#/%{n...
## Main building
BuildRequires: qt5-qtbase-devel, qt5-rpm-macros
@@ -68,10 +65,7 @@ BuildArch: noarch
HTML documentation of %{name}.
%prep
-%setup -q -n %{name}-%{checkout}
-%if 0%{?fedora}
-%patch0 -p0
-%endif
+%setup -q -n %{name}-%{version}
convert molequeue/app/icons/molequeue.ico molequeue/app/icons/molequeue.png
@@ -118,12 +112,14 @@ done
desktop-file-install %{name}.desktop --dir %{buildroot}%{_datadir}/applications
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%if 0%{?rhel}
%post
-/sbin/ldconfig
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-/sbin/ldconfig
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -131,6 +127,7 @@ fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%endif
%files
%{_bindir}/%{name}
@@ -139,7 +136,7 @@ fi
%files libs
%doc README.md
-%license COPYING
+%license LICENSE
%{_libdir}/*.so
%{_libdir}/%{name}/
@@ -149,9 +146,15 @@ fi
%files doc
%doc README.md build/docs/html
-%license COPYING
+%license LICENSE
%changelog
+* Wed Jan 31 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 0.9.0-1
+- Update to version 0.9.0
+- Run icon-cache scriptlets on rhel only
+- Remove patch for GCC-7
+- Rebuild for GCC-8
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.8.0-6.20161222giteb397e
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/sources b/sources
index 6e3c70e..10de982 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (molequeue-eb397e7d80a7b275bc459d4285215421b0e09d8f.zip) =
d9fde992bc8c3cc62bf206f0382175a6bb63d7421c1cfffb2de714bdbfd43a0513160601154d078a59d83c3363f58ccc90859a1c0aed222a44d02ddcca2f1bd1
+SHA512 (molequeue-0.9.0.tar.gz) =
87ddd8ca59227cab60c0ce2643e5bd435d9ac7e23b929659b95f190478734a5b71d4935f37d03eeadbc39939cbffb3604e0a283d50b0a23a1a000b57c1fce335
https://src.fedoraproject.org/rpms/molequeue/c/6700dfe729adb0803bc2bcb97b...