[mongodb] remove duplicate headers (#886064)

tdawson tdawson at fedoraproject.org
Mon Jan 7 16:57:13 UTC 2013


commit 8d9df5d6ec218a089fd095fe52f1ce6eb31be30f
Author: Troy Dawson <tdawson at redhat.com>
Date:   Mon Jan 7 10:56:57 2013 -0600

    remove duplicate headers (#886064)

 mongodb.spec |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/mongodb.spec b/mongodb.spec
index d5daae1..faf8436 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -2,7 +2,7 @@
 
 Name:           mongodb
 Version:        2.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        High-performance, schema-free document-oriented database
 Group:          Applications/Databases
 License:        AGPLv3 and zlib and ASL 2.0
@@ -182,6 +182,17 @@ cp -p debian/*.1 %{buildroot}%{_mandir}/man1/
 
 mkdir -p %{buildroot}%{_localstatedir}/run/%{name}
 
+# In mongodb 2.2.2 we have duplicate headers
+#  Everything should be in %{_includedir}/mongo
+#  but it is almost all duplicated in %{_includedir}
+#  which could potentially conflict
+#  or cause problems.
+mkdir -p %{buildroot}/%{name}-hold
+mv %{buildroot}/%{_includedir}/mongo %{buildroot}/%{name}-hold/mongo
+rm -rf %{buildroot}/%{_includedir}/*
+mv %{buildroot}/%{name}-hold/mongo %{buildroot}/%{_includedir}/mongo
+rm -rf %{buildroot}/%{name}-hold
+
 %clean
 rm -rf %{buildroot}
 
@@ -285,6 +296,9 @@ fi
 %{_includedir}
 
 %changelog
+* Mon Jan 07 2013 Troy Dawson <tdawson at redhat.com> - 2.2.2-2
+- remove duplicate headers (#886064)
+
 * Wed Dec 05 2012 Troy Dawson <tdawson at redhat.com> - 2.2.2-1
 - Updated to version 2.2.2
 


More information about the scm-commits mailing list