[ogre/f18] Grab cmake files from buildroot instead of source

Bruno Wolff III bruno at fedoraproject.org
Sun Apr 21 18:22:52 UTC 2013


commit 0c15455e355caedfaf8005d316f36ad1edb0b91c
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Apr 21 13:22:15 2013 -0500

    Grab cmake files from buildroot instead of source

 ogre.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/ogre.spec b/ogre.spec
index 8fae1cf..8665b55 100644
--- a/ogre.spec
+++ b/ogre.spec
@@ -173,8 +173,9 @@ ln -s ../../../../fonts/dejavu/DejaVuSansCondensed.ttf \
 ln -s ../../../../fonts/dejavu/DejaVuSans.ttf \
   $RPM_BUILD_ROOT%{_datadir}/OGRE/media/fonts/solo5.ttf       
 
+# cmake macros should be in the cmake directory, not an Ogre directory
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/cmake/Modules
-install -p -m 644 CMake/Packages/FindOGRE.cmake $RPM_BUILD_ROOT%{_datadir}/cmake/Modules
+mv $RPM_BUILD_ROOT%{_libdir}/OGRE/cmake/* $RPM_BUILD_ROOT%{_datadir}/cmake/Modules
 
 %post -p /sbin/ldconfig
 
@@ -193,15 +194,16 @@ install -p -m 644 CMake/Packages/FindOGRE.cmake $RPM_BUILD_ROOT%{_datadir}/cmake
 %dir %{_sysconfdir}/OGRE
 %exclude %{_bindir}/SampleBrowser
 %exclude %{_libdir}/OGRE/Samples
+%exclude %{_datadir}/OGRE/cmake
 %exclude %{_datadir}/OGRE/media
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*Ogre*.so
+%{_datadir}/cmake/Modules/*
 %{_includedir}/OGRE
 %{_libdir}/pkgconfig/*.pc
-%{_datadir}/cmake/Modules/*
 
 %files devel-doc
 %defattr(-,root,root,-)


More information about the scm-commits mailing list