rpms/qedje/devel qedje-0.4.0-fix_configure_paths.patch, NONE, 1.1 qedje.spec, 1.10, 1.11
john5342
john5342 at fedoraproject.org
Tue Jan 12 18:29:37 UTC 2010
Author: john5342
Update of /cvs/pkgs/rpms/qedje/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16370
Modified Files:
qedje.spec
Added Files:
qedje-0.4.0-fix_configure_paths.patch
Log Message:
* Tue Jan 12 2010 john5342 <john5342 at fedoraproject.org> - 0.4.0-6
- Fix qedje.pc configuration. Same issue as qzion (#553715)
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/devel/qedje.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- qedje.spec 7 Jan 2010 22:26:49 -0000 1.10
+++ qedje.spec 12 Jan 2010 18:29:35 -0000 1.11
@@ -4,7 +4,7 @@
Name: qedje
Version: 0.4.0
-Release: 5%{?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,9 @@ 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)
More information about the scm-commits
mailing list