rpms/qzion/F-11 qzion-0.4.0-fix_configure_paths.patch, NONE, 1.1 qzion.spec, 1.4, 1.5

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/qzion/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3123/F-11

Modified Files:
	qzion.spec 
Added Files:
	qzion-0.4.0-fix_configure_paths.patch 
Log Message:
Sync from devel (sip 4.10 rebuild for the Qt 4.6.1 / KDE 4.4.0 / sip 4.10 update):

* Sat Jan 09 2010 john5342 <john5342 at fedoraproject.org> - 0.4.0-7
- Fix FTBFS (#553715)

* Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-6 
- rebuild (sip)

qzion-0.4.0-fix_configure_paths.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE qzion-0.4.0-fix_configure_paths.patch ---
diff -up ./src/CMakeLists.txt.configure ./src/CMakeLists.txt
--- ./src/CMakeLists.txt.configure	2010-01-09 14:24:27.862646238 +0000
+++ ./src/CMakeLists.txt	2010-01-09 14:26:54.987396354 +0000
@@ -29,6 +29,6 @@ endif (QGV_BACKEND)
 install(FILES ${qzion_HEADERS} DESTINATION include/)
 
 if (NOT WIN32)
-    configure_file(common/qzion.pc.cmake qzion.pc @ONLY)
-    install(FILES ${CMAKE_BINARY_DIR}/qzion.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/common/qzion.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/qzion.pc @ONLY)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qzion.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/)
 endif (NOT WIN32)


Index: qzion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qzion/F-11/qzion.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- qzion.spec	17 Nov 2009 16:10:17 -0000	1.4
+++ qzion.spec	10 Feb 2010 19:37:41 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           qzion
 Version:        0.4.0
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        A canvas abstraction
 
 Group:          System Environment/Libraries
@@ -14,6 +14,8 @@ Source0:        http://code.openbossa.or
 
 Patch0:         qzion-0.4.0-fix_python_install.patch
 Patch1:		qzion-0.4.0-fix_char_conversion.patch
+#Make configure_file use full path so that qzion.pc can be found correctly.
+Patch2:		qzion-0.4.0-fix_configure_paths.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,6 +67,7 @@ the python bindings for %{name}
 %setup -q -n %{name}-mainline
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -110,6 +113,12 @@ rm -rf %{buildroot}
 %{_datadir}/sip/%{name}
 
 %changelog
+* Sat Jan 09 2010 john5342 <john5342 at fedoraproject.org> - 0.4.0-7
+- Fix FTBFS (#553715)
+
+* Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-6 
+- rebuild (sip)
+
 * Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-5
 - -python: Requires: sip-api(%%_sip_api_major) >= %%_sip_api