rpms/ipe/FC-5 ipe_6.0pre26-libpath.patch,NONE,1.1 ipe.spec,1.2,1.3
Laurent Rineau (rineau)
fedora-extras-commits at redhat.com
Thu Jul 20 18:59:13 UTC 2006
Author: rineau
Update of /cvs/extras/rpms/ipe/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16151/FC-5
Modified Files:
ipe.spec
Added Files:
ipe_6.0pre26-libpath.patch
Log Message:
%changelog
* Thu Jul 20 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.8.pre26
- New patch ipe_6.0pre26-libpath.patch, to be able to compile ipe even if another version is installed.
This patch make use LIBPATH instead of explicit flags such as "-L../../build/lib/", in pro files.
- Modification of ipe_6.0pre26-ipelet-pro_files.patch, so that CONFIG+="plugin", and never CONFIG+="qt plugin", in ipelets pro files.
- Temporarely, add BuildRequires: nas-devel. qt4-devel should require it.
ipe_6.0pre26-libpath.patch:
--- NEW FILE ipe_6.0pre26-libpath.patch ---
--- src/ipecanvas/ipecanvas.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipecanvas/ipecanvas.pro 2006-07-20 19:55:18.000000000 +0200
@@ -16,7 +16,8 @@
DEPENDPATH += ../include
INCLUDEPATH += $${FREETYPE_INCLUDE}
LIBS += $${FREETYPE_LIBS} -lfreetype
-LIBS += -L../../build/lib -lipe
+LIBPATH += ../../build/lib
+LIBS += -lipe
# --------------------------------------------------------------------
# Headers that moc needs to see:
FORMS += ipedlgtext.ui
--- src/ipe/ipe.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipe/ipe.pro 2006-07-20 19:55:18.000000000 +0200
@@ -48,7 +48,8 @@
MOC_DIR = ../../build/moc/ipe
RCC_DIR = ../../build/rcc/ipe
DESTDIR = ../../build/bin
-LIBS += -L../../build/lib -lipemodel -lipecanvas -lipe
+LIBPATH += ../../build/lib
+LIBS += -lipemodel -lipecanvas -lipe
unix:LIBS += $${QMAKE_LIBS_DYNLOAD}
#win32:TARGETDEPS += ../../build/lib/ipe.dll
#win32:TARGETDEPS += ../../build/lib/ipecanvas.dll
--- src/ipelets/align/align.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipelets/align/align.pro 2006-07-20 19:55:18.000000000 +0200
@@ -10,7 +10,8 @@
TARGET = align
INCLUDEPATH += ../../include
DEPENDPATH += ../../include
-LIBS += -L../../../build/lib -lipe
+LIBPATH += ../../../build/lib
+LIBS += -lipe
OBJECTS_DIR = ../../../build/obj/ipelets
DESTDIR = ../../../build/ipelets
# --------------------------------------------------------------------
--- src/ipelets/clip/clip.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipelets/clip/clip.pro 2006-07-20 19:55:18.000000000 +0200
@@ -10,7 +10,8 @@
TARGET = clip
INCLUDEPATH += ../../include
DEPENDPATH += ../../include
-LIBS += -L../../../build/lib -lipe
+LIBPATH += ../../../build/lib
+LIBS += -lipe
OBJECTS_DIR = ../../../build/obj/ipelets
DESTDIR = ../../../build/ipelets
# --------------------------------------------------------------------
--- src/ipelets/goodies/goodies.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipelets/goodies/goodies.pro 2006-07-20 19:55:18.000000000 +0200
@@ -10,7 +10,8 @@
TARGET = goodies
INCLUDEPATH += ../../include
DEPENDPATH += ../../include
-LIBS += -L../../../build/lib -lipe
+LIBPATH += ../../../build/lib
+LIBS += -lipe
OBJECTS_DIR = ../../../build/obj/ipelets
DESTDIR = ../../../build/ipelets
# --------------------------------------------------------------------
--- src/ipelets/image/image.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipelets/image/image.pro 2006-07-20 19:55:18.000000000 +0200
@@ -10,7 +10,8 @@
TARGET = image
INCLUDEPATH += ../../include
DEPENDPATH += ../../include
-LIBS += -L../../../build/lib -lipe
+LIBPATH += ../../../build/lib
+LIBS += -lipe
OBJECTS_DIR = ../../../build/obj/ipelets
DESTDIR = ../../../build/ipelets
# --------------------------------------------------------------------
--- src/ipelets/kgon/kgon.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipelets/kgon/kgon.pro 2006-07-20 19:55:18.000000000 +0200
@@ -10,7 +10,8 @@
TARGET = kgon
INCLUDEPATH += ../../include
DEPENDPATH += ../../include
-LIBS += -L../../../build/lib -lipe
+LIBPATH += ../../../build/lib
+LIBS += -lipe
OBJECTS_DIR = ../../../build/obj/ipelets
DESTDIR = ../../../build/ipelets
# --------------------------------------------------------------------
--- src/ipelets/qvoronoi/qvoronoi.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipelets/qvoronoi/qvoronoi.pro 2006-07-20 19:55:18.000000000 +0200
@@ -11,8 +11,10 @@
INCLUDEPATH += ../../include
INCLUDEPATH += c:/home/devel/qhull2002.1/src
DEPENDPATH += ../../include
-LIBS += -Lc:/home/devel/qhull2002.1 -lqhull
-LIBS += -L../../../build/lib -lipe
+LIBPATH += c:/home/devel/qhull2002.1
+LIBS += -lqhull
+LIBPATH += ../../../build/lib
+LIBS += -lipe
OBJECTS_DIR = ../../../build/obj/ipelets
DESTDIR = ../../../build/ipelets
# --------------------------------------------------------------------
--- src/ipelets/smallest-circle/smallest-circle.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipelets/smallest-circle/smallest-circle.pro 2006-07-20 19:55:18.000000000 +0200
@@ -10,7 +10,8 @@
TARGET = smallest-circle
INCLUDEPATH += ../../include
DEPENDPATH += ../../include
-LIBS += -L../../../build/lib -lipe
+LIBPATH += ../../../build/lib
+LIBS += -lipe
OBJECTS_DIR = ../../../build/obj/ipelets
DESTDIR = ../../../build/ipelets
# --------------------------------------------------------------------
--- src/ipelets/templates/templates.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipelets/templates/templates.pro 2006-07-20 19:55:18.000000000 +0200
@@ -11,7 +11,8 @@
TARGET = templates
INCLUDEPATH += ../../include
DEPENDPATH += ../../include
-LIBS += -L../../../build/lib -lipe
+LIBPATH += ../../../build/lib
+LIBS += -lipe
OBJECTS_DIR = ../../../build/obj/ipelets
UI_DIR = ../../../build/ui/ipelets
MOC_DIR = ../../../build/moc/ipelets
--- src/ipelets/visibility-polygon/visibility-polygon.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipelets/visibility-polygon/visibility-polygon.pro 2006-07-20 19:55:18.000000000 +0200
@@ -10,7 +10,8 @@
TARGET = visibility-polygon
INCLUDEPATH += ../../include
DEPENDPATH += ../../include
-LIBS += -L../../../build/lib -lipe
+LIBPATH += ../../../build/lib
+LIBS += -lipe
OBJECTS_DIR = ../../../build/obj/ipelets
DESTDIR = ../../../build/ipelets
# --------------------------------------------------------------------
--- src/ipemodel/ipemodel.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipemodel/ipemodel.pro 2006-07-20 19:55:18.000000000 +0200
@@ -13,7 +13,8 @@
# --------------------------------------------------------------------
INCLUDEPATH += ../include
DEPENDPATH += ../include
-LIBS += -L../../build/lib -lipe
+LIBPATH += ../../build/lib
+LIBS += -lipe
# --------------------------------------------------------------------
# Headers that moc needs to see:
HEADERS += ipeprefs.h
--- src/ipetoipe/ipetoipe.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipetoipe/ipetoipe.pro 2006-07-20 19:55:18.000000000 +0200
@@ -18,7 +18,8 @@
# --------------------------------------------------------------------
OBJECTS_DIR = ../../build/obj/ipetoipe
DESTDIR = ../../build/bin
-LIBS += -L../../build/lib -lipemodel -lipe
+LIBPATH += ../../build/lib
+LIBS += -lipemodel -lipe
# --------------------------------------------------------------------
unix:target.path = $${IPEBINDIR}
unix:INSTALLS += target
--- src/ipetopng/ipetopng.pro.patch-libpath 2006-07-20 19:36:08.000000000 +0200
+++ src/ipetopng/ipetopng.pro 2006-07-20 19:55:18.000000000 +0200
@@ -20,7 +20,8 @@
OBJECTS_DIR = ../../build/obj/ipetopng
MOC_DIR = ../../build/moc/ipetopng
DESTDIR = ../../build/bin
-LIBS += -L../../build/lib -lipemodel -lipecanvas -lipe
+LIBPATH += ../../build/lib
+LIBS += -lipemodel -lipecanvas -lipe
win32:TARGETDEPS += ../../build/bin/ipemodel.dll
win32:TARGETDEPS += ../../build/bin/ipecanvas.dll
win32:TARGETDEPS += ../../build/bin/ipe.dll
Index: ipe.spec
===================================================================
RCS file: /cvs/extras/rpms/ipe/FC-5/ipe.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ipe.spec 9 Jul 2006 22:25:37 -0000 1.2
+++ ipe.spec 20 Jul 2006 18:59:13 -0000 1.3
@@ -2,7 +2,7 @@
Name: ipe
Version: 6.0
-Release: 0.7.%{preversion}%{?dist}
+Release: 0.8.%{preversion}%{?dist}
Summary: The Ipe extensible drawing editor
Group: Applications/Publishing
@@ -12,11 +12,16 @@
Patch0: ipe-6.0pre26-printf-size_t.patch
Patch1: ipe-6.0pre26-ipelet-pro_files.patch
Patch2: ipe_6.0pre26-initui.cpp.patch
+Patch3: ipe_6.0pre26-libpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel
BuildRequires: desktop-file-utils
+# temporary requirement: qt4-devel should require nas-devel
+# See https://bugzilla.redhat.com/199606
+BuildRequires: nas-devel
+
# Tips found at https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191589#c7
%global qtdir %(pkg-config --variable=prefix QtCore)
@@ -53,6 +58,7 @@
%patch0 -p1 -b .size_t.bak
%patch1 -p1 -b .plugin.bak
%patch2 -p1 -b .AboutToShow.bak
+%patch3 -p0 -b .libpath.bak
%build
export QTDIR=%{qtdir}
@@ -159,6 +165,12 @@
%{_datadir}/ipe/%{version}/doc
%changelog
+* Thu Jul 20 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.8.pre26
+- New patch ipe_6.0pre26-libpath.patch, to be able to compile ipe even if another version is installed.
+ This patch make use LIBPATH instead of explicit flags such as "-L../../build/lib/", in pro files.
+- Modification of ipe_6.0pre26-ipelet-pro_files.patch, so that CONFIG+="plugin", and never CONFIG+="qt plugin", in ipelets pro files.
+- Temporarely, add BuildRequires: nas-devel. qt4-devel should require it.
+
* Tue Jul 4 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.7.pre26
- In %%files, use libipe.so.1*, instead of libipe.so.*
- Make sub-package %%{name}-doc depend on %%{name}
More information about the fedora-extras-commits
mailing list