rpms/qt-creator/F-10 qt-creator-1.2.0-qtcreatorwidgets_pro.patch, NONE, 1.1 import.log, 1.5, 1.6 qt-creator.spec, 1.4, 1.5 qt-creator-1.2.0-lib64.patch, 1.1, NONE
Itamar Reis Peixoto
itamarjp at fedoraproject.org
Mon Jul 13 16:10:32 UTC 2009
- Previous message (by thread): rpms/qt-creator/devel qt-creator-1.2.0-qtcreatorwidgets_pro.patch, NONE, 1.1 import.log, 1.4, 1.5 qt-creator.spec, 1.4, 1.5 qt-creator-1.2.0-lib64.patch, 1.1, NONE
- Next message (by thread): rpms/qt-creator/F-11 qt-creator-1.2.0-qtcreatorwidgets_pro.patch, NONE, 1.1 import.log, 1.3, 1.4 qt-creator.spec, 1.3, 1.4 qt-creator-1.2.0-lib64.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: itamarjp
Update of /cvs/pkgs/rpms/qt-creator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25052/F-10
Modified Files:
import.log qt-creator.spec
Added Files:
qt-creator-1.2.0-qtcreatorwidgets_pro.patch
Removed Files:
qt-creator-1.2.0-lib64.patch
Log Message:
fix BZ #498563
qt-creator-1.2.0-qtcreatorwidgets_pro.patch:
--- NEW FILE qt-creator-1.2.0-qtcreatorwidgets_pro.patch ---
>From 8f2d0094fd4e8ec929d804f79f1db3136f016b27 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer at nokia.com>
Date: Mon, 29 Jun 2009 12:26:53 +0200
Subject: [PATCH] Fix qtcreatorwidgets.pro to use the same logic as qtcreator.pri
---
src/tools/qtcreatorwidgets/qtcreatorwidgets.pro | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
index ad78021..1668c4a 100644
--- a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
+++ b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
@@ -9,16 +9,17 @@ SOURCES = customwidgets.cpp
# Link against the qtcreator utils lib
+isEmpty(IDE_LIBRARY_BASENAME) {
+ IDE_LIBRARY_BASENAME = lib
+}
+
linux-* {
# form abs path to qtcreator lib dir
QTC_LIBS=$$dirname(PWD)
QTC_LIBS=$$dirname(QTC_LIBS)
QTC_LIBS=$$dirname(QTC_LIBS)
- linux-*64 {
- QTC_LIBS=$$QTC_LIBS/lib64/qtcreator
- } else {
- QTC_LIBS=$$QTC_LIBS/lib/qtcreator
- }
+ QTC_LIBS=$$QTC_LIBS/$$IDE_LIBRARY_BASENAME/qtcreator
+ QTC_LIBS=$$QTC_LIBS/$$IDE_LIBRARY_BASENAME/qtcreator
QMAKE_RPATHDIR *= $$QTC_LIBS
}
--
1.6.1
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log 29 Jun 2009 00:18:30 -0000 1.5
+++ import.log 13 Jul 2009 16:10:01 -0000 1.6
@@ -3,3 +3,4 @@ qt-creator-1_1_0-1_fc11:HEAD:qt-creator-
qt-creator-1_1_0-2_fc11:HEAD:qt-creator-1.1.0-2.fc11.src.rpm:1240702375
qt-creator-1_1_0-2_fc11:F-10:qt-creator-1.1.0-2.fc11.src.rpm:1240850030
qt-creator-1_2_0-1_fc11:F-10:qt-creator-1.2.0-1.fc11.src.rpm:1246234638
+qt-creator-1_2_0-2_fc11:F-10:qt-creator-1.2.0-2.fc11.src.rpm:1247501254
Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-10/qt-creator.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- qt-creator.spec 29 Jun 2009 00:18:30 -0000 1.4
+++ qt-creator.spec 13 Jul 2009 16:10:02 -0000 1.5
@@ -1,6 +1,6 @@
Name: qt-creator
Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lightweight and cross-platform IDE for Qt
Group: Development/Tools
@@ -11,11 +11,11 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
Source1: qtcreator.desktop
+# make it install into lib/lib64
+Patch0: qt-creator-1.2.0-qtcreatorwidgets_pro.patch
#fix qdoc3 executable location in fedora
-Patch0: qt-creator-1.2.0-lib64.patch
Patch1: qtdoc3_location.patch
-#temporary disabled docs
Requires: hicolor-icon-theme
BuildRequires: qt4-devel >= 4.5.0
BuildRequires: desktop-file-utils
@@ -28,12 +28,13 @@ even faster and easier.
%prep
%setup -q -n %name-%version-src
+%patch0 -p1
%patch1 -p0
#make it install into lib64
-%if "%{_lib}" == "lib64"
-%patch0 -p2
-%endif
+#%if "%{_lib}" == "lib64"
+#%patch0 -p2
+#%endif
%build
@@ -43,14 +44,14 @@ CFLAGS="${CFLAGS:-%optflags}" ; export C
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-qmake-qt4
+qmake-qt4 -r IDE_LIBRARY_BASENAME=%{_lib}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL_ROOT=$RPM_BUILD_ROOT/%{_prefix}
-for i in 16 24 32 48 64 128
+for i in 16 24 32 48 64 128 256
do
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${i}x${i}/apps
# link it to %{_datadir}/pixmaps/qtcreator_logo_${i}.png
@@ -68,6 +69,20 @@ desktop-file-install
rm -rf $RPM_BUILD_ROOT
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+
%files
%defattr(-,root,root,-)
%doc README LICENSE.LGPL LGPL_EXCEPTION.TXT
@@ -81,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/doc/qtcreator/qtcreator.qch
%changelog
+* Mon Jul 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.0-2
+- fix BZ #498563 patch from Michel Salim <salimma at fedoraproject.org>
+- Update GTK icon cache
+
* Sun Jun 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.0-1
- new version 1.2.0
--- qt-creator-1.2.0-lib64.patch DELETED ---
- Previous message (by thread): rpms/qt-creator/devel qt-creator-1.2.0-qtcreatorwidgets_pro.patch, NONE, 1.1 import.log, 1.4, 1.5 qt-creator.spec, 1.4, 1.5 qt-creator-1.2.0-lib64.patch, 1.1, NONE
- Next message (by thread): rpms/qt-creator/F-11 qt-creator-1.2.0-qtcreatorwidgets_pro.patch, NONE, 1.1 import.log, 1.3, 1.4 qt-creator.spec, 1.3, 1.4 qt-creator-1.2.0-lib64.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list