From 97d9e66e14f1494e99b6f91bfa12d0ec911f3bb9 Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Wed, 13 Aug 2014 15:25:57 -0400
Subject: [PATCH] Re #10119. Preparing to test resulting spec on copr.
---
.../mantid-developer-el6.spec | 100 -----------------
.../mantid-developer-f19.spec | 102 ------------------
.../mantid-developer/mantid-developer.spec | 21 +++-
3 files changed, 17 insertions(+), 206 deletions(-)
delete mode 100644 Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec
delete mode 100644 Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec
diff --git a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec
deleted file mode 100644
index ad41e6ea166..00000000000
--- a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec
+++ /dev/null
@@ -1,100 +0,0 @@
-Name: mantid-developer
-Version: 1.1
-Release: 5%{?dist}
-Summary: Meta Package to install dependencies for Mantid Development
-
-Group: Development/Tools
-License: GPL
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-
-Requires: cmake-gui >= 2.8.5
-Requires: boost-devel
-Requires: epel-release
-Requires: gperftools-devel
-Requires: gperftools-libs
-Requires: gcc-c++
-Requires: gsl-devel
-Requires: hdf-devel
-Requires: hdf5-devel
-Requires: python-ipython >= 1.1
-Requires: muParser-devel
-Requires: mxml-devel
-Requires: nexus >= 4.2
-Requires: nexus-devel >= 4.2
-Requires: numpy
-Requires: OpenCASCADE-devel
-Requires: poco-devel
-Requires: PyQt4-devel
-Requires: python-devel
-Requires: qscintilla-devel
-Requires: qt-devel >= 4.6
-Requires: qwt-devel
-Requires: qwtplot3d-qt4-devel
-Requires: redhat-lsb
-Requires: rpmdevtools
-Requires: scipy
-Requires: sip-devel
-Requires: git
-Requires: openssl-devel
-Requires: texlive-latex
-Requires: dvipng
-Requires: mantidlibs-qt-devel
-Requires: scl-utils
-
-BuildArch: noarch
-
-%description
-A virtual package which requires all the dependencies and tools that are
-required for Mantid development.
-
-%prep
-
-%build
-
-%install
-
-%clean
-
-%post
-# Remove myself once I have installed all the required packages.
-#rpm -e %{name}
-
-%files
-
-%changelog
-* Tue Feb 04 2014 Stuart Campbell <campbellsi@ornl.gov>
-- Added scipy and ipython >= 1.1 dependency
-
-* Tue May 07 2013 Stuart Campbell <campbellsi@ornl.gov>
-- Added dvipng and latex for qt-assistant stuff
-- Added software collection dependencies
-
-* Thu Jun 7 2012 Russell Taylor <taylorrj@ornl.gov>
-- Remove gmock & gtest now that we include them in our repo
-- Remove subversion dependency now that we use git
-
-* Mon Mar 19 2012 Stuart Campbell <campbellsi@ornl.gov>
-- Updated for google-perftools -> gperftools package rename.
-
-* Wed Feb 22 2012 Stuart Campbell <campbellsi@ornl.gov>
-- Added nexus as it is not required by it's devel package.
-
-* Wed Feb 22 2012 Stuart Campbell <campbellsi@ornl.gov>
-- Added git as a dependency
-- Added openssl-devel dependency
-
-* Mon Feb 20 2012 Stuart Campbell <campbellsi@ornl.gov>
-- Added dependency on NeXus development after nexus rpm split.
-- Updated CMake dependency to 2.8.5 following 'the virus'!
-- Added Google Mock and GTest.
-
-* Fri Jun 3 2011 Stuart Campbell <campbellsi@ornl.gov>
-- Added rpmdevtools and lsb dependencies
-
-* Fri Jun 3 2011 Stuart Campbell <campbellsi@ornl.gov>
-- Added versions for some packages
-
-* Fri Jun 3 2011 Stuart Campbell <campbellsi@ornl.gov>
-- Initial release
diff --git a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec
deleted file mode 100644
index 4c56f3acab4..00000000000
--- a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec
+++ /dev/null
@@ -1,102 +0,0 @@
-Name: mantid-developer
-Version: 1.2
-Release: 5%{?dist}
-Summary: Meta Package to install dependencies for Mantid Development
-
-Group: Development/Tools
-License: GPL
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-
-Requires: cmake-gui >= 2.8.5
-Requires: boost-devel
-Requires: gperftools-devel
-Requires: gperftools-libs
-Requires: gcc-c++
-Requires: git-all
-Requires: gsl-devel
-Requires: hdf-devel
-Requires: hdf5-devel
-Requires: muParser-devel
-Requires: mxml-devel
-Requires: nexus >= 4.2
-Requires: nexus-devel >= 4.2
-Requires: numpy
-Requires: OpenCASCADE-devel
-Requires: poco-devel
-Requires: PyQt4-devel
-Requires: python-devel
-Requires: python-ipython
-Requires: qscintilla-devel
-Requires: qt-devel >= 4.6
-Requires: qwt5-qt4-devel
-Requires: qwtplot3d-qt4-devel
-Requires: redhat-lsb
-Requires: rpmdevtools
-Requires: scipy
-Requires: sip-devel
-Requires: git
-Requires: openssl-devel
-Requires: texlive-latex
-Requires: dvipng
-Requires: qt-devel
-
-BuildArch: noarch
-
-%description
-A virtual package which requires all the dependencies and tools that are
-required for Mantid development.
-
-%prep
-
-%build
-
-%install
-
-%clean
-
-%post
-# Remove myself once I have installed all the required packages.
-#rpm -e %{name}
-
-%files
-
-%changelog
-* Tue Feb 04 2014 Stuart Campbell <campbellsi@ornl.gov>
-- Added scipy and ipython >= 1.1 dependency
-
-* Tue Aug 20 2013 Peter Peterson <petersonpf@ornl.gov>
-- Removed things not necessary for fedora 19.
-
-* Tue May 07 2013 Stuart Campbell <campbellsi@ornl.gov>
-- Added dvipng and latex for qt-assistant stuff
-- Added software collection dependencies
-
-* Thu Jun 7 2012 Russell Taylor <taylorrj@ornl.gov>
-- Remove gmock & gtest now that we include them in our repo
-- Remove subversion dependency now that we use git
-
-* Mon Mar 19 2012 Stuart Campbell <campbellsi@ornl.gov>
-- Updated for google-perftools -> gperftools package rename.
-
-* Wed Feb 22 2012 Stuart Campbell <campbellsi@ornl.gov>
-- Added nexus as it is not required by it's devel package.
-
-* Wed Feb 22 2012 Stuart Campbell <campbellsi@ornl.gov>
-- Added git as a dependency
-- Added openssl-devel dependency
-
-* Mon Feb 20 2012 Stuart Campbell <campbellsi@ornl.gov>
-- Added dependency on NeXus development after nexus rpm split.
-- Updated CMake dependency to 2.8.5 following 'the virus'!
-- Added Google Mock and GTest.
-
-* Fri Jun 3 2011 Stuart Campbell <campbellsi@ornl.gov>
-- Added rpmdevtools and lsb dependencies
-
-* Fri Jun 3 2011 Stuart Campbell <campbellsi@ornl.gov>
-- Added versions for some packages
-
-* Fri Jun 3 2011 Stuart Campbell <campbellsi@ornl.gov>
-- Initial release
diff --git a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer.spec b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer.spec
index 5dfcc58f859..b44544ff11d 100644
--- a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer.spec
+++ b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer.spec
@@ -1,6 +1,6 @@
Name: mantid-developer
-Version: 1.3
-Release: 8%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: Meta Package to install dependencies for Mantid Development
Group: Development/Tools
@@ -8,9 +8,10 @@ License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: rpmfusion-nonfree-release
+%{?fc20:Requires: rpmfusion-nonfree-release}
Requires: cmake-gui >= 2.8.5
Requires: boost-devel
+%{?el6:Requires: epel-release}
Requires: gperftools-devel
Requires: gperftools-libs
Requires: gcc-c++
@@ -27,11 +28,15 @@ Requires: OCE-devel
Requires: poco-devel
Requires: PyQt4-devel
Requires: python-devel
-Requires: python-ipython
+Requires: python-ipython >= 1.1
Requires: python-sphinx
Requires: qscintilla-devel
Requires: qt-devel >= 4.6
+%if 0%{?el6}
+Requires: qwt-devel
+%else
Requires: qwt5-qt4-devel
+%endif
Requires: qwtplot3d-qt4-devel
Requires: redhat-lsb
Requires: rpmdevtools
@@ -44,8 +49,13 @@ Requires: texlive-latex-bin
Requires: texlive-was
Requires: tex-preview
Requires: dvipng
+%if 0%{?el6}
+Requires: mantidlibs-qt-devel
+Requires: scl-utils
+%else
Requires: qt-devel
Requires: qtwebkit-devel
+%endif
BuildArch: noarch
@@ -68,6 +78,9 @@ required for Mantid development.
%files
%changelog
+* Wed Aug 13 2014 Peter Peterson <petersonpf@ornl.gov>
+- Merged all three distribution spec files into one
+
* Fri Apr 25 2014 Michael Reuter <reuterma@ornl.gov>
- Added texlive-latex-bin, texlive-was, tex-preview
--
GitLab