rpms/qzion/devel qzion-0.4.0-fix_python_install.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 qzion.spec, 1.2, 1.3 sources, 1.2, 1.3 qzion-0.3.0-rmhardcoded.patch, 1.1, NONE
Adrian John Wilson
john5342 at fedoraproject.org
Fri Mar 6 20:29:46 UTC 2009
Author: john5342
Update of /cvs/pkgs/rpms/qzion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30310/devel
Modified Files:
.cvsignore import.log qzion.spec sources
Added Files:
qzion-0.4.0-fix_python_install.patch
Removed Files:
qzion-0.3.0-rmhardcoded.patch
Log Message:
* Fri Mar 06 2009 John5342 <john5342 at, fedoraproject.org> 0.4.0-1
- Updated to new upstream release (0.4.0)
qzion-0.4.0-fix_python_install.patch:
--- NEW FILE qzion-0.4.0-fix_python_install.patch ---
diff -ur qzion-mainline/python/CMakeLists.txt qzion-mainline/python/CMakeLists.txt
--- qzion-mainline/python/CMakeLists.txt 2009-02-18 21:38:44.000000000 +0000
+++ qzion-mainline/python/CMakeLists.txt 2009-03-05 20:41:10.159038865 +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 qzion_files_sip qzion/*.sip)
set(SIP_EXTRA_FILES_DEPEND ${qzion_files_sip})
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qzion/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 21 Dec 2008 14:14:25 -0000 1.2
+++ .cvsignore 6 Mar 2009 20:29:15 -0000 1.3
@@ -1 +1 @@
-qzion-0.3.0.tar.gz
+d32223eae1bba7f1b191c334668f3f7dd662f582.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qzion/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 21 Dec 2008 14:14:26 -0000 1.1
+++ import.log 6 Mar 2009 20:29:15 -0000 1.2
@@ -1 +1,2 @@
qzion-0_3_0-2_fc10:HEAD:qzion-0.3.0-2.fc10.src.rpm:1229868811
+qzion-0_4_0-1_fc10:HEAD:qzion-0.4.0-1.fc10.src.rpm:1236371223
Index: qzion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qzion/devel/qzion.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qzion.spec 25 Feb 2009 18:34:05 -0000 1.2
+++ qzion.spec 6 Mar 2009 20:29:16 -0000 1.3
@@ -1,17 +1,27 @@
+
+%{!?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: qzion
-Version: 0.3.0
-Release: 3%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
Summary: A canvas abstraction
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: qzion-0.3.0-rmhardcoded.patch
+URL: http://code.openbossa.org/projects/qzion
+Source0: http://code.openbossa.org/projects/%{name}/repos/mainline/archive/d32223eae1bba7f1b191c334668f3f7dd662f582.tar.gz
+
+Patch0: qzion-0.4.0-fix_python_install.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel
+BuildRequires: PyQt4-devel
+BuildRequires: cmake
BuildRequires: pkgconfig
+BuildRequires: python-devel
+BuildRequires: sip-devel
%description
QZion is an canvas abstraction used by and made for QEdje.
@@ -20,6 +30,7 @@
Summary: Development files for %{name}
Group: Development/Libraries
+Requires: cmake
Requires: pkgconfig
Requires: %{name} = %{version}-%{release}
@@ -27,25 +38,46 @@
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
-%prep
-%setup -q
-%patch0 -p1
+%package python
+
+Summary: Python bindings for %{name}
+Group: Development/Libraries
+Requires: PyQt4
+
+%description python
+The %{name}-python package contains python bindings for %{name}
+
+
+%package python-devel
-#Support installing in buildroot
-sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro */*/*.pro
+Summary: Python bindings for %{name}
+Group: Development/Libraries
+Requires: sip
+Requires: PyQt4-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 -n %{name}-mainline
+%patch0 -p1
%build
-%{_qt4_qmake} PREFIX=/usr LIBDIR=%{_libdir}
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} \
+-DPYTHON_SITE_PACKAGES_DIR=%{python_sitearch} \
+..
+popd
+
+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}
@@ -67,8 +99,18 @@
%{_includedir}/*
%{_libdir}/pkgconfig/%{name}.pc
+%files python
+%defattr(-,root,root,-)
+%{python_sitearch}/%{name}
+
+%files python-devel
+%defattr(-,root,root,-)
+%{_datadir}/sip/%{name}
%changelog
+* Fri Mar 06 2009 John5342 <john5342 at, fedoraproject.org> 0.4.0-1
+- Updated to new upstream release (0.4.0)
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qzion/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 21 Dec 2008 14:14:26 -0000 1.2
+++ sources 6 Mar 2009 20:29:16 -0000 1.3
@@ -1 +1 @@
-293cb0a9783f7111d97838fea8b6970a qzion-0.3.0.tar.gz
+a9e6221d98d7abeb5ffb05b57f7d0276 d32223eae1bba7f1b191c334668f3f7dd662f582.tar.gz
--- qzion-0.3.0-rmhardcoded.patch DELETED ---
More information about the fedora-extras-commits
mailing list