rpms/kdebindings/FC-6 kdebindings-3.5.6-libgcj.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 kdebindings.spec, 1.63, 1.64 sources, 1.35, 1.36 kdebindings-3.1-python2.4.patch, 1.1, NONE kdebindings-3.1-ssl-krb5.patch, 1.1, NONE kdebindings-3.3.0-python.patch, 1.1, NONE kdebindings-3.3.92-xdg.patch, 1.2, NONE

[fedora-cvs-commits redhat com]

Author: than

Update of /cvs/dist/rpms/kdebindings/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv303

Modified Files:
	.cvsignore kdebindings.spec sources 
Added Files:
	kdebindings-3.5.6-libgcj.patch 
Removed Files:
	kdebindings-3.1-python2.4.patch kdebindings-3.1-ssl-krb5.patch 
	kdebindings-3.3.0-python.patch kdebindings-3.3.92-xdg.patch 
Log Message:
3.5.8


kdebindings-3.5.6-libgcj.patch:
 acinclude.m4.in |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

--- NEW FILE kdebindings-3.5.6-libgcj.patch ---
--- kdebindings-3.5.6/admin/acinclude.m4.in.libgcj	2007-01-15 17:16:52.000000000 -0600
+++ kdebindings-3.5.6/admin/acinclude.m4.in	2007-03-19 12:08:45.000000000 -0500
@@ -5261,7 +5261,18 @@
   dnl Look for libjvm.so
   kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
   dnl Look for libgcj.so
-  kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+  if (`$PKG_CONFIG --exists libgcj-4.1`) ; then
+    JVMLIBS=`$PKG_CONFIG --libs libgcj-4.1`
+    kde_java_libgcjdir=`$PKG_CONFIG --variable=libdir libgcj-4.1`
+  elif (`$PKG_CONFIG --exists libgcj`) ; then
+    JVMLIBS=`$PKG_CONFIG --libs libgcj`
+    kde_java_libgcjdir=`$PKG_CONFIG --variable=libdir libgcj`
+  else
+    kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
+  fi
   dnl Look for libhpi.so and avoid green threads
   kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
 
@@ -5302,10 +5313,6 @@
      if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
         AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
      fi 
-  else
-     if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
-        AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.])
-     fi 
   fi
 
   if test ! -x "$kde_java_bindir/java"; then
@@ -5359,7 +5366,13 @@
     if test "x$kde_java_libgcjdir" = "x"; then 
       JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
     else
-      JVMLIBS="-L$kde_java_libgcjdir -lgcj"
+      if test "x$JVMLIBS" = "x"; then
+        if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
+          AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.])
+        else
+          JVMLIBS="-L$kde_java_libgcjdir -lgcj"
+        fi
+      fi
     fi
     AC_MSG_RESULT([java JDK in $kde_java_bindir])
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-6/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	16 Jun 2007 16:41:28 -0000	1.33
+++ .cvsignore	28 Nov 2007 15:49:40 -0000	1.34
@@ -13,3 +13,4 @@
 kdebindings-3.5.4.tar.bz2
 kdebindings-3.5.6.tar.bz2
 kdebindings-3.5.7.tar.bz2
+kdebindings-3.5.8.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-6/kdebindings.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdebindings.spec	16 Jun 2007 18:03:23 -0000	1.63
+++ kdebindings.spec	28 Nov 2007 15:49:40 -0000	1.64
@@ -1,16 +1,10 @@
 %define debug 0
 %define final 0
 
-%define appdir %{_datadir}/applications/kde
-
-%{expand: %%define pythonver %(python -c 'import sys;print(sys.version[0:3])')}
 %define qt_version 3.3.8
-%define arts_version 1.5.7
+%define arts_version 1.5.8
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
-%define perlver 5.8
-%define perlepoch 3
-%define rubyver 1.8
 
 %define arts 1
 %define perl 1
@@ -18,20 +12,17 @@
 %define ruby 1
 %define pyqt 0
 
-Version: 3.5.7
+Version: 3.5.8
 Release: 1%{?dist}
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
 URL: http://www.kde.org/
-License: GPL
+License: GPLv2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
-Patch4: kdebindings-3.1-ssl-krb5.patch
-Patch6: kdebindings-3.1-python2.4.patch
-Patch8: kdebindings-3.3.0-python.patch
-Patch9: kdebindings-3.3.92-xdg.patch
+Patch1: kdebindings-3.5.6-libgcj.patch
 
 BuildRequires: zlib-devel
 BuildRequires: kdelibs-devel
@@ -44,20 +35,23 @@
 BuildRequires: desktop-file-utils
 
 %if %{perl}
-BuildRequires: perl >= %{perlver}
-Requires: perl >= %{perlepoch}:%{perlver}
+BuildRequires: BuildRequires: perl(ExtUtils::MakeMaker)
+%define perl_ver        %{expand:%%(eval `perl -V:version`; echo $version)}
+%define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)}
+%define perl_vendorlib  %{expand:%%(eval `perl -V:installvendorlib`; echo $installvendorlib)}
+%define perl_man3dir    %{expand:%%(eval `perl -V:installman3dir`; echo $installman3dir)}
 %endif
 
 %if %{python}
-BuildRequires: python >= %{pythonver}
-BuildRequires: python-devel >= %{pythonver}
-Requires: python-abi = %{pythonver}
+BuildRequires: python-devel
+%define python_ver %{expand:%%(%{__python} -c "import sys ; print sys.version[:3]")}
+%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 %endif
 
 %if %{ruby}
-BuildRequires: ruby >= %{rubyver}
-BuildRequires: ruby-devel >= %{rubyver}
-Requires: ruby >= %{rubyver}
+BuildRequires: ruby-devel >= 1.8, ruby
+%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
+%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 %endif
 
 Requires(post): /sbin/ldconfig
@@ -80,40 +74,18 @@
 Install %{name}-devel if you want to develop non-KDE
 applications that talk to KDE.
 
-%package perl
-Summary: Perl bindings to DCOP
-Group: Development/Libraries
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires: perl >= %{perlver}
-
-%description perl
-Perl bindings to the DCOP interprocess communication protocol used by KDE
-
-%package python
-Summary: Python bindings to DCOP
-Group: Development/Libraries
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires: python-abi = %{pythonver}
-
-%description python
-Python bindings to the DCOP interprocess communication protocol used by KDE
-
 %prep
 %setup -q
-%patch4 -p1 -b .ssl-krb5
-%patch6 -p1 -b .python2
 
-# don't build sip/pyqt, we have separates packages
-%if %{pyqt} == 0
-%patch8 -p1 -b .python
-rm -rf python
-%endif
-%patch9 -p1 -b .xdg
+%patch1 -p1 -b .libgcj
+
+make -f admin/Makefile.common
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
 
-make -f admin/Makefile.common cvs
+# sip/PyQt/PyKDE built separately, not here
+export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
 
 suffix=""
 if [ "%{_lib}" == "lib64" ] ; then
@@ -140,21 +112,21 @@
 %endif
    --without-java
 
-make #%{?_smp_mflags}
+pushd dcopperl
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
+make OPTIMIZE="$RPM_OPT_FLAGS" ||:
+popd
+
+# smoke/ not smp-safe
+make -C smoke/
+make %{?_smp_mflags} PYTHON=%{__python}
+
 
 %install
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
-desktop-file-install \
-   --vendor "" \
-   --dir %{buildroot}%{appdir} \
-   --delete-original \
-   --add-only-show-in KDE \
-   %{buildroot}%{appdir}/kjscmd.desktop \
-   %{buildroot}%{appdir}/embedjs.desktop
-
 %clean
 rm -rf %{buildroot}
 
@@ -184,10 +156,12 @@
 %{_datadir}/servicetypes/*
 %{_bindir}/*
 %if %{ruby}
-%{_prefix}/lib*/ruby/site_ruby/%{rubyver}/*
+%{ruby_sitearch}/*
+%{ruby_sitelib}/K*
+%{ruby_sitelib}/Qt*
 %endif
 %if %{python}
-%{_libdir}/python*/*
+%{python_sitearch}/*
 %endif
 %{_libdir}/perl5
 
@@ -198,6 +172,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Nov 28 2007 Than Ngo <than redhat com> 3.5.8-1
+- 3.5.8
+
 * Sat Jun 16 2007 Than Ngo <than redhat com> - 3.5.7-1.fc6
 - 3.5.7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-6/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	16 Jun 2007 16:41:28 -0000	1.35
+++ sources	28 Nov 2007 15:49:40 -0000	1.36
@@ -1 +1 @@
-bc8a95f0cfd52ad0559a775cf045f230  kdebindings-3.5.7.tar.bz2
+4325d22ac70d3945609bd952c19e793b  kdebindings-3.5.8.tar.bz2


--- kdebindings-3.1-python2.4.patch DELETED ---


--- kdebindings-3.1-ssl-krb5.patch DELETED ---


--- kdebindings-3.3.0-python.patch DELETED ---


--- kdebindings-3.3.92-xdg.patch DELETED ---