rpms/kdebindings/F-9 .cvsignore, 1.40, 1.41 kdebindings.spec, 1.100, 1.101 sources, 1.45, 1.46 kdebindings-4.0.5-pykde4.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Jul 23 13:27:17 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/kdebindings/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23288
Modified Files:
.cvsignore kdebindings.spec sources
Removed Files:
kdebindings-4.0.5-pykde4.patch
Log Message:
* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-1
- 4.0.99
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-9/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore 1 Jun 2008 19:22:36 -0000 1.40
+++ .cvsignore 23 Jul 2008 13:26:28 -0000 1.41
@@ -1,2 +1 @@
-kdebindings-4.0.4.tar.bz2
-kdebindings-4.0.5.tar.bz2
+kdebindings-4.0.99.tar.bz2
Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-9/kdebindings.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kdebindings.spec 4 Jun 2008 14:57:02 -0000 1.100
+++ kdebindings.spec 23 Jul 2008 13:26:28 -0000 1.101
@@ -1,3 +1,18 @@
+# FIXME/TODO: BRs for Java (krossjava), C# (qyoto, kimono) and PHP (php-qt) support?
+# IMHO this one really needs to be split into subpackages, we don't want to pull
+# in e.g. the whole Ruby, OpenJDK and Mono stacks for a PyKDE app! -- Kevin
+# FIXME/TODO: Do we want to enable the optional Ruby bindings which are off by
+# default? There are bindings for QScintilla, Plasma and Nepomuk/Soprano. -- Kevin
+
+# define to enable these optional bits
+#define csharp 1
+%define ruby 1
+%define smoke 1
+#define php 1
+
+%if 0%{?ruby}%{?smoke}
+%define devel 1
+%endif
%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
@@ -6,71 +21,87 @@
%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
Name: kdebindings
-Version: 4.0.5
-Release: 2%{?dist}
+Version: 4.0.99
+Release: 1%{?dist}
Summary: KDE bindings to non-C++ languages
Group: User Interface/Desktops
License: GPLv2
URL: http://developer.kde.org/language-bindings/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: kdebindings-4.0.5-pykde4.patch
BuildRequires: kde-filesystem >= 4
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: kdegraphics4-devel >= %{version}
+BuildRequires: soprano-devel >= 2.0.97
BuildRequires: cmake
-# FIMXE:TODO: disabled for now
-#BuildRequires: mono-core
+%{?csharp:BuildRequires: mono-core}
BuildRequires: python-devel
-BuildRequires: ruby-devel
-BuildRequires: ruby
+%{?ruby:BuildRequires: ruby-devel ruby}
BuildRequires: giflib-devel
BuildRequires: pcre-devel
# causes smokeqt to fail to build
-#BuildRequires: qwt-devel
+#{?smoke:BuildRequires: qwt-devel}
BuildRequires: PyQt4-devel
%if 0%{?fedora} > 8
BuildRequires: qscintilla-devel >= 2
%endif
-Requires: PyQt4
-Provides: PyKDE4 = %{version}-%{release}
-
# FIXME/TODO: are there other explicit Requires?
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
Requires: kdelibs4 >= %{version}
Requires: kdebase-workspace >= %{version}
+%{!?devel:Obsoletes: kdebindings-devel < %{version}-%{release}}
+
%description
KDE bindings to non-C++ languages
+%package -n PyKDE4
+Group: Development/Languages
+Summary: Python bindings for KDE4
+Requires: kdelibs4 >= %{version}
+Requires: PyQt4
+%description -n PyKDE4
+Header files for developing applications using %{name}.
+
+%package -n PyKDE4-devel
+Group: Development/Languages
+Summary: Files needed to build other bindings based on KDE4
+Requires: PyQt4-devel
+Requires: PyKDE4 = %{version}-%{release}
+%description -n PyKDE4-devel
+Files needed to build other bindings for C++ classes that inherit from any
+of the KDE4 classes.
+
%package devel
Group: Development/Libraries
Summary: Header files for %{name}
-Provides: PyKDE4-devel = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: kdelibs4-devel kdebase-workspace-devel
-Requires: PyQt4-devel
%description devel
Header files for developing applications using %{name}.
%prep
%setup -q
-%patch0 -p1 -b .pykde4
-%build
+%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
# FIXME/TODO: Get csharp to compile
-%{cmake_kde4} -DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch} -DBUILD_csharp=OFF ..
+%{cmake_kde4} \
+ %{!?csharp:-DBUILD_csharp=OFF} \
+ %{!?php:-DBUILD_php=OFF} \
+ %{!?ruby:-DBUILD_ruby=OFF} %{?ruby:-DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch}} \
+ %{!?smoke:-DBUILD_smoke=OFF} \
+ ..
popd
-make %{?_smp_mflags} -C %{_target_platform}
+# smp build not recommended (upstream)
+make -C %{_target_platform}
%install
@@ -83,48 +114,121 @@
rm -rf %{buildroot}
-%post
-/sbin/ldconfig ||:
+%post -p /sbin/ldconfig
-%postun
-/sbin/ldconfig ||:
+%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
-%{_kde4_bindir}/*
+%if 0%{?smoke}
%{_kde4_libdir}/lib*.so.*
-%{_kde4_libdir}/kde4/*.so
-%{ruby_sitelib}/KDE/
-%{ruby_sitelib}/Qt.rb
-%{ruby_sitelib}/Qt/
-%{ruby_sitelib}/Qt3.rb
-%{ruby_sitelib}/Qt4.rb
+%endif
+# unversioned library
+%{_kde4_libdir}/kde4/krosspython.so
+%if 0%{?ruby}
+%{_kde4_bindir}/*
+%{_kde4_libdir}/libqtruby4shared.so
+%{_kde4_libdir}/kde4/krossruby.so
+%{_kde4_libdir}/kde4/krubypluginfactory.so
+%{ruby_sitelib}/*
%{ruby_sitearch}/*.so
+%{_kde4_datadir}/applications/kde4/dbpedia_references.desktop
+%{_kde4_appsdir}/dbpedia_references/
+%endif
+
+%files -n PyKDE4
+%defattr(-,root,root,-)
+%doc COPYING
%{python_sitearch}/PyKDE4/
%{_kde4_appsdir}/pykde4/
+%files -n PyKDE4-devel
+%defattr(-,root,root,-)
+%doc %{_kde4_docdir}/HTML/en/pykde4/
+%{_kde4_datadir}/sip/PyKDE4/
+
+%if 0%{?devel}
%files devel
%defattr(-,root,root,-)
-%doc %{_kde4_docdir}/HTML/PyKDE4/
+%if 0%{?smoke}
%{_includedir}/smoke.h
-%{_kde4_datadir}/sip/PyKDE4/
+%{_includedir}/smoke/
%{_kde4_libdir}/lib*.so
+%endif
+%if 0%{?ruby}
+%{_includedir}/qtruby/
+%exclude %{_kde4_libdir}/libqtruby4shared.so
+%endif
+%endif
%changelog
-* Wed Jun 04 2008 Than Ngo <than at redhat.com> 4.0.5-2
-- fix typedefs issue which breaks the build
-
-* Tue Jun 03 2008 Than Ngo <than at redhat.com> - 4.0.5-2
-- respun tarball from upstream
+* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-1
+- 4.0.99
-* Sun Jun 01 2008 Than Ngo <than at redhat.com> 4.0.5-1
-- 4.0.5
+* Mon Jul 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-3
+- re-enable smoke (patched), ruby
-* Tue May 06 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.0.4-1
-- kde-4.0.4
+* Mon Jul 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-2
+- omit smoke, ruby bindings (build failures, sorting out upstream)
+- -devel: -BR: PyQt4-devel
+
+* Fri Jul 11 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-1
+- 4.0.98
+
+* Sun Jul 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.85-1
+- 4.0.85
+
+* Sat Jun 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.84-2
+- fix Python bindings for Phonon and Soprano
+
+* Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.84-1
+- 4.0.84
+
+* Sat Jun 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.83-4
+- fix PyKDE4-devel to require PyKDE4 rather than itself
+
+* Sat Jun 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.83-3
+- reenable Ruby again
+- add missing Epoch for minimum kdegraphics-devel version requirement
+- fix CMake target name conflict between Ruby and Python bindings
+- fix file list for Ruby
+
+* Fri Jun 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.83-2
+- reenable smoke again (keep ruby off for now)
+- drop explicit ENABLE_SMOKEKDEVPLATFORM=OFF (now off by default)
+- add BR kdegraphics-devel for the Smoke Okular bindings
+- fix file list
+
+* Thu Jun 19 2008 Than Ngo <than at redhat.com> 4.0.83-1
+- 4.0.83 (beta2)
+
+* Wed Jun 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.82-3
+- revert, more borkage.
+
+* Tue Jun 17 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.82-2
+- reenable smoke and ruby, set ENABLE_SMOKEKDEVPLATFORM=OFF (no kdevplatform)
+
+* Sun Jun 15 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.82-1
+- 4.0.82
+- omit ruby, smoke (busted) => no -devel subpkg (for now)
+- PyKDE4(-devel) subpkgs
+
+* Tue May 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-2
+- disable php-qt for now
+- apply PyKDE4 and smokekde build fixes from upstream
+- update file lists (comment out smokeplasma, add new smoke/ruby files)
+- fix incorrect libdir on lib64 platforms
+
+* Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
+- 4.1 beta1
+
+* Wed May 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-1
+- update to 4.0.72
+- add BR soprano-devel
+- update file list to include plasma-ruby stuff
* Thu Apr 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-3
- rebuild (again) for the fixed %%{_kde4_buildtype}
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-9/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources 3 Jun 2008 08:02:30 -0000 1.45
+++ sources 23 Jul 2008 13:26:28 -0000 1.46
@@ -1 +1 @@
-21126044fbe6d9357ce3c8c07b659c3a kdebindings-4.0.5.tar.bz2
+5b9529a90445f075a201ec5754ebe3c9 kdebindings-4.0.99.tar.bz2
--- kdebindings-4.0.5-pykde4.patch DELETED ---
More information about the fedora-extras-commits
mailing list