rpms/qscintilla/devel qscintilla.spec, 1.12, 1.13 qscintilla-1.61-gpl-1.4-designer-incpath.patch, 1.2, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9061

Modified Files:
	qscintilla.spec 
Removed Files:
	qscintilla-1.61-gpl-1.4-designer-incpath.patch 
Log Message:
* Thu Feb 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.1-4
- use %_qt4_* macros (preparing for qt4 possibly moving %_qt4_datadir)
- -python: fix Requires
- -python-devel: new pkg
- omit Obsoletes: PyQt-qscintilla 
  (leave that to PyQt, that can get the versioning right)



Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qscintilla.spec	29 Jan 2008 00:56:11 -0000	1.12
+++ qscintilla.spec	14 Feb 2008 17:34:40 -0000	1.13
@@ -1,9 +1,10 @@
+
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define         scintilla_ver   1.73
 
 Name:	        qscintilla
 Version:        2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Scintilla port to Qt
 
 License:        GPLv2+
@@ -16,6 +17,10 @@
 Patch2:         qscintilla-1.73-gpl-2.1-paths.patch
 
 BuildRequires:  qt4-devel
+# for -python
+BuildRequires:  PyQt4-devel
+BuildRequires:  chrpath
+
 
 %description
 QScintilla is a port of Scintilla to the Qt GUI toolkit.
@@ -40,15 +45,24 @@
 %{summary}.
 
 %package python
-Summary:        QScintilla Qt4 python bindings
+Summary:        QScintilla PyQt4 bindings
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt4
-BuildRequires:  python-devel sip-devel PyQt4-devel chrpath
-Obsoletes:      PyQt-qscintilla
+Requires:       PyQt4
+#Obsoletes:      PyQt-qscintilla
 %description python
 %{summary}.
 
+%package python-devel
+Summary:        Development files for QScintilla PyQt4 bindings 
+Group:          Development/Libraries
+Requires:       %{name}-python = %{version}-%{release}
+Requires:       PyQt4-devel
+#Obsoletes:      PyQt-qscintilla-devel 
+%description python-devel
+%{summary}.
+
+
 %prep
 %setup -q -n QScintilla-%{scintilla_ver}-gpl-%{version}
 
@@ -65,6 +79,7 @@
 # fix line endings in license file
 sed -i 's/\r//' LICENSE
 
+
 %build
 pushd Qt4
 sed -i 's/INSTALLS += header trans qsci/INSTALLS += header trans qsci target/g' qscintilla.pro
@@ -87,6 +102,7 @@
 make %{?_smp_mflags}
 popd
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_ROOT=$RPM_BUILD_ROOT -C Qt4 install
@@ -94,6 +110,7 @@
 make DESTDIR=$RPM_BUILD_ROOT -C Python install
 chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/PyQt4/Qsci.so
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -106,28 +123,38 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README
-%{_libdir}/lib*.so.*
-%{_datadir}/qt4/translations/*
-%{_datadir}/qt4/qsci/
+%{_qt4_libdir}/lib*.so.*
+%{_qt4_translationdir}/*
+%{_qt4_datadir}/qsci/
 
 %files designer
 %defattr(-,root,root,-)
-%{_libdir}/qt4/plugins/designer/libqscintillaplugin.so
+%{_qt4_plugindir}/designer/libqscintillaplugin.so
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html-Qt4 doc/Scintilla example-Qt4
-%{_includedir}/Qsci
-%{_libdir}/lib*.so
+%{_qt4_includedir}/Qsci/
+%{_qt4_libdir}/lib*.so
 
 %files python
 %defattr(-,root,root,-)
 %doc LICENSE
 %{python_sitearch}/PyQt4/Qsci.so
+
+%files python-devel
+%defattr(-,root,root,-)
 %{_datadir}/sip/PyQt4/Qsci/
 
 
 %changelog
+* Thu Feb 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.1-4
+- use %%_qt4_* macros (preparing for qt4 possibly moving %%_qt4_datadir)
+- -python: fix Requires
+- -python-devel: new pkg
+- omit Obsoletes: PyQt-qscintilla 
+  (leave that to PyQt, that can get the versioning right)
+
 * Mon Jan 28 2008 Dennis Gilmore <dennis at ausil.us> - 2.1-3
 - fix typo in Obsoletes: on python package
 


--- qscintilla-1.61-gpl-1.4-designer-incpath.patch DELETED ---