[simspark/f16: 7/7] Exclude Fedora 17 specific changes
Hedayat Vatankhah
hedayat at fedoraproject.org
Wed May 23 09:11:51 UTC 2012
commit 9117b03c6bb3d4be8e6050c1b26d0b5711d169aa
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date: Wed May 23 13:40:57 2012 +0430
Exclude Fedora 17 specific changes
simspark.spec | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/simspark.spec b/simspark.spec
index 22d4b2a..a577f27 100644
--- a/simspark.spec
+++ b/simspark.spec
@@ -13,7 +13,7 @@ BuildRequires: cmake boost-devel ruby ruby-devel SDL-devel tex(latex)
BuildRequires: ode-devel libGL-devel DevIL-devel freetype-devel libGLU-devel
BuildRequires: ImageMagick
Conflicts: rcssserver3d < 0.6.1
-Requires: ruby ruby(abi) = 1.9.1
+Requires: ruby ruby(abi) = 1.8
Requires: dejavu-sans-mono-fonts
%description
@@ -41,8 +41,7 @@ mkdir build
cd build
export CXXFLAGS="${CXXFLAGS:-%optflags}"
export CFLAGS="${CFLAGS:-%optflags}"
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR:PATH=%{_lib} -DODE_CONFIG_EXEC=ode-double-config .. \
- -DRUBY_INCLUDE_PATH=`ruby -e 'puts File.join(RbConfig::CONFIG[%q(includedir)], RbConfig::CONFIG[%q(sitearch)])'`
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR:PATH=%{_lib} -DODE_CONFIG_EXEC=ode-double-config ..
make VERBOSE=1 %{?_smp_mflags}
make pdf
cp doc/devel/manual.pdf ../doc/devel/
@@ -79,21 +78,6 @@ rm -rf %{buildroot}/%{_datadir}/doc
- Remove some old .spec stuff (e.g. defattr's)
- Fix bug #704861
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-9
-- Rebuilt for c++ ABI breakage
-
-* Thu Feb 16 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 0.2.2-8
-- Fix compilation under gcc 4.7
-
-* Wed Feb 08 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 0.2.2-7
-- Rebuilt for Ruby 1.9.3.
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Nov 21 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 0.2.2-5
-- Rebuild for Boost 1.48
-
* Fri Jul 22 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 0.2.2-4
- Rebuild for boost 1.47
More information about the scm-commits
mailing list