rpms/kdebindings/devel kdebindings.spec, 1.108, 1.109 kdebindings-4.0.80-fix-smokekde.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdebindings.spec 
Removed Files:
	kdebindings-4.0.80-fix-smokekde.patch 
Log Message:
things are a bit borked:

- omit ruby, smoke (busted) => no -devel subpkg (for now)
- PyKDE4(-devel) subpkgs

but at least it's buildable now.




Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- kdebindings.spec	15 Jun 2008 20:10:21 -0000	1.108
+++ kdebindings.spec	16 Jun 2008 04:30:15 -0000	1.109
@@ -2,6 +2,13 @@
 # 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
 
+# define to enable these optional or broken bits
+#define php 1
+#define ruby 1
+#define smoke 1
+# no ruby or smoke => no devel pkg
+#define devel
+
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -19,10 +26,6 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream patch to fix smokekde build:
-# http://websvn.kde.org/?view=rev&revision=811755
-Patch101: kdebindings-4.0.80-fix-smokekde.patch
-
 BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
@@ -31,8 +34,7 @@
 # FIMXE:TODO: disabled for now
 #BuildRequires:  mono-core
 BuildRequires:  python-devel
-BuildRequires:  ruby-devel
-BuildRequires:  ruby
+BuildRequires:  ruby-devel ruby
 BuildRequires:  giflib-devel
 BuildRequires:  pcre-devel
 # causes smokeqt to fail to build
@@ -42,22 +44,35 @@
 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-devel = %{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
@@ -67,17 +82,18 @@
 
 %prep
 %setup -q
-#patch101 -p0 -b .fix-smokekde
-# get rid of this because it breaks the build without PHP
-# we don't want to build php-qt before we sorted out the dep explosion mess
-rm -rf php
 
-%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} \
+  -DBUILD_csharp=OFF \
+  %{!?php:-DBUILD_php=OFF} \
+  %{!?ruby:-DBUILD_ruby=OFF} -DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch} \
+  %{!?smoke:-DBUILD_smoke=OFF} \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -93,21 +109,22 @@
 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
+%if 0%{?smoke}
 %{_kde4_bindir}/*
 %{_kde4_libdir}/lib*.so.*
+%endif
 # unversioned library
+%{_kde4_libdir}/kde4/krosspython.so
+%if 0%{?ruby}
 %{_kde4_libdir}/libqtruby4shared.so
-%{_kde4_libdir}/kde4/*.so
 %{ruby_sitelib}/KDE/
 %{ruby_sitelib}/Qt.rb
 %{ruby_sitelib}/Qt/
@@ -116,28 +133,41 @@
 %{ruby_sitelib}/QScintilla.rb
 %{ruby_sitelib}/Qsci/
 %{ruby_sitearch}/*.so
-%{python_sitearch}/PyKDE4/
-%{_kde4_appsdir}/pykde4/
 %{_kde4_datadir}/applications/kde4/dbpedia_references.desktop
 %{_kde4_appsdir}/dbpedia_references/
-# These are currently not built:
-#%{_kde4_appsdir}/plasma-*/
-#%{_kde4_datadir}/kde4/services/plasma-*.desktop
+%endif
 
-%files devel
+%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/PyKDE4/
+%{_kde4_datadir}/sip/PyKDE4/
+
+%if 0%{?devel}
+%files devel
+%defattr(-,root,root,-)
+%if 0%{?smoke}
 %{_includedir}/smoke.h
-%{_includedir}/qtruby/
 %{_includedir}/smoke/
-%{_kde4_datadir}/sip/PyKDE4/
 %{_kde4_libdir}/lib*.so
+%endif
+%if 0%{?ruby}
+%{_includedir}/qtruby/
 %exclude %{_kde4_libdir}/libqtruby4shared.so
+%endif
+%endif
 
 
 %changelog
 * 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


--- kdebindings-4.0.80-fix-smokekde.patch DELETED ---