rpms/qedje/F-10 qedje-0.4.0-fix_python_install.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 qedje.spec, 1.1, 1.2 sources, 1.2, 1.3 qedje-0.3.0-rmhardcoded.patch, 1.1, NONE

[john5342]

Author: john5342

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

Modified Files:
	.cvsignore qedje.spec sources 
Added Files:
	qedje-0.4.0-fix_python_install.patch 
Removed Files:
	qedje-0.3.0-rmhardcoded.patch 
Log Message:
 * Sat Jun 13 2009 John5342 <john5342 at, fedoraproject.org> 0.4.0-1
 - Updated to new upstream release (0.4.0)


qedje-0.4.0-fix_python_install.patch:

--- NEW FILE qedje-0.4.0-fix_python_install.patch ---
diff -ur qedje-mainline/python/CMakeLists.txt qedje-mainline/python/CMakeLists.txt
--- qedje-mainline/python/CMakeLists.txt	2009-02-19 13:41:36.000000000 +0000
+++ qedje-mainline/python/CMakeLists.txt	2009-03-05 20:02:02.100289653 +0000
@@ -16,9 +16,6 @@
 set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
 set(SIP_EXTRA_OPTIONS -g)
 
-set(PYTHON_SITE_PACKAGES_DIR
-    ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_SHORT_VERSION}/site-packages)
-
 # Putting inside the "concepts" package until we release.
 file(GLOB qedje_files_sip qedje/*.sip)
 set(SIP_EXTRA_FILES_DEPEND ${qedje_files_sip})


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qedje/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Dec 2008 23:23:24 -0000	1.2
+++ .cvsignore	13 Jun 2009 19:29:06 -0000	1.3
@@ -1 +1 @@
-qedje-0.3.0.tar.gz
+0206ec8f2a802bf51455179933d8b7ab3e41a38b.tar.gz


Index: qedje.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qedje/F-10/qedje.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qedje.spec	21 Dec 2008 23:23:24 -0000	1.1
+++ qedje.spec	13 Jun 2009 19:29:06 -0000	1.2
@@ -1,19 +1,29 @@
+
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Name:           qedje
-Version:        0.3.0
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A library combining the benefits of Edje and Qt
 
 Group:          System Environment/Libraries
 License:        GPLv3+
-URL:            http://dev.openbossa.org/trac/qedje/
-Source0:        http://dev.openbossa.org/qedje/downloads/source/%{name}/%{name}-%{version}.tar.gz
-Patch0:         qedje-0.3.0-rmhardcoded.patch
+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
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
-BuildRequires:  pkgconfig
 BuildRequires:  eet-devel
 BuildRequires:  qzion-devel
+BuildRequires:  qzion-python-devel
+BuildRequires:  cmake
+BuildRequires:  pkgconfig
+BuildRequires:  python-devel
+BuildRequires:  sip-devel
+BuildRequires:  PyQt4-devel
 
 %description
 The main purpose of the QEdje project is to build a bridge among components
@@ -25,6 +35,7 @@ as Edje, and also enable Qt widgets to b
 
 Summary:   Development files for %{name}
 Group:     Development/Libraries
+Requires:  cmake
 Requires:  pkgconfig
 Requires:  %{name} = %{version}-%{release}
 Requires:  qzion-devel
@@ -34,25 +45,49 @@ Requires:  eet-devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+%package python
+
+Summary:  Python bindings for %{name}
+Group:    Development/Libraries
+Requires: PyQt4
+Requires: qzion-python
+
+%description python
+The %{name}-python package contains python bindings for %{name}
+
+%package python-devel
+
+Summary:  Python bindings for %{name}
+Group:    Development/Libraries
+Requires: sip
+Requires: PyQt4-devel
+Requires: qzion-python-devel
+Requires: %{name}-python = %{version}-%{release}
+
+%description python-devel
+The %{name}-python-devel package contains the development files
+for the python bindings for %{name}
+
 %prep
-%setup -q
+%setup -q -n %{name}-mainline
 %patch0 -p1
 
-#Support installing in buildroot
-sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro */*/*.pro
+%build
 
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} \
+-DPYTHON_SITE_PACKAGES_DIR=%{python_sitearch} \
+-DQZION_SIP_DIR=%{_datadir}/sip/qzion \
+..
+popd
 
-%build
-%{_qt4_qmake} PREFIX=/usr LIBDIR=%{_libdir}
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-make install INSTALL_ROOT=%{buildroot}
-
-#These are apparently only needed for static linking?
-find %{buildroot} -name *.prl -print -delete
+make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -66,6 +101,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc README COPYING
 %{_libdir}/*.so.*
+%{_bindir}/qedje_viewer
 
 %files devel
 %defattr(-,root,root,-)
@@ -73,8 +109,18 @@ rm -rf %{buildroot}
 %{_includedir}/*
 %{_libdir}/pkgconfig/%{name}.pc
 
+%files python
+%defattr(-,root,root,-)
+%{python_sitearch}/%{name}
+
+%files python-devel
+%defattr(-,root,root,-)
+%{_datadir}/sip/%{name}
 
 %changelog
+* Sat Jun 13 2009 John5342 <john5342 at, fedoraproject.org> 0.4.0-1
+- Updated to new upstream release (0.4.0)
+
 * Fri Dec 19 2008 John5342 <john5342 at, fedoraproject.org> 0.3.0-2
 - Fixed a license
 - BR: qzion-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qedje/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Dec 2008 23:23:24 -0000	1.2
+++ sources	13 Jun 2009 19:29:06 -0000	1.3
@@ -1 +1 @@
-7435e3631fd44dce4086afe8698cdb13  qedje-0.3.0.tar.gz
+6d498e98e8e470071c7b6bc6fa6259dc  0206ec8f2a802bf51455179933d8b7ab3e41a38b.tar.gz


--- qedje-0.3.0-rmhardcoded.patch DELETED ---