rpms/qedje/F-12 qedje-0.4.0-fix_configure_paths.patch, NONE, 1.1 qedje.spec, 1.7, 1.8

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/qedje/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2371/F-12

Modified Files:
	qedje.spec 
Added Files:
	qedje-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):

* Tue Jan 12 2010 john5342 <john5342 at fedoraproject.org> - 0.4.0-6
- Fix qedje.pc configuration. Same issue as qzion (#553715)

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

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

--- NEW FILE qedje-0.4.0-fix_configure_paths.patch ---
diff -up ./src/CMakeLists.txt.configure ./src/CMakeLists.txt
--- ./src/CMakeLists.txt.configure	2010-01-12 18:22:13.135730380 +0000
+++ ./src/CMakeLists.txt	2010-01-12 18:22:59.590732057 +0000
@@ -34,6 +34,6 @@ install(TARGETS qedje LIBRARY DESTINATIO
 install(FILES ${qedje_HEADERS} DESTINATION include/)
 
 if (NOT WIN32)
-    configure_file(qedje.pc.cmake qedje.pc @ONLY)
-    install(FILES ${CMAKE_BINARY_DIR}/qedje.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qedje.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/qedje.pc @ONLY)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qedje.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/)
 endif (NOT WIN32)


Index: qedje.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qedje/F-12/qedje.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- qedje.spec	16 Nov 2009 21:19:16 -0000	1.7
+++ qedje.spec	10 Feb 2010 19:34:07 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name:           qedje
 Version:        0.4.0
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        A library combining the benefits of Edje and Qt
 
 Group:          System Environment/Libraries
@@ -12,6 +12,7 @@ License:        GPLv3+
 URL:            http://code.openbossa.org/projects/%{name}
 Source0:        http://code.openbossa.org/projects/%{name}/repos/mainline/archive/0206ec8f2a802bf51455179933d8b7ab3e41a38b.tar.gz
 Patch0:         qedje-0.4.0-fix_python_install.patch
+Patch1:		qedje-0.4.0-fix_configure_paths.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -72,6 +73,7 @@ for the python bindings for %{name}
 %prep
 %setup -q -n %{name}-mainline
 %patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -119,6 +121,12 @@ rm -rf %{buildroot}
 %{_datadir}/sip/%{name}
 
 %changelog
+* Tue Jan 12 2010 john5342 <john5342 at fedoraproject.org> - 0.4.0-6
+- Fix qedje.pc configuration. Same issue as qzion (#553715)
+
+* Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-5 
+- rebuild (sip)
+
 * Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-4
 - -python: Requires: sip-api(%%_sip_api_major) >= %%_sip_api