[qt-creator/el6] Commenting out the privlibs stuff to see if it will allow things to build

Dave Johansen daveisfera at fedoraproject.org
Fri Feb 21 13:33:51 UTC 2014


commit d2cea9eeb662a08a16bb3bed202a654289bbb748
Author: Dave Johansen <davejohansen at gmail.com>
Date:   Fri Feb 21 06:34:13 2014 -0700

    Commenting out the privlibs stuff to see if it will allow things to build

 qt-creator.spec |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/qt-creator.spec b/qt-creator.spec
index 4a81413..15fdc7a 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -17,7 +17,7 @@ URL:            http://qt.digia.com/Product/Qt-Core-Features-Functions/Developer
 Source0:        http://download.qt-project.org/official_releases/qtcreator/3.0/%{version}%{?pre:-%pre}/qt-creator-opensource-src-%{version}%{?pre:-%pre}.tar.gz
 
 Source1:        qtcreator.desktop
-Source2:        qt-creator-Fedora-privlibs
+#Source2:        qt-creator-Fedora-privlibs
 
 Patch0:         qt-creator-rhel6-werror.patch
 
@@ -44,9 +44,9 @@ BuildRequires:  botan-devel
 BuildRequires:  diffutils
 
 # long list of private shared lib names to filter out
-%include %{SOURCE2}
-%global __provides_exclude ^(%{privlibs})\.so
-%global __requires_exclude ^(%{privlibs})\.so
+#%include %{SOURCE2}
+#%global __provides_exclude ^(%{privlibs})\.so
+#%global __requires_exclude ^(%{privlibs})\.so
 
 %description
 Qt Creator is a cross-platform IDE (integrated development environment)
@@ -83,19 +83,19 @@ done
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 
 # Output an up-to-date list of Provides/Requires exclude statements.
-outfile=__Fedora-privlibs
-i=0
-sofiles=$(find %{buildroot}%{_libdir}/qtcreator -name \*.so\*|sed 's!^.*/\(.*\).so.*!\1!g'|sort|uniq)
-for so in ${sofiles} ; do
-    if [ $i == 0 ]; then
-        echo "%%global privlibs $so" > $outfile
-        i=1
-    else
-        echo "%%global privlibs %%{privlibs}|$so" >> $outfile
-    fi
-done
-diff -u %{SOURCE2} $outfile || :
-cat $outfile
+#outfile=__Fedora-privlibs
+#i=0
+#sofiles=$(find %{buildroot}%{_libdir}/qtcreator -name \*.so\*|sed 's!^.*/\(.*\).so.*!\1!g'|sort|uniq)
+#for so in ${sofiles} ; do
+#    if [ $i == 0 ]; then
+#        echo "%%global privlibs $so" > $outfile
+#        i=1
+#    else
+#        echo "%%global privlibs %%{privlibs}|$so" >> $outfile
+#    fi
+#done
+#diff -u %{SOURCE2} $outfile || :
+#cat $outfile
 
 
 %post


More information about the scm-commits mailing list