Hello community,
here is the log from the commit of package kdebindings3
checked in at Tue Feb 19 02:28:43 CET 2008.
--------
--- KDE/kdebindings3/kdebindings3.changes 2007-11-27 18:12:37.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebindings3/kdebindings3.changes 2008-02-13 23:30:25.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Feb 13 23:30:14 CET 2008 - dmueller@suse.de
+
+- update to 3.5.9:
+ * bugfixes, patches upstreamed
+
+-------------------------------------------------------------------
kdebindings3-java.changes: same change
kdebindings3-javascript.changes: same change
Old:
----
kdebindings-3.5.8.tar.bz2
kdebindings-3.5-gcc-4.3.diff
New:
----
kdebindings-3.5.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebindings3-javascript.spec ++++++
--- /var/tmp/diff_new_pack.V11879/_old 2008-02-19 02:28:16.000000000 +0100
+++ /var/tmp/diff_new_pack.V11879/_new 2008-02-19 02:28:16.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package kdebindings3-javascript (Version 3.5.8)
+# spec file for package kdebindings3-javascript (Version 3.5.9)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: kdebindings3-javascript
%define is_base 0
%define is_java 0
@@ -21,15 +22,14 @@
License: LGPL v2.1 or later
Group: System/GUI/KDE
Summary: JavaScript Bindings and Interpreter for KDE
-Version: 3.5.8
-Release: 22
+Version: 3.5.9
+Release: 1
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Url: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdebindings-%{version}.tar.bz2
#Patch0: 3_5_BRANCH.diff
Patch2: perl.diff
-Patch3: kdebindings-3.5-gcc-4.3.diff
Patch4: fix-return-value-kjsembed.diff
#Patch5: FIXME.diff
Patch6: 64bit.diff
@@ -97,7 +97,6 @@
%setup -q -n kdebindings-%{version}
#%patch0
%patch2
-%patch3
%patch4
#%patch5
#%patch6
@@ -249,314 +248,317 @@
%endif
%changelog
-* Tue Nov 27 2007 - dmueller@suse.de
+* Thu Feb 14 2008 dmueller@suse.de
+- update to 3.5.9:
+ * bugfixes, patches upstreamed
+* Tue Nov 27 2007 dmueller@suse.de
- fix Qt detection with gcc 4.3
-* Tue Oct 09 2007 - stbinner@suse.de
+* Tue Oct 09 2007 stbinner@suse.de
- update to 3.5.8: update to Python bindings
-* Fri Aug 17 2007 - dmueller@suse.de
+* Fri Aug 17 2007 dmueller@suse.de
- rename kdebindings3-python to python-kde3 and build
from a separate source (#300041)
-* Tue Jun 19 2007 - stbinner@suse.de
+* Tue Jun 19 2007 stbinner@suse.de
- fix build of kdebindings3-java in KDE:KDE3
-* Fri May 25 2007 - dmueller@suse.de
+* Fri May 25 2007 dmueller@suse.de
- split off kdebindings3-javascript-devel package
-* Mon May 14 2007 - stbinner@suse.de
+* Tue May 15 2007 stbinner@suse.de
- update to 3.5.7:
* fix build with python 2.4
* enable building of QGL* Java bindings
* fix QtRuby bug with Qt::ListView
-* Mon Jan 29 2007 - dmueller@suse.de
+* Mon Jan 29 2007 dmueller@suse.de
- remove hpi check for ppc (#223658)
-* Thu Jan 25 2007 - stbinner@suse.de
+* Thu Jan 25 2007 stbinner@suse.de
- add 3_5_BRANCH.diff to fix build against Python 2.4 on old distros
-* Tue Jan 16 2007 - stbinner@suse.de
+* Tue Jan 16 2007 stbinner@suse.de
- update to 3.5.6 release:
* adaption to changed python 2.5 API
* several ruby binding fixes
-* Tue Dec 05 2006 - stbinner@suse.de
+* Tue Dec 05 2006 stbinner@suse.de
- fix build of kdebindings3-python for < 10.2
-* Wed Nov 08 2006 - stbinner@suse.de
+* Wed Nov 08 2006 stbinner@suse.de
- remove historic "Provides:" (#218798)
-* Thu Oct 12 2006 - dmueller@suse.de
+* Thu Oct 12 2006 dmueller@suse.de
- update 3_5_BRANCH.diff to include fixes for python 2.5
bindings
-* Tue Oct 03 2006 - stbinner@suse.de
+* Tue Oct 03 2006 stbinner@suse.de
- update to 3.5.5 release tarball
-* Fri Sep 29 2006 - dmueller@suse.de
+* Fri Sep 29 2006 dmueller@suse.de
- add patch to the right specfile
-* Thu Sep 28 2006 - dmueller@suse.de
+* Thu Sep 28 2006 dmueller@suse.de
- fix build of python and java bindings
-* Thu Aug 31 2006 - stbinner@suse.de
+* Thu Aug 31 2006 stbinner@suse.de
- build with qscintilla-devel also on old distros in build service
-* Wed Aug 23 2006 - stbinner@suse.de
+* Wed Aug 23 2006 stbinner@suse.de
- add 3_5_BRANCH.diff (ruby binding fixes)
-* Sun Jul 23 2006 - coolo@suse.de
+* Sun Jul 23 2006 coolo@suse.de
- update to KDE 3.5.4:
* several fixes to the qtruby bindings
-* Sun Jun 18 2006 - coolo@suse.de
+* Sun Jun 18 2006 coolo@suse.de
- fix build on older distributions
-* Wed May 24 2006 - stbinner@suse.de
+* Wed May 24 2006 stbinner@suse.de
- update to KDE 3.5.3
* several fixes to QtRuby and Korundum
-* Thu May 18 2006 - dmueller@suse.de
+* Thu May 18 2006 dmueller@suse.de
- update buildrequires
-* Mon May 15 2006 - stbinner@suse.de
+* Mon May 15 2006 stbinner@suse.de
- update to KDE 3.5.2 and 3_5_BRANCH.diff
* fixes to qtruby, kalyptus, korundum and qtjava bindings
-* Tue Apr 11 2006 - mrueckert@suse.de
+* Tue Apr 11 2006 mrueckert@suse.de
site_ruby should be empty for user installed libraries.
- added kdebindings-3.5.1_ruby_non_site_dir.patch:
* korundum/rubylib/korundum/configure.in.in: map the site_ruby
directories to their normal equivalents.
-* Sun Feb 05 2006 - mls@suse.de
+* Mon Feb 06 2006 mls@suse.de
- adapt pre_checkin.sh script
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Sun Jan 22 2006 - stbinner@suse.de
+* Sun Jan 22 2006 stbinner@suse.de
- update to 3.5.1
-* Mon Jan 09 2006 - stbinner@suse.de
+* Mon Jan 09 2006 stbinner@suse.de
- remove "Provides: PyQt" from kdebindings3-python
-* Sun Jan 08 2006 - stbinner@suse.de
+* Sun Jan 08 2006 stbinner@suse.de
- update to 3_5_BRANCH
-* Tue Jan 03 2006 - adrian@suse.de
+* Tue Jan 03 2006 adrian@suse.de
- Do only Require python-qt for kdebindings3-python and without
the release number
-* Mon Dec 19 2005 - stbinner@suse.de
+* Mon Dec 19 2005 stbinner@suse.de
- fix file list
-* Sun Nov 27 2005 - coolo@suse.de
+* Sun Nov 27 2005 coolo@suse.de
- fix syntax error
-* Thu Nov 24 2005 - coolo@suse.de
+* Thu Nov 24 2005 coolo@suse.de
- split out python-qt
-* Mon Nov 21 2005 - stbinner@suse.de
+* Mon Nov 21 2005 stbinner@suse.de
- update to 3.5 RC 2
-* Thu Nov 10 2005 - stbinner@suse.de
+* Thu Nov 10 2005 stbinner@suse.de
- update to 3.5 RC 1
-* Wed Oct 12 2005 - coolo@suse.de
+* Wed Oct 12 2005 coolo@suse.de
- update to 3.4.92
-* Wed Sep 28 2005 - stbinner@suse.de
+* Wed Sep 28 2005 stbinner@suse.de
- fixed "Provides:" after .spec split
-* Fri Sep 23 2005 - coolo@suse.de
+* Fri Sep 23 2005 coolo@suse.de
- update to 3.4.91
- resync spec files
-* Sat Sep 03 2005 - matz@suse.de
+* Sat Sep 03 2005 matz@suse.de
- Split generated files to speed up compile.
-* Mon Aug 29 2005 - adrian@suse.de
+* Mon Aug 29 2005 adrian@suse.de
- build packages in seperate spec files to speed up build
- cleanup patches and nfb
-* Mon Aug 22 2005 - mrueckert@suse.de
+* Mon Aug 22 2005 mrueckert@suse.de
- added ruby-devel to nfb
-* Tue Aug 09 2005 - mls@suse.de
+* Tue Aug 09 2005 mls@suse.de
- removed compat from neededforbuild
-* Sun Jul 24 2005 - coolo@suse.de
+* Sun Jul 24 2005 coolo@suse.de
- fix build (final 3.4.2)
-* Fri Jul 22 2005 - coolo@suse.de
+* Fri Jul 22 2005 coolo@suse.de
- update to version 3.4.2
-* Wed Jun 22 2005 - schwab@suse.de
+* Wed Jun 22 2005 schwab@suse.de
- Fix 64bit bug in java bindings.
-* Wed Jun 15 2005 - dmueller@suse.de
+* Wed Jun 15 2005 dmueller@suse.de
- sync with branches/KDE/3.4
-* Tue Jun 14 2005 - dmueller@suse.de
+* Tue Jun 14 2005 dmueller@suse.de
- sync with branches/KDE/3.4
-* Tue May 24 2005 - adrian@suse.de
+* Tue May 24 2005 adrian@suse.de
- update to version 3.4.1
-* Tue May 17 2005 - ro@suse.de
+* Tue May 17 2005 ro@suse.de
- fix build with gcc-4
-* Sat Mar 05 2005 - adrian@suse.de
+* Sat Mar 05 2005 adrian@suse.de
- update to final 3.4.0
-* Wed Mar 02 2005 - coolo@suse.de
+* Wed Mar 02 2005 coolo@suse.de
- fix build (and do it parallel)
-* Mon Feb 14 2005 - adrian@suse.de
+* Mon Feb 14 2005 adrian@suse.de
- update from CVS
-* Fri Feb 11 2005 - adrian@suse.de
+* Fri Feb 11 2005 adrian@suse.de
- update from CVS
-* Mon Feb 07 2005 - adrian@suse.de
+* Mon Feb 07 2005 adrian@suse.de
- update to beta 2
-* Fri Jan 21 2005 - adrian@suse.de
+* Fri Jan 21 2005 adrian@suse.de
- update to current snapshot (includes last fix)
-* Thu Jan 20 2005 - ro@suse.de
+* Fri Jan 21 2005 ro@suse.de
- fix dependency to /bin/env (should be /usr/bin/env)
-* Thu Jan 13 2005 - adrian@suse.de
+* Thu Jan 13 2005 adrian@suse.de
- fix installation of java binding documentation
-* Tue Jan 11 2005 - adrian@suse.de
+* Tue Jan 11 2005 adrian@suse.de
- fix some compiler warnings
-* Mon Jan 10 2005 - adrian@suse.de
+* Mon Jan 10 2005 adrian@suse.de
- update to version 3.4 beta 1
-* Thu Dec 16 2004 - coolo@suse.de
+* Thu Dec 16 2004 coolo@suse.de
- disable unsermake (most likely forever)
-* Mon Nov 29 2004 - adrian@suse.de
+* Mon Nov 29 2004 adrian@suse.de
- update to version 3.3.2
-* Fri Nov 26 2004 - ro@suse.de
+* Fri Nov 26 2004 ro@suse.de
- use only py_ver macro, py_site is broken in 9.0
-* Wed Nov 24 2004 - adrian@suse.de
+* Wed Nov 24 2004 adrian@suse.de
- fix build for python 2.4
- fix build for 8.2
-* Tue Nov 23 2004 - ro@suse.de
+* Tue Nov 23 2004 ro@suse.de
- fix build on 9.0
-* Tue Oct 12 2004 - adrian@suse.de
+* Tue Oct 12 2004 adrian@suse.de
- update to version 3.3.1
-* Tue Sep 21 2004 - adrian@suse.de
+* Tue Sep 21 2004 adrian@suse.de
- fix build
- remove unneeded packages from neededforbuild
- add qscintilla support for python bindings (#45715)
-* Mon Sep 20 2004 - adrian@suse.de
+* Mon Sep 20 2004 adrian@suse.de
- update to current BRANCH
* ruby fixes and enhancements
-* Wed Sep 08 2004 - adrian@suse.de
+* Wed Sep 08 2004 adrian@suse.de
- fix spec file syntax
-* Tue Sep 07 2004 - adrian@suse.de
+* Tue Sep 07 2004 adrian@suse.de
- fix build for ia64 and ia32
-* Mon Sep 06 2004 - adrian@suse.de
+* Mon Sep 06 2004 adrian@suse.de
- -java Requires "jre1.2.x" instead of "java2" now
-* Mon Sep 06 2004 - adrian@suse.de
+* Mon Sep 06 2004 adrian@suse.de
- update to version 3.3.0 final
* -python obsoletes sip/PyQt/PyKDE
* -c is in qtc now
* -Csharp is in qtsharp now
-* Tue Aug 10 2004 - adrian@suse.de
+* Tue Aug 10 2004 adrian@suse.de
- update to version 3.3.0 RC2
-* Wed Apr 14 2004 - adrian@suse.de
+* Wed Apr 14 2004 adrian@suse.de
- update to version 3.2.2
-* Tue Apr 06 2004 - adrian@suse.de
+* Tue Apr 06 2004 adrian@suse.de
- fix build
-* Mon Apr 05 2004 - adrian@suse.de
+* Mon Apr 05 2004 adrian@suse.de
- remove wrong Obsoletes
-* Mon Mar 01 2004 - coolo@suse.de
+* Mon Mar 01 2004 coolo@suse.de
- update to version 3.2.1
- disable-final to make it build on reasonable hardware
-* Sun Feb 15 2004 - adrian@suse.de
+* Sun Feb 15 2004 adrian@suse.de
- remove obsolete files from file list
- make kjscmd desktop entry unimportant
-* Sat Feb 14 2004 - adrian@suse.de
+* Sat Feb 14 2004 adrian@suse.de
- fix build for x86_64
-* Tue Jan 27 2004 - adrian@suse.de
+* Tue Jan 27 2004 adrian@suse.de
- update to KDE 3.2.0 final
-* Sat Jan 24 2004 - adrian@suse.de
+* Sat Jan 24 2004 adrian@suse.de
- add Qt# API docu
- fix kdebindings3-java Requires
- rename -sharp package to -Csharp
-* Thu Jan 22 2004 - uli@suse.de
+* Thu Jan 22 2004 uli@suse.de
- qtc: fixed segfault in ilrun when programs using Qt# call exit()
before destroying all Qt objects
-* Thu Jan 22 2004 - ro@suse.de
+* Thu Jan 22 2004 ro@suse.de
- fix typo in specfile
-* Tue Jan 20 2004 - adrian@suse.de
+* Tue Jan 20 2004 adrian@suse.de
- enable Qt# bindings for > 9.0
- add qtsharp 0.7 and use it instead of version 0.5 from the
kdebindings tar ball
-* Tue Jan 20 2004 - adrian@suse.de
+* Tue Jan 20 2004 adrian@suse.de
- fix build of java bindings
-* Sun Jan 18 2004 - adrian@suse.de
+* Sun Jan 18 2004 adrian@suse.de
- update to version 3.1.95 ( KDE 3.2 RC1 )
-* Mon Dec 22 2003 - adrian@suse.de
+* Mon Dec 22 2003 adrian@suse.de
- own sub package for javascript bindings
-* Mon Dec 01 2003 - adrian@suse.de
+* Mon Dec 01 2003 adrian@suse.de
- update to 3.1.94 ( KDE 3.2 beta 2 )
-* Thu Nov 13 2003 - adrian@suse.de
+* Fri Nov 14 2003 adrian@suse.de
- update to new snapshot from 2003102409
-* Tue Oct 21 2003 - adrian@suse.de
+* Tue Oct 21 2003 adrian@suse.de
- update to snapshot 2003102008
-* Tue Sep 09 2003 - adrian@suse.de
+* Tue Sep 09 2003 adrian@suse.de
- update to version 3.1.4
-* Tue Aug 19 2003 - ro@suse.de
+* Tue Aug 19 2003 ro@suse.de
- try to fix build on x86_64
-* Fri Jul 25 2003 - adrian@suse.de
+* Fri Jul 25 2003 adrian@suse.de
- update to 3.1.3
* disable perl/smoke bindings for now
-* Fri May 16 2003 - adrian@suse.de
+* Fri May 16 2003 adrian@suse.de
- update to 3.1.2
* kmozilla got disabled
- fix build
-* Tue Feb 11 2003 - adrian@suse.de
+* Tue Feb 11 2003 adrian@suse.de
- fix build for lib64
-* Sun Jan 19 2003 - adrian@suse.de
+* Sun Jan 19 2003 adrian@suse.de
- update to RC7-try2
-* Tue Jan 07 2003 - adrian@suse.de
+* Tue Jan 07 2003 adrian@suse.de
- update to RC6
-* Tue Dec 03 2002 - ro@suse.de
+* Tue Dec 03 2002 ro@suse.de
- put smoke stuff in perl subpackage
-* Sat Nov 30 2002 - adrian@suse.de
+* Sun Dec 01 2002 adrian@suse.de
- using RC5 tar ball, third try
-* Mon Nov 25 2002 - adrian@suse.de
+* Mon Nov 25 2002 adrian@suse.de
- update to RC5
-* Wed Nov 20 2002 - adrian@suse.de
+* Wed Nov 20 2002 adrian@suse.de
- update to version 3.1-RC4
-* Tue Oct 08 2002 - adrian@suse.de
+* Tue Oct 08 2002 adrian@suse.de
- update to version 3.0.4
-* Tue Aug 13 2002 - uli@suse.de
+* Tue Aug 13 2002 uli@suse.de
- no %%package java -> no %%post java
-* Sun Aug 11 2002 - coolo@suse.de
+* Sun Aug 11 2002 coolo@suse.de
- make automake happy
-* Thu Aug 08 2002 - adrian@suse.de
+* Thu Aug 08 2002 adrian@suse.de
- update to version 3.0.3
- add %%run_ldconfig
-* Sun Aug 04 2002 - adrian@suse.de
+* Sun Aug 04 2002 adrian@suse.de
- fix %%if order in file list
-* Fri Aug 02 2002 - adrian@suse.de
+* Fri Aug 02 2002 adrian@suse.de
- disable java for ppc64 x86_64 s390 s390x
-* Tue Jul 16 2002 - adrian@suse.de
+* Tue Jul 16 2002 adrian@suse.de
- split packages into subpackages only: -c, -java and -mozilla
-* Tue Jun 25 2002 - adrian@suse.de
+* Tue Jun 25 2002 adrian@suse.de
- update to version 3.0.2
-* Thu Jun 06 2002 - ro@suse.de
+* Thu Jun 06 2002 ro@suse.de
- fix for moved mozilla libs
-* Mon May 13 2002 - coolo@suse.de
+* Mon May 13 2002 coolo@suse.de
- update to 3.0.1
- fixing file list
- using %%_lib
-* Thu May 09 2002 - coolo@suse.de
+* Thu May 09 2002 coolo@suse.de
- updating to KDE 3.0.1 branch to get the fixes for
lib64 and qt 3.0.4
-* Mon Apr 15 2002 - coolo@suse.de
+* Mon Apr 15 2002 coolo@suse.de
- gobjc is gcc-objc now
-* Mon Mar 25 2002 - adrian@suse.de
+* Mon Mar 25 2002 adrian@suse.de
- update to 3.0 final :)
-* Thu Mar 21 2002 - adrian@suse.de
+* Thu Mar 21 2002 adrian@suse.de
- update to 3.0rc3
-* Sun Mar 10 2002 - adrian@suse.de
+* Sun Mar 10 2002 adrian@suse.de
- update to 3.0rc2
- fix build for mozilla
- still not building: kdejava, python, kec and objective C support
-* Mon Mar 04 2002 - adrian@suse.de
+* Mon Mar 04 2002 adrian@suse.de
- update to snapshot 2.92.2002030321
- disable kde java bindings for now
-* Tue Dec 18 2001 - adrian@suse.de
+* Tue Dec 18 2001 adrian@suse.de
- update to version 2.91 (3.0 beta1)
-* Thu Nov 15 2001 - adrian@suse.de
+* Fri Nov 16 2001 adrian@suse.de
- update to version 2.2.2
-* Thu Sep 13 2001 - adrian@suse.de
+* Thu Sep 13 2001 adrian@suse.de
- fix version number of kdebindings-mozilla package
-* Sat Sep 08 2001 - adrian@suse.de
+* Sat Sep 08 2001 adrian@suse.de
- update to 2.2.1 final
-* Mon Aug 13 2001 - ro@suse.de
+* Mon Aug 13 2001 ro@suse.de
- changed neededforbuild to <sp-devel>
-* Mon Aug 06 2001 - adrian@suse.de
+* Mon Aug 06 2001 adrian@suse.de
- update to 2.2 final
-* Fri Jun 29 2001 - adrian@suse.de
+* Fri Jun 29 2001 adrian@suse.de
- update 2.2beta1
-* Sun Apr 08 2001 - adrian@suse.de
+* Sun Apr 08 2001 adrian@suse.de
- drop -O0 for ppc and alpha
-* Fri Mar 30 2001 - ro@suse.de
+* Fri Mar 30 2001 ro@suse.de
- neededforbuild fix
-* Tue Mar 27 2001 - ro@suse.de
+* Tue Mar 27 2001 ro@suse.de
- changed neededforbuild <docbkdsl> to <docbook-dsssl-stylesheets>
-* Wed Mar 21 2001 - adrian@suse.de
+* Wed Mar 21 2001 adrian@suse.de
- fix mozilla build
-* Tue Mar 20 2001 - adrian@suse.de
+* Tue Mar 20 2001 adrian@suse.de
- update to 2.1.1
fix file list
-* Sun Mar 18 2001 - ro@suse.de
+* Mon Mar 19 2001 ro@suse.de
- fixed neededforbuild
-* Tue Mar 13 2001 - ro@suse.de
+* Tue Mar 13 2001 ro@suse.de
- removed second occurence of docbk30 from neededforbuild
-* Tue Mar 13 2001 - ro@suse.de
+* Tue Mar 13 2001 ro@suse.de
- changed neededforbuild <docbk30> to
-* Mon Mar 12 2001 - schwab@suse.de
+* Mon Mar 12 2001 schwab@suse.de
- No java on ia64.
- Fix shell syntax in configure script.
- Fix missing include.
-* Thu Feb 22 2001 - adrian@suse.de
+* Thu Feb 22 2001 adrian@suse.de
- update to final 2.1.0
mozilla support is inside an own subpackage
-* Sat Feb 17 2001 - adrian@suse.de
+* Sat Feb 17 2001 adrian@suse.de
- newer snapshot from KDE_2_0_BRANCH
initial package
++++++ kdebindings3-java.spec ++++++
--- /var/tmp/diff_new_pack.V11879/_old 2008-02-19 02:28:16.000000000 +0100
+++ /var/tmp/diff_new_pack.V11879/_new 2008-02-19 02:28:16.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package kdebindings3-java (Version 3.5.8)
+# spec file for package kdebindings3-java (Version 3.5.9)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: kdebindings3-java
%define is_base 0
%define is_java 1
@@ -21,15 +22,14 @@
License: LGPL v2.1 or later
Group: Development/Libraries/Java
Summary: Java Bindings for KDE
-Version: 3.5.8
-Release: 22
+Version: 3.5.9
+Release: 1
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Url: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdebindings-%{version}.tar.bz2
#Patch0: 3_5_BRANCH.diff
Patch2: perl.diff
-Patch3: kdebindings-3.5-gcc-4.3.diff
Patch4: fix-return-value-kjsembed.diff
#Patch5: FIXME.diff
Patch6: 64bit.diff
@@ -80,7 +80,6 @@
%setup -q -n kdebindings-%{version}
#%patch0
%patch2
-%patch3
%patch4
#%patch5
#%patch6
@@ -232,314 +231,317 @@
%endif
%changelog
-* Tue Nov 27 2007 - dmueller@suse.de
+* Thu Feb 14 2008 dmueller@suse.de
+- update to 3.5.9:
+ * bugfixes, patches upstreamed
+* Tue Nov 27 2007 dmueller@suse.de
- fix Qt detection with gcc 4.3
-* Tue Oct 09 2007 - stbinner@suse.de
+* Tue Oct 09 2007 stbinner@suse.de
- update to 3.5.8: update to Python bindings
-* Fri Aug 17 2007 - dmueller@suse.de
+* Fri Aug 17 2007 dmueller@suse.de
- rename kdebindings3-python to python-kde3 and build
from a separate source (#300041)
-* Tue Jun 19 2007 - stbinner@suse.de
+* Tue Jun 19 2007 stbinner@suse.de
- fix build of kdebindings3-java in KDE:KDE3
-* Fri May 25 2007 - dmueller@suse.de
+* Fri May 25 2007 dmueller@suse.de
- split off kdebindings3-javascript-devel package
-* Mon May 14 2007 - stbinner@suse.de
+* Tue May 15 2007 stbinner@suse.de
- update to 3.5.7:
* fix build with python 2.4
* enable building of QGL* Java bindings
* fix QtRuby bug with Qt::ListView
-* Mon Jan 29 2007 - dmueller@suse.de
+* Mon Jan 29 2007 dmueller@suse.de
- remove hpi check for ppc (#223658)
-* Thu Jan 25 2007 - stbinner@suse.de
+* Thu Jan 25 2007 stbinner@suse.de
- add 3_5_BRANCH.diff to fix build against Python 2.4 on old distros
-* Tue Jan 16 2007 - stbinner@suse.de
+* Tue Jan 16 2007 stbinner@suse.de
- update to 3.5.6 release:
* adaption to changed python 2.5 API
* several ruby binding fixes
-* Tue Dec 05 2006 - stbinner@suse.de
+* Tue Dec 05 2006 stbinner@suse.de
- fix build of kdebindings3-python for < 10.2
-* Wed Nov 08 2006 - stbinner@suse.de
+* Wed Nov 08 2006 stbinner@suse.de
- remove historic "Provides:" (#218798)
-* Thu Oct 12 2006 - dmueller@suse.de
+* Thu Oct 12 2006 dmueller@suse.de
- update 3_5_BRANCH.diff to include fixes for python 2.5
bindings
-* Tue Oct 03 2006 - stbinner@suse.de
+* Tue Oct 03 2006 stbinner@suse.de
- update to 3.5.5 release tarball
-* Fri Sep 29 2006 - dmueller@suse.de
+* Fri Sep 29 2006 dmueller@suse.de
- add patch to the right specfile
-* Thu Sep 28 2006 - dmueller@suse.de
+* Thu Sep 28 2006 dmueller@suse.de
- fix build of python and java bindings
-* Thu Aug 31 2006 - stbinner@suse.de
+* Thu Aug 31 2006 stbinner@suse.de
- build with qscintilla-devel also on old distros in build service
-* Wed Aug 23 2006 - stbinner@suse.de
+* Wed Aug 23 2006 stbinner@suse.de
- add 3_5_BRANCH.diff (ruby binding fixes)
-* Sun Jul 23 2006 - coolo@suse.de
+* Sun Jul 23 2006 coolo@suse.de
- update to KDE 3.5.4:
* several fixes to the qtruby bindings
-* Sun Jun 18 2006 - coolo@suse.de
+* Sun Jun 18 2006 coolo@suse.de
- fix build on older distributions
-* Wed May 24 2006 - stbinner@suse.de
+* Wed May 24 2006 stbinner@suse.de
- update to KDE 3.5.3
* several fixes to QtRuby and Korundum
-* Thu May 18 2006 - dmueller@suse.de
+* Thu May 18 2006 dmueller@suse.de
- update buildrequires
-* Mon May 15 2006 - stbinner@suse.de
+* Mon May 15 2006 stbinner@suse.de
- update to KDE 3.5.2 and 3_5_BRANCH.diff
* fixes to qtruby, kalyptus, korundum and qtjava bindings
-* Tue Apr 11 2006 - mrueckert@suse.de
+* Tue Apr 11 2006 mrueckert@suse.de
site_ruby should be empty for user installed libraries.
- added kdebindings-3.5.1_ruby_non_site_dir.patch:
* korundum/rubylib/korundum/configure.in.in: map the site_ruby
directories to their normal equivalents.
-* Sun Feb 05 2006 - mls@suse.de
+* Mon Feb 06 2006 mls@suse.de
- adapt pre_checkin.sh script
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Sun Jan 22 2006 - stbinner@suse.de
+* Sun Jan 22 2006 stbinner@suse.de
- update to 3.5.1
-* Mon Jan 09 2006 - stbinner@suse.de
+* Mon Jan 09 2006 stbinner@suse.de
- remove "Provides: PyQt" from kdebindings3-python
-* Sun Jan 08 2006 - stbinner@suse.de
+* Sun Jan 08 2006 stbinner@suse.de
- update to 3_5_BRANCH
-* Tue Jan 03 2006 - adrian@suse.de
+* Tue Jan 03 2006 adrian@suse.de
- Do only Require python-qt for kdebindings3-python and without
the release number
-* Mon Dec 19 2005 - stbinner@suse.de
+* Mon Dec 19 2005 stbinner@suse.de
- fix file list
-* Sun Nov 27 2005 - coolo@suse.de
+* Sun Nov 27 2005 coolo@suse.de
- fix syntax error
-* Thu Nov 24 2005 - coolo@suse.de
+* Thu Nov 24 2005 coolo@suse.de
- split out python-qt
-* Mon Nov 21 2005 - stbinner@suse.de
+* Mon Nov 21 2005 stbinner@suse.de
- update to 3.5 RC 2
-* Thu Nov 10 2005 - stbinner@suse.de
+* Thu Nov 10 2005 stbinner@suse.de
- update to 3.5 RC 1
-* Wed Oct 12 2005 - coolo@suse.de
+* Wed Oct 12 2005 coolo@suse.de
- update to 3.4.92
-* Wed Sep 28 2005 - stbinner@suse.de
+* Wed Sep 28 2005 stbinner@suse.de
- fixed "Provides:" after .spec split
-* Fri Sep 23 2005 - coolo@suse.de
+* Fri Sep 23 2005 coolo@suse.de
- update to 3.4.91
- resync spec files
-* Sat Sep 03 2005 - matz@suse.de
+* Sat Sep 03 2005 matz@suse.de
- Split generated files to speed up compile.
-* Mon Aug 29 2005 - adrian@suse.de
+* Mon Aug 29 2005 adrian@suse.de
- build packages in seperate spec files to speed up build
- cleanup patches and nfb
-* Mon Aug 22 2005 - mrueckert@suse.de
+* Mon Aug 22 2005 mrueckert@suse.de
- added ruby-devel to nfb
-* Tue Aug 09 2005 - mls@suse.de
+* Tue Aug 09 2005 mls@suse.de
- removed compat from neededforbuild
-* Sun Jul 24 2005 - coolo@suse.de
+* Sun Jul 24 2005 coolo@suse.de
- fix build (final 3.4.2)
-* Fri Jul 22 2005 - coolo@suse.de
+* Fri Jul 22 2005 coolo@suse.de
- update to version 3.4.2
-* Wed Jun 22 2005 - schwab@suse.de
+* Wed Jun 22 2005 schwab@suse.de
- Fix 64bit bug in java bindings.
-* Wed Jun 15 2005 - dmueller@suse.de
+* Wed Jun 15 2005 dmueller@suse.de
- sync with branches/KDE/3.4
-* Tue Jun 14 2005 - dmueller@suse.de
+* Tue Jun 14 2005 dmueller@suse.de
- sync with branches/KDE/3.4
-* Tue May 24 2005 - adrian@suse.de
+* Tue May 24 2005 adrian@suse.de
- update to version 3.4.1
-* Tue May 17 2005 - ro@suse.de
+* Tue May 17 2005 ro@suse.de
- fix build with gcc-4
-* Sat Mar 05 2005 - adrian@suse.de
+* Sat Mar 05 2005 adrian@suse.de
- update to final 3.4.0
-* Wed Mar 02 2005 - coolo@suse.de
+* Wed Mar 02 2005 coolo@suse.de
- fix build (and do it parallel)
-* Mon Feb 14 2005 - adrian@suse.de
+* Mon Feb 14 2005 adrian@suse.de
- update from CVS
-* Fri Feb 11 2005 - adrian@suse.de
+* Fri Feb 11 2005 adrian@suse.de
- update from CVS
-* Mon Feb 07 2005 - adrian@suse.de
+* Mon Feb 07 2005 adrian@suse.de
- update to beta 2
-* Fri Jan 21 2005 - adrian@suse.de
+* Fri Jan 21 2005 adrian@suse.de
- update to current snapshot (includes last fix)
-* Thu Jan 20 2005 - ro@suse.de
+* Fri Jan 21 2005 ro@suse.de
- fix dependency to /bin/env (should be /usr/bin/env)
-* Thu Jan 13 2005 - adrian@suse.de
+* Thu Jan 13 2005 adrian@suse.de
- fix installation of java binding documentation
-* Tue Jan 11 2005 - adrian@suse.de
+* Tue Jan 11 2005 adrian@suse.de
- fix some compiler warnings
-* Mon Jan 10 2005 - adrian@suse.de
+* Mon Jan 10 2005 adrian@suse.de
- update to version 3.4 beta 1
-* Thu Dec 16 2004 - coolo@suse.de
+* Thu Dec 16 2004 coolo@suse.de
- disable unsermake (most likely forever)
-* Mon Nov 29 2004 - adrian@suse.de
+* Mon Nov 29 2004 adrian@suse.de
- update to version 3.3.2
-* Fri Nov 26 2004 - ro@suse.de
+* Fri Nov 26 2004 ro@suse.de
- use only py_ver macro, py_site is broken in 9.0
-* Wed Nov 24 2004 - adrian@suse.de
+* Wed Nov 24 2004 adrian@suse.de
- fix build for python 2.4
- fix build for 8.2
-* Tue Nov 23 2004 - ro@suse.de
+* Tue Nov 23 2004 ro@suse.de
- fix build on 9.0
-* Tue Oct 12 2004 - adrian@suse.de
+* Tue Oct 12 2004 adrian@suse.de
- update to version 3.3.1
-* Tue Sep 21 2004 - adrian@suse.de
+* Tue Sep 21 2004 adrian@suse.de
- fix build
- remove unneeded packages from neededforbuild
- add qscintilla support for python bindings (#45715)
-* Mon Sep 20 2004 - adrian@suse.de
+* Mon Sep 20 2004 adrian@suse.de
- update to current BRANCH
* ruby fixes and enhancements
-* Wed Sep 08 2004 - adrian@suse.de
+* Wed Sep 08 2004 adrian@suse.de
- fix spec file syntax
-* Tue Sep 07 2004 - adrian@suse.de
+* Tue Sep 07 2004 adrian@suse.de
- fix build for ia64 and ia32
-* Mon Sep 06 2004 - adrian@suse.de
+* Mon Sep 06 2004 adrian@suse.de
- -java Requires "jre1.2.x" instead of "java2" now
-* Mon Sep 06 2004 - adrian@suse.de
+* Mon Sep 06 2004 adrian@suse.de
- update to version 3.3.0 final
* -python obsoletes sip/PyQt/PyKDE
* -c is in qtc now
* -Csharp is in qtsharp now
-* Tue Aug 10 2004 - adrian@suse.de
+* Tue Aug 10 2004 adrian@suse.de
- update to version 3.3.0 RC2
-* Wed Apr 14 2004 - adrian@suse.de
+* Wed Apr 14 2004 adrian@suse.de
- update to version 3.2.2
-* Tue Apr 06 2004 - adrian@suse.de
+* Tue Apr 06 2004 adrian@suse.de
- fix build
-* Mon Apr 05 2004 - adrian@suse.de
+* Mon Apr 05 2004 adrian@suse.de
- remove wrong Obsoletes
-* Mon Mar 01 2004 - coolo@suse.de
+* Mon Mar 01 2004 coolo@suse.de
- update to version 3.2.1
- disable-final to make it build on reasonable hardware
-* Sun Feb 15 2004 - adrian@suse.de
+* Sun Feb 15 2004 adrian@suse.de
- remove obsolete files from file list
- make kjscmd desktop entry unimportant
-* Sat Feb 14 2004 - adrian@suse.de
+* Sat Feb 14 2004 adrian@suse.de
- fix build for x86_64
-* Tue Jan 27 2004 - adrian@suse.de
+* Tue Jan 27 2004 adrian@suse.de
- update to KDE 3.2.0 final
-* Sat Jan 24 2004 - adrian@suse.de
+* Sat Jan 24 2004 adrian@suse.de
- add Qt# API docu
- fix kdebindings3-java Requires
- rename -sharp package to -Csharp
-* Thu Jan 22 2004 - uli@suse.de
+* Thu Jan 22 2004 uli@suse.de
- qtc: fixed segfault in ilrun when programs using Qt# call exit()
before destroying all Qt objects
-* Thu Jan 22 2004 - ro@suse.de
+* Thu Jan 22 2004 ro@suse.de
- fix typo in specfile
-* Tue Jan 20 2004 - adrian@suse.de
+* Tue Jan 20 2004 adrian@suse.de
- enable Qt# bindings for > 9.0
- add qtsharp 0.7 and use it instead of version 0.5 from the
kdebindings tar ball
-* Tue Jan 20 2004 - adrian@suse.de
+* Tue Jan 20 2004 adrian@suse.de
- fix build of java bindings
-* Sun Jan 18 2004 - adrian@suse.de
+* Sun Jan 18 2004 adrian@suse.de
- update to version 3.1.95 ( KDE 3.2 RC1 )
-* Mon Dec 22 2003 - adrian@suse.de
+* Mon Dec 22 2003 adrian@suse.de
- own sub package for javascript bindings
-* Mon Dec 01 2003 - adrian@suse.de
+* Mon Dec 01 2003 adrian@suse.de
- update to 3.1.94 ( KDE 3.2 beta 2 )
-* Thu Nov 13 2003 - adrian@suse.de
+* Fri Nov 14 2003 adrian@suse.de
- update to new snapshot from 2003102409
-* Tue Oct 21 2003 - adrian@suse.de
+* Tue Oct 21 2003 adrian@suse.de
- update to snapshot 2003102008
-* Tue Sep 09 2003 - adrian@suse.de
+* Tue Sep 09 2003 adrian@suse.de
- update to version 3.1.4
-* Tue Aug 19 2003 - ro@suse.de
+* Tue Aug 19 2003 ro@suse.de
- try to fix build on x86_64
-* Fri Jul 25 2003 - adrian@suse.de
+* Fri Jul 25 2003 adrian@suse.de
- update to 3.1.3
* disable perl/smoke bindings for now
-* Fri May 16 2003 - adrian@suse.de
+* Fri May 16 2003 adrian@suse.de
- update to 3.1.2
* kmozilla got disabled
- fix build
-* Tue Feb 11 2003 - adrian@suse.de
+* Tue Feb 11 2003 adrian@suse.de
- fix build for lib64
-* Sun Jan 19 2003 - adrian@suse.de
+* Sun Jan 19 2003 adrian@suse.de
- update to RC7-try2
-* Tue Jan 07 2003 - adrian@suse.de
+* Tue Jan 07 2003 adrian@suse.de
- update to RC6
-* Tue Dec 03 2002 - ro@suse.de
+* Tue Dec 03 2002 ro@suse.de
- put smoke stuff in perl subpackage
-* Sat Nov 30 2002 - adrian@suse.de
+* Sun Dec 01 2002 adrian@suse.de
- using RC5 tar ball, third try
-* Mon Nov 25 2002 - adrian@suse.de
+* Mon Nov 25 2002 adrian@suse.de
- update to RC5
-* Wed Nov 20 2002 - adrian@suse.de
+* Wed Nov 20 2002 adrian@suse.de
- update to version 3.1-RC4
-* Tue Oct 08 2002 - adrian@suse.de
+* Tue Oct 08 2002 adrian@suse.de
- update to version 3.0.4
-* Tue Aug 13 2002 - uli@suse.de
+* Tue Aug 13 2002 uli@suse.de
- no %%package java -> no %%post java
-* Sun Aug 11 2002 - coolo@suse.de
+* Sun Aug 11 2002 coolo@suse.de
- make automake happy
-* Thu Aug 08 2002 - adrian@suse.de
+* Thu Aug 08 2002 adrian@suse.de
- update to version 3.0.3
- add %%run_ldconfig
-* Sun Aug 04 2002 - adrian@suse.de
+* Sun Aug 04 2002 adrian@suse.de
- fix %%if order in file list
-* Fri Aug 02 2002 - adrian@suse.de
+* Fri Aug 02 2002 adrian@suse.de
- disable java for ppc64 x86_64 s390 s390x
-* Tue Jul 16 2002 - adrian@suse.de
+* Tue Jul 16 2002 adrian@suse.de
- split packages into subpackages only: -c, -java and -mozilla
-* Tue Jun 25 2002 - adrian@suse.de
+* Tue Jun 25 2002 adrian@suse.de
- update to version 3.0.2
-* Thu Jun 06 2002 - ro@suse.de
+* Thu Jun 06 2002 ro@suse.de
- fix for moved mozilla libs
-* Mon May 13 2002 - coolo@suse.de
+* Mon May 13 2002 coolo@suse.de
- update to 3.0.1
- fixing file list
- using %%_lib
-* Thu May 09 2002 - coolo@suse.de
+* Thu May 09 2002 coolo@suse.de
- updating to KDE 3.0.1 branch to get the fixes for
lib64 and qt 3.0.4
-* Mon Apr 15 2002 - coolo@suse.de
+* Mon Apr 15 2002 coolo@suse.de
- gobjc is gcc-objc now
-* Mon Mar 25 2002 - adrian@suse.de
+* Mon Mar 25 2002 adrian@suse.de
- update to 3.0 final :)
-* Thu Mar 21 2002 - adrian@suse.de
+* Thu Mar 21 2002 adrian@suse.de
- update to 3.0rc3
-* Sun Mar 10 2002 - adrian@suse.de
+* Sun Mar 10 2002 adrian@suse.de
- update to 3.0rc2
- fix build for mozilla
- still not building: kdejava, python, kec and objective C support
-* Mon Mar 04 2002 - adrian@suse.de
+* Mon Mar 04 2002 adrian@suse.de
- update to snapshot 2.92.2002030321
- disable kde java bindings for now
-* Tue Dec 18 2001 - adrian@suse.de
+* Tue Dec 18 2001 adrian@suse.de
- update to version 2.91 (3.0 beta1)
-* Thu Nov 15 2001 - adrian@suse.de
+* Fri Nov 16 2001 adrian@suse.de
- update to version 2.2.2
-* Thu Sep 13 2001 - adrian@suse.de
+* Thu Sep 13 2001 adrian@suse.de
- fix version number of kdebindings-mozilla package
-* Sat Sep 08 2001 - adrian@suse.de
+* Sat Sep 08 2001 adrian@suse.de
- update to 2.2.1 final
-* Mon Aug 13 2001 - ro@suse.de
+* Mon Aug 13 2001 ro@suse.de
- changed neededforbuild to <sp-devel>
-* Mon Aug 06 2001 - adrian@suse.de
+* Mon Aug 06 2001 adrian@suse.de
- update to 2.2 final
-* Fri Jun 29 2001 - adrian@suse.de
+* Fri Jun 29 2001 adrian@suse.de
- update 2.2beta1
-* Sun Apr 08 2001 - adrian@suse.de
+* Sun Apr 08 2001 adrian@suse.de
- drop -O0 for ppc and alpha
-* Fri Mar 30 2001 - ro@suse.de
+* Fri Mar 30 2001 ro@suse.de
- neededforbuild fix
-* Tue Mar 27 2001 - ro@suse.de
+* Tue Mar 27 2001 ro@suse.de
- changed neededforbuild <docbkdsl> to <docbook-dsssl-stylesheets>
-* Wed Mar 21 2001 - adrian@suse.de
+* Wed Mar 21 2001 adrian@suse.de
- fix mozilla build
-* Tue Mar 20 2001 - adrian@suse.de
+* Tue Mar 20 2001 adrian@suse.de
- update to 2.1.1
fix file list
-* Sun Mar 18 2001 - ro@suse.de
+* Mon Mar 19 2001 ro@suse.de
- fixed neededforbuild
-* Tue Mar 13 2001 - ro@suse.de
+* Tue Mar 13 2001 ro@suse.de
- removed second occurence of docbk30 from neededforbuild
-* Tue Mar 13 2001 - ro@suse.de
+* Tue Mar 13 2001 ro@suse.de
- changed neededforbuild <docbk30> to
-* Mon Mar 12 2001 - schwab@suse.de
+* Mon Mar 12 2001 schwab@suse.de
- No java on ia64.
- Fix shell syntax in configure script.
- Fix missing include.
-* Thu Feb 22 2001 - adrian@suse.de
+* Thu Feb 22 2001 adrian@suse.de
- update to final 2.1.0
mozilla support is inside an own subpackage
-* Sat Feb 17 2001 - adrian@suse.de
+* Sat Feb 17 2001 adrian@suse.de
- newer snapshot from KDE_2_0_BRANCH
initial package
++++++ kdebindings3.spec ++++++
--- /var/tmp/diff_new_pack.V11879/_old 2008-02-19 02:28:16.000000000 +0100
+++ /var/tmp/diff_new_pack.V11879/_new 2008-02-19 02:28:16.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package kdebindings3 (Version 3.5.8)
+# spec file for package kdebindings3 (Version 3.5.9)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: kdebindings3
%define is_base 1
%define is_java 0
@@ -21,15 +22,14 @@
License: LGPL v2.1 or later
Group: System/GUI/KDE
Summary: Bindings for Qt and KDE Libraries
-Version: 3.5.8
-Release: 18
+Version: 3.5.9
+Release: 1
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Url: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdebindings-%{version}.tar.bz2
#Patch0: 3_5_BRANCH.diff
Patch2: perl.diff
-Patch3: kdebindings-3.5-gcc-4.3.diff
Patch4: fix-return-value-kjsembed.diff
#Patch5: FIXME.diff
Patch6: 64bit.diff
@@ -95,7 +95,6 @@
%setup -q -n kdebindings-%{version}
#%patch0
%patch2
-%patch3
%patch4
#%patch5
#%patch6
@@ -247,314 +246,317 @@
%endif
%changelog
-* Tue Nov 27 2007 - dmueller@suse.de
+* Thu Feb 14 2008 dmueller@suse.de
+- update to 3.5.9:
+ * bugfixes, patches upstreamed
+* Tue Nov 27 2007 dmueller@suse.de
- fix Qt detection with gcc 4.3
-* Tue Oct 09 2007 - stbinner@suse.de
+* Tue Oct 09 2007 stbinner@suse.de
- update to 3.5.8: update to Python bindings
-* Fri Aug 17 2007 - dmueller@suse.de
+* Fri Aug 17 2007 dmueller@suse.de
- rename kdebindings3-python to python-kde3 and build
from a separate source (#300041)
-* Tue Jun 19 2007 - stbinner@suse.de
+* Tue Jun 19 2007 stbinner@suse.de
- fix build of kdebindings3-java in KDE:KDE3
-* Fri May 25 2007 - dmueller@suse.de
+* Fri May 25 2007 dmueller@suse.de
- split off kdebindings3-javascript-devel package
-* Mon May 14 2007 - stbinner@suse.de
+* Tue May 15 2007 stbinner@suse.de
- update to 3.5.7:
* fix build with python 2.4
* enable building of QGL* Java bindings
* fix QtRuby bug with Qt::ListView
-* Mon Jan 29 2007 - dmueller@suse.de
+* Mon Jan 29 2007 dmueller@suse.de
- remove hpi check for ppc (#223658)
-* Thu Jan 25 2007 - stbinner@suse.de
+* Thu Jan 25 2007 stbinner@suse.de
- add 3_5_BRANCH.diff to fix build against Python 2.4 on old distros
-* Tue Jan 16 2007 - stbinner@suse.de
+* Tue Jan 16 2007 stbinner@suse.de
- update to 3.5.6 release:
* adaption to changed python 2.5 API
* several ruby binding fixes
-* Tue Dec 05 2006 - stbinner@suse.de
+* Tue Dec 05 2006 stbinner@suse.de
- fix build of kdebindings3-python for < 10.2
-* Wed Nov 08 2006 - stbinner@suse.de
+* Wed Nov 08 2006 stbinner@suse.de
- remove historic "Provides:" (#218798)
-* Thu Oct 12 2006 - dmueller@suse.de
+* Thu Oct 12 2006 dmueller@suse.de
- update 3_5_BRANCH.diff to include fixes for python 2.5
bindings
-* Tue Oct 03 2006 - stbinner@suse.de
+* Tue Oct 03 2006 stbinner@suse.de
- update to 3.5.5 release tarball
-* Fri Sep 29 2006 - dmueller@suse.de
+* Fri Sep 29 2006 dmueller@suse.de
- add patch to the right specfile
-* Thu Sep 28 2006 - dmueller@suse.de
+* Thu Sep 28 2006 dmueller@suse.de
- fix build of python and java bindings
-* Thu Aug 31 2006 - stbinner@suse.de
+* Thu Aug 31 2006 stbinner@suse.de
- build with qscintilla-devel also on old distros in build service
-* Wed Aug 23 2006 - stbinner@suse.de
+* Wed Aug 23 2006 stbinner@suse.de
- add 3_5_BRANCH.diff (ruby binding fixes)
-* Sun Jul 23 2006 - coolo@suse.de
+* Sun Jul 23 2006 coolo@suse.de
- update to KDE 3.5.4:
* several fixes to the qtruby bindings
-* Sun Jun 18 2006 - coolo@suse.de
+* Sun Jun 18 2006 coolo@suse.de
- fix build on older distributions
-* Wed May 24 2006 - stbinner@suse.de
+* Wed May 24 2006 stbinner@suse.de
- update to KDE 3.5.3
* several fixes to QtRuby and Korundum
-* Thu May 18 2006 - dmueller@suse.de
+* Thu May 18 2006 dmueller@suse.de
- update buildrequires
-* Mon May 15 2006 - stbinner@suse.de
+* Mon May 15 2006 stbinner@suse.de
- update to KDE 3.5.2 and 3_5_BRANCH.diff
* fixes to qtruby, kalyptus, korundum and qtjava bindings
-* Tue Apr 11 2006 - mrueckert@suse.de
+* Tue Apr 11 2006 mrueckert@suse.de
site_ruby should be empty for user installed libraries.
- added kdebindings-3.5.1_ruby_non_site_dir.patch:
* korundum/rubylib/korundum/configure.in.in: map the site_ruby
directories to their normal equivalents.
-* Sun Feb 05 2006 - mls@suse.de
+* Mon Feb 06 2006 mls@suse.de
- adapt pre_checkin.sh script
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Sun Jan 22 2006 - stbinner@suse.de
+* Sun Jan 22 2006 stbinner@suse.de
- update to 3.5.1
-* Mon Jan 09 2006 - stbinner@suse.de
+* Mon Jan 09 2006 stbinner@suse.de
- remove "Provides: PyQt" from kdebindings3-python
-* Sun Jan 08 2006 - stbinner@suse.de
+* Sun Jan 08 2006 stbinner@suse.de
- update to 3_5_BRANCH
-* Tue Jan 03 2006 - adrian@suse.de
+* Tue Jan 03 2006 adrian@suse.de
- Do only Require python-qt for kdebindings3-python and without
the release number
-* Mon Dec 19 2005 - stbinner@suse.de
+* Mon Dec 19 2005 stbinner@suse.de
- fix file list
-* Sun Nov 27 2005 - coolo@suse.de
+* Sun Nov 27 2005 coolo@suse.de
- fix syntax error
-* Thu Nov 24 2005 - coolo@suse.de
+* Thu Nov 24 2005 coolo@suse.de
- split out python-qt
-* Mon Nov 21 2005 - stbinner@suse.de
+* Mon Nov 21 2005 stbinner@suse.de
- update to 3.5 RC 2
-* Thu Nov 10 2005 - stbinner@suse.de
+* Thu Nov 10 2005 stbinner@suse.de
- update to 3.5 RC 1
-* Wed Oct 12 2005 - coolo@suse.de
+* Wed Oct 12 2005 coolo@suse.de
- update to 3.4.92
-* Wed Sep 28 2005 - stbinner@suse.de
+* Wed Sep 28 2005 stbinner@suse.de
- fixed "Provides:" after .spec split
-* Fri Sep 23 2005 - coolo@suse.de
+* Fri Sep 23 2005 coolo@suse.de
- update to 3.4.91
- resync spec files
-* Sat Sep 03 2005 - matz@suse.de
+* Sat Sep 03 2005 matz@suse.de
- Split generated files to speed up compile.
-* Mon Aug 29 2005 - adrian@suse.de
+* Mon Aug 29 2005 adrian@suse.de
- build packages in seperate spec files to speed up build
- cleanup patches and nfb
-* Mon Aug 22 2005 - mrueckert@suse.de
+* Mon Aug 22 2005 mrueckert@suse.de
- added ruby-devel to nfb
-* Tue Aug 09 2005 - mls@suse.de
+* Tue Aug 09 2005 mls@suse.de
- removed compat from neededforbuild
-* Sun Jul 24 2005 - coolo@suse.de
+* Sun Jul 24 2005 coolo@suse.de
- fix build (final 3.4.2)
-* Fri Jul 22 2005 - coolo@suse.de
+* Fri Jul 22 2005 coolo@suse.de
- update to version 3.4.2
-* Wed Jun 22 2005 - schwab@suse.de
+* Wed Jun 22 2005 schwab@suse.de
- Fix 64bit bug in java bindings.
-* Wed Jun 15 2005 - dmueller@suse.de
+* Wed Jun 15 2005 dmueller@suse.de
- sync with branches/KDE/3.4
-* Tue Jun 14 2005 - dmueller@suse.de
+* Tue Jun 14 2005 dmueller@suse.de
- sync with branches/KDE/3.4
-* Tue May 24 2005 - adrian@suse.de
+* Tue May 24 2005 adrian@suse.de
- update to version 3.4.1
-* Tue May 17 2005 - ro@suse.de
+* Tue May 17 2005 ro@suse.de
- fix build with gcc-4
-* Sat Mar 05 2005 - adrian@suse.de
+* Sat Mar 05 2005 adrian@suse.de
- update to final 3.4.0
-* Wed Mar 02 2005 - coolo@suse.de
+* Wed Mar 02 2005 coolo@suse.de
- fix build (and do it parallel)
-* Mon Feb 14 2005 - adrian@suse.de
+* Mon Feb 14 2005 adrian@suse.de
- update from CVS
-* Fri Feb 11 2005 - adrian@suse.de
+* Fri Feb 11 2005 adrian@suse.de
- update from CVS
-* Mon Feb 07 2005 - adrian@suse.de
+* Mon Feb 07 2005 adrian@suse.de
- update to beta 2
-* Fri Jan 21 2005 - adrian@suse.de
+* Fri Jan 21 2005 adrian@suse.de
- update to current snapshot (includes last fix)
-* Thu Jan 20 2005 - ro@suse.de
+* Fri Jan 21 2005 ro@suse.de
- fix dependency to /bin/env (should be /usr/bin/env)
-* Thu Jan 13 2005 - adrian@suse.de
+* Thu Jan 13 2005 adrian@suse.de
- fix installation of java binding documentation
-* Tue Jan 11 2005 - adrian@suse.de
+* Tue Jan 11 2005 adrian@suse.de
- fix some compiler warnings
-* Mon Jan 10 2005 - adrian@suse.de
+* Mon Jan 10 2005 adrian@suse.de
- update to version 3.4 beta 1
-* Thu Dec 16 2004 - coolo@suse.de
+* Thu Dec 16 2004 coolo@suse.de
- disable unsermake (most likely forever)
-* Mon Nov 29 2004 - adrian@suse.de
+* Mon Nov 29 2004 adrian@suse.de
- update to version 3.3.2
-* Fri Nov 26 2004 - ro@suse.de
+* Fri Nov 26 2004 ro@suse.de
- use only py_ver macro, py_site is broken in 9.0
-* Wed Nov 24 2004 - adrian@suse.de
+* Wed Nov 24 2004 adrian@suse.de
- fix build for python 2.4
- fix build for 8.2
-* Tue Nov 23 2004 - ro@suse.de
+* Tue Nov 23 2004 ro@suse.de
- fix build on 9.0
-* Tue Oct 12 2004 - adrian@suse.de
+* Tue Oct 12 2004 adrian@suse.de
- update to version 3.3.1
-* Tue Sep 21 2004 - adrian@suse.de
+* Tue Sep 21 2004 adrian@suse.de
- fix build
- remove unneeded packages from neededforbuild
- add qscintilla support for python bindings (#45715)
-* Mon Sep 20 2004 - adrian@suse.de
+* Mon Sep 20 2004 adrian@suse.de
- update to current BRANCH
* ruby fixes and enhancements
-* Wed Sep 08 2004 - adrian@suse.de
+* Wed Sep 08 2004 adrian@suse.de
- fix spec file syntax
-* Tue Sep 07 2004 - adrian@suse.de
+* Tue Sep 07 2004 adrian@suse.de
- fix build for ia64 and ia32
-* Mon Sep 06 2004 - adrian@suse.de
+* Mon Sep 06 2004 adrian@suse.de
- -java Requires "jre1.2.x" instead of "java2" now
-* Mon Sep 06 2004 - adrian@suse.de
+* Mon Sep 06 2004 adrian@suse.de
- update to version 3.3.0 final
* -python obsoletes sip/PyQt/PyKDE
* -c is in qtc now
* -Csharp is in qtsharp now
-* Tue Aug 10 2004 - adrian@suse.de
+* Tue Aug 10 2004 adrian@suse.de
- update to version 3.3.0 RC2
-* Wed Apr 14 2004 - adrian@suse.de
+* Wed Apr 14 2004 adrian@suse.de
- update to version 3.2.2
-* Tue Apr 06 2004 - adrian@suse.de
+* Tue Apr 06 2004 adrian@suse.de
- fix build
-* Mon Apr 05 2004 - adrian@suse.de
+* Mon Apr 05 2004 adrian@suse.de
- remove wrong Obsoletes
-* Mon Mar 01 2004 - coolo@suse.de
+* Mon Mar 01 2004 coolo@suse.de
- update to version 3.2.1
- disable-final to make it build on reasonable hardware
-* Sun Feb 15 2004 - adrian@suse.de
+* Sun Feb 15 2004 adrian@suse.de
- remove obsolete files from file list
- make kjscmd desktop entry unimportant
-* Sat Feb 14 2004 - adrian@suse.de
+* Sat Feb 14 2004 adrian@suse.de
- fix build for x86_64
-* Tue Jan 27 2004 - adrian@suse.de
+* Tue Jan 27 2004 adrian@suse.de
- update to KDE 3.2.0 final
-* Sat Jan 24 2004 - adrian@suse.de
+* Sat Jan 24 2004 adrian@suse.de
- add Qt# API docu
- fix kdebindings3-java Requires
- rename -sharp package to -Csharp
-* Thu Jan 22 2004 - uli@suse.de
+* Thu Jan 22 2004 uli@suse.de
- qtc: fixed segfault in ilrun when programs using Qt# call exit()
before destroying all Qt objects
-* Thu Jan 22 2004 - ro@suse.de
+* Thu Jan 22 2004 ro@suse.de
- fix typo in specfile
-* Tue Jan 20 2004 - adrian@suse.de
+* Tue Jan 20 2004 adrian@suse.de
- enable Qt# bindings for > 9.0
- add qtsharp 0.7 and use it instead of version 0.5 from the
kdebindings tar ball
-* Tue Jan 20 2004 - adrian@suse.de
+* Tue Jan 20 2004 adrian@suse.de
- fix build of java bindings
-* Sun Jan 18 2004 - adrian@suse.de
+* Sun Jan 18 2004 adrian@suse.de
- update to version 3.1.95 ( KDE 3.2 RC1 )
-* Mon Dec 22 2003 - adrian@suse.de
+* Mon Dec 22 2003 adrian@suse.de
- own sub package for javascript bindings
-* Mon Dec 01 2003 - adrian@suse.de
+* Mon Dec 01 2003 adrian@suse.de
- update to 3.1.94 ( KDE 3.2 beta 2 )
-* Thu Nov 13 2003 - adrian@suse.de
+* Fri Nov 14 2003 adrian@suse.de
- update to new snapshot from 2003102409
-* Tue Oct 21 2003 - adrian@suse.de
+* Tue Oct 21 2003 adrian@suse.de
- update to snapshot 2003102008
-* Tue Sep 09 2003 - adrian@suse.de
+* Tue Sep 09 2003 adrian@suse.de
- update to version 3.1.4
-* Tue Aug 19 2003 - ro@suse.de
+* Tue Aug 19 2003 ro@suse.de
- try to fix build on x86_64
-* Fri Jul 25 2003 - adrian@suse.de
+* Fri Jul 25 2003 adrian@suse.de
- update to 3.1.3
* disable perl/smoke bindings for now
-* Fri May 16 2003 - adrian@suse.de
+* Fri May 16 2003 adrian@suse.de
- update to 3.1.2
* kmozilla got disabled
- fix build
-* Tue Feb 11 2003 - adrian@suse.de
+* Tue Feb 11 2003 adrian@suse.de
- fix build for lib64
-* Sun Jan 19 2003 - adrian@suse.de
+* Sun Jan 19 2003 adrian@suse.de
- update to RC7-try2
-* Tue Jan 07 2003 - adrian@suse.de
+* Tue Jan 07 2003 adrian@suse.de
- update to RC6
-* Tue Dec 03 2002 - ro@suse.de
+* Tue Dec 03 2002 ro@suse.de
- put smoke stuff in perl subpackage
-* Sat Nov 30 2002 - adrian@suse.de
+* Sun Dec 01 2002 adrian@suse.de
- using RC5 tar ball, third try
-* Mon Nov 25 2002 - adrian@suse.de
+* Mon Nov 25 2002 adrian@suse.de
- update to RC5
-* Wed Nov 20 2002 - adrian@suse.de
+* Wed Nov 20 2002 adrian@suse.de
- update to version 3.1-RC4
-* Tue Oct 08 2002 - adrian@suse.de
+* Tue Oct 08 2002 adrian@suse.de
- update to version 3.0.4
-* Tue Aug 13 2002 - uli@suse.de
+* Tue Aug 13 2002 uli@suse.de
- no %%package java -> no %%post java
-* Sun Aug 11 2002 - coolo@suse.de
+* Sun Aug 11 2002 coolo@suse.de
- make automake happy
-* Thu Aug 08 2002 - adrian@suse.de
+* Thu Aug 08 2002 adrian@suse.de
- update to version 3.0.3
- add %%run_ldconfig
-* Sun Aug 04 2002 - adrian@suse.de
+* Sun Aug 04 2002 adrian@suse.de
- fix %%if order in file list
-* Fri Aug 02 2002 - adrian@suse.de
+* Fri Aug 02 2002 adrian@suse.de
- disable java for ppc64 x86_64 s390 s390x
-* Tue Jul 16 2002 - adrian@suse.de
+* Tue Jul 16 2002 adrian@suse.de
- split packages into subpackages only: -c, -java and -mozilla
-* Tue Jun 25 2002 - adrian@suse.de
+* Tue Jun 25 2002 adrian@suse.de
- update to version 3.0.2
-* Thu Jun 06 2002 - ro@suse.de
+* Thu Jun 06 2002 ro@suse.de
- fix for moved mozilla libs
-* Mon May 13 2002 - coolo@suse.de
+* Mon May 13 2002 coolo@suse.de
- update to 3.0.1
- fixing file list
- using %%_lib
-* Thu May 09 2002 - coolo@suse.de
+* Thu May 09 2002 coolo@suse.de
- updating to KDE 3.0.1 branch to get the fixes for
lib64 and qt 3.0.4
-* Mon Apr 15 2002 - coolo@suse.de
+* Mon Apr 15 2002 coolo@suse.de
- gobjc is gcc-objc now
-* Mon Mar 25 2002 - adrian@suse.de
+* Mon Mar 25 2002 adrian@suse.de
- update to 3.0 final :)
-* Thu Mar 21 2002 - adrian@suse.de
+* Thu Mar 21 2002 adrian@suse.de
- update to 3.0rc3
-* Sun Mar 10 2002 - adrian@suse.de
+* Sun Mar 10 2002 adrian@suse.de
- update to 3.0rc2
- fix build for mozilla
- still not building: kdejava, python, kec and objective C support
-* Mon Mar 04 2002 - adrian@suse.de
+* Mon Mar 04 2002 adrian@suse.de
- update to snapshot 2.92.2002030321
- disable kde java bindings for now
-* Tue Dec 18 2001 - adrian@suse.de
+* Tue Dec 18 2001 adrian@suse.de
- update to version 2.91 (3.0 beta1)
-* Thu Nov 15 2001 - adrian@suse.de
+* Fri Nov 16 2001 adrian@suse.de
- update to version 2.2.2
-* Thu Sep 13 2001 - adrian@suse.de
+* Thu Sep 13 2001 adrian@suse.de
- fix version number of kdebindings-mozilla package
-* Sat Sep 08 2001 - adrian@suse.de
+* Sat Sep 08 2001 adrian@suse.de
- update to 2.2.1 final
-* Mon Aug 13 2001 - ro@suse.de
+* Mon Aug 13 2001 ro@suse.de
- changed neededforbuild to <sp-devel>
-* Mon Aug 06 2001 - adrian@suse.de
+* Mon Aug 06 2001 adrian@suse.de
- update to 2.2 final
-* Fri Jun 29 2001 - adrian@suse.de
+* Fri Jun 29 2001 adrian@suse.de
- update 2.2beta1
-* Sun Apr 08 2001 - adrian@suse.de
+* Sun Apr 08 2001 adrian@suse.de
- drop -O0 for ppc and alpha
-* Fri Mar 30 2001 - ro@suse.de
+* Fri Mar 30 2001 ro@suse.de
- neededforbuild fix
-* Tue Mar 27 2001 - ro@suse.de
+* Tue Mar 27 2001 ro@suse.de
- changed neededforbuild <docbkdsl> to <docbook-dsssl-stylesheets>
-* Wed Mar 21 2001 - adrian@suse.de
+* Wed Mar 21 2001 adrian@suse.de
- fix mozilla build
-* Tue Mar 20 2001 - adrian@suse.de
+* Tue Mar 20 2001 adrian@suse.de
- update to 2.1.1
fix file list
-* Sun Mar 18 2001 - ro@suse.de
+* Mon Mar 19 2001 ro@suse.de
- fixed neededforbuild
-* Tue Mar 13 2001 - ro@suse.de
+* Tue Mar 13 2001 ro@suse.de
- removed second occurence of docbk30 from neededforbuild
-* Tue Mar 13 2001 - ro@suse.de
+* Tue Mar 13 2001 ro@suse.de
- changed neededforbuild <docbk30> to
-* Mon Mar 12 2001 - schwab@suse.de
+* Mon Mar 12 2001 schwab@suse.de
- No java on ia64.
- Fix shell syntax in configure script.
- Fix missing include.
-* Thu Feb 22 2001 - adrian@suse.de
+* Thu Feb 22 2001 adrian@suse.de
- update to final 2.1.0
mozilla support is inside an own subpackage
-* Sat Feb 17 2001 - adrian@suse.de
+* Sat Feb 17 2001 adrian@suse.de
- newer snapshot from KDE_2_0_BRANCH
initial package
++++++ kdebindings-3.5.8.tar.bz2 -> kdebindings-3.5.9.tar.bz2 ++++++
++++ 6980 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdebindings-3.5.8/acinclude.m4 new/kdebindings-3.5.9/acinclude.m4
--- old/kdebindings-3.5.8/acinclude.m4 2007-10-08 16:20:58.000000000 +0200
+++ new/kdebindings-3.5.9/acinclude.m4 2008-02-13 15:59:36.000000000 +0100
@@ -1226,7 +1226,15 @@
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
+ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+ if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+ fi
+ fi
fi
if test $kde_qtver = 2; then
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
@@ -1443,6 +1451,14 @@
for dir in $kde_qt_dirs; do
qt_incdirs="$qt_incdirs $dir/include $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+ fi
+fi
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
if test ! "$ac_qt_includes" = "NO"; then
qt_incdirs="$ac_qt_includes $qt_incdirs"
@@ -1459,8 +1475,16 @@
qt_libdirs=""
for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+ qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+ fi
+fi
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
qt_libdir=$ac_qt_libraries
@@ -2631,6 +2655,7 @@
AC_TRY_LINK(dnl
[
#include
+#include
],
[
char buf[42];
@@ -2638,7 +2663,7 @@
/* this would segfault.. but we only link, don't run */
(void) gzgets(f, buf, sizeof(buf));
- return (zlibVersion() == ZLIB_VERSION);
+ return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
],
eval "ac_cv_lib_z='-lz'",
eval "ac_cv_lib_z=no")
@@ -2738,11 +2763,11 @@
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
- if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+ if ! $PKG_CONFIG --exists OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=no
else
- if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+ if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=old
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdebindings-3.5.8/admin/acinclude.m4.in new/kdebindings-3.5.9/admin/acinclude.m4.in
--- old/kdebindings-3.5.8/admin/acinclude.m4.in 2007-10-08 13:33:46.000000000 +0200
+++ new/kdebindings-3.5.9/admin/acinclude.m4.in 2008-02-13 14:17:05.000000000 +0100
@@ -1226,7 +1226,15 @@
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
+ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+ if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+ fi
+ fi
fi
if test $kde_qtver = 2; then
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
@@ -1443,6 +1451,14 @@
for dir in $kde_qt_dirs; do
qt_incdirs="$qt_incdirs $dir/include $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+ fi
+fi
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
if test ! "$ac_qt_includes" = "NO"; then
qt_incdirs="$ac_qt_includes $qt_incdirs"
@@ -1459,8 +1475,16 @@
qt_libdirs=""
for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+ qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+ fi
+fi
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
qt_libdir=$ac_qt_libraries
@@ -2631,6 +2655,7 @@
AC_TRY_LINK(dnl
[
#include
+#include
],
[
char buf[42];
@@ -2638,7 +2663,7 @@
/* this would segfault.. but we only link, don't run */
(void) gzgets(f, buf, sizeof(buf));
- return (zlibVersion() == ZLIB_VERSION);
+ return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
],
eval "ac_cv_lib_z='-lz'",
eval "ac_cv_lib_z=no")
@@ -2738,11 +2763,11 @@
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
- if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+ if ! $PKG_CONFIG --exists OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=no
else
- if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+ if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=old
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdebindings-3.5.8/admin/cvs.sh new/kdebindings-3.5.9/admin/cvs.sh
--- old/kdebindings-3.5.8/admin/cvs.sh 2007-10-08 13:33:46.000000000 +0200
+++ new/kdebindings-3.5.9/admin/cvs.sh 2008-02-13 14:17:05.000000000 +0100
@@ -316,7 +316,7 @@
fi
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
- VERSION="\"3.5.8\""
+ VERSION="\"3.5.9\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`pwd`;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdebindings-3.5.8/admin/detect-autoconf.pl new/kdebindings-3.5.9/admin/detect-autoconf.pl
--- old/kdebindings-3.5.8/admin/detect-autoconf.pl 2007-10-08 13:33:46.000000000 +0200
+++ new/kdebindings-3.5.9/admin/detect-autoconf.pl 2008-02-13 14:17:05.000000000 +0100
@@ -21,6 +21,73 @@
return "";
}
+# Subroutine to lexicographically compare two version strings, a and b.
+# If a > b, 1 is returned.
+# If a == b, 0 is returned.
+# If a < b, -1 is returned.
+#
+# If the strings are of uneven number length then the shorter string is
+# prepended by enough zeroes to make the two string lengths equal in order to
+# allow an accurate comparison. Note that the zero-padding only occurs in
+# between version separators (i.e. 1.6 and 1.10, results in 1.06 vs. 1.10).
+# Parts of the version ending in -foo (or any other text) are not considered
+# when doing the compare. (i.e. 2.53a vs 2.53 doesn't end up in 2.53a vs.
+# 2.053)
+sub compareVersions
+{
+ my ($a, $b) = @_;
+
+ # Split the strings up by '.' (version separator) and start comparing digit
+ # length.
+
+ my @aParts = split(/\./, $a);
+ my @bParts = split(/\./, $b);
+
+ # Make the arrays equal in length by adding missing zeroes to the end of the
+ # version.
+ push @aParts, '0' while scalar @aParts < scalar @bParts;
+ push @bParts, '0' while scalar @bParts < scalar @aParts;
+
+ # Now compare each individual portion.
+ for (my $i = 0; $i < scalar @aParts; ++$i)
+ {
+ # Make sure that any portion that has numbers is contiguous. I'm sure
+ # there's a technique for saving stuff like 2.52a2 but I don't feel
+ # like implementing it.
+ if ($aParts[$i] !~ /^[^\d]*\d+[^\d]*$/ or
+ $bParts[$i] !~ /^[^\d]*\d+[^\d]*$/)
+ {
+ die "Not able to compare $a to $b!\n";
+ }
+
+ my ($aDigits) = ($aParts[$i] =~ /(\d+)/);
+ my ($bDigits) = ($bParts[$i] =~ /(\d+)/);
+
+ # Perl is $MODERATELY_INSULTING_TERM, don't remove the parentheses in
+ # the delta calculation below.
+ my $delta = (length $aDigits) - (length $bDigits);
+ if ($delta < 0) # b is longer
+ {
+ my $replacement = ('0' x (-$delta)) . $aDigits;
+ $aParts[$i] =~ s/$aDigits/$replacement/;
+ }
+ elsif ($delta > 0) # a is longer
+ {
+ my $replacement = ('0' x $delta) . $bDigits;
+ $bParts[$i] =~ s/$bDigits/$replacement/;
+ }
+ }
+
+ # Arrays now have standardized version components, let's re-merge them
+ # to strings to do the compare.
+ my $newA = join('.', @aParts);
+ my $newB = join('.', @bParts);
+
+ return 1 if ($newA gt $newB);
+ return -1 if ($newA lt $newB);
+ return 0;
+}
+
# Subroutine to determine the highest installed version of the given program,
# searching from the given paths.
sub findBest
@@ -29,9 +96,10 @@
my $best_version_found = '0'; # Deliberately a string.
my %versions;
my %minimumVersions = (
- 'autoconf' => '2.5',
+ 'autoconf' => '2.5',
'automake' => '1.6',
);
+ my $sgn; # Used for compareVersions results.
# Allow user to use environment variable to override search.
return $ENV{uc $program} if $ENV{uc $program};
@@ -45,9 +113,11 @@
next unless -x $file;
($version) = $file =~ /$prefix\/$program-?(.*)$/;
- $version =~ s/-|\.//g;
- # Don't check the -wrapper ones
- next if $version eq "wrapper";
+
+ # Don't check the -wrapper ones (or any other non program one).
+ # The real deal should start with a version number, or have no
+ # suffix at all.
+ next if $version =~ /^[^\d]/;
# Special case some programs to make sure it has a minimum version.
if (not $version and exists $minimumVersions{$program})
@@ -56,15 +126,20 @@
my $versionOutput = `$program --version 2>/dev/null | head -n 1`;
# If we can't run the script to get the version it likely won't work later.
- next unless $versionOutput;
+ next unless $versionOutput;
# Use number.number for version (we don't need the excess in general).
- ($versionOutput) = ($versionOutput =~ /(\d\.\d)/);
+ ($versionOutput) = ($versionOutput =~ /(\d+\.\d+)/);
+
+ # compareVersions returns -1 if the left argument is less than
+ # the right argument. It can also die for invalid input so
+ # wrap with eval.
+ eval {
+ $sgn = compareVersions($versionOutput, $min_version);
+ };
- # Use lt to do lexicographical comparison of strings (which should be
- # equivalent and doesn't involve issues with floating point conversions).
- if (not $versionOutput or $versionOutput lt $min_version)
- {
+ # $@ would be set if an error was encountered.
+ if ($@ or not $versionOutput or $sgn == -1) {
next;
}
}
@@ -80,7 +155,12 @@
$versions{$version} = $file;
# Use string comparison so that e.g. 253a will be > 253 but < 254.
- if ($version gt $best_version_found)
+ # See above about the need for eval.
+ eval {
+ $sgn = compareVersions($version, $best_version_found);
+ };
+
+ if (not $@ and $sgn == 1)
{
$best_version_found = $version;
}
@@ -140,12 +220,12 @@
($automake_suffix) = $automake =~ /.*automake(.*)$/;
-# Use unsermake if we found it.
-$automake = "$unsermake -c" if $unsermake;
-
# Find matching automake companions.
$aclocal = findProgram('aclocal', $automake_suffix);
+# Use unsermake if we found it.
+$automake = "$unsermake -c" if ($unsermake and $aclocal);
+
$which = findWhich();
# Make sure we have all of the needed programs.
@@ -153,8 +233,7 @@
{
unless(${$i})
{
- print "# Unable to find $i!!\n";
- exit 1;
+ print STDERR "# Unable to find $i!!\n";
}
}
@@ -173,3 +252,5 @@
EOF
exit 0;
+
+# vim: set noet ts=8 sw=4:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdebindings-3.5.8/admin/Doxyfile.am new/kdebindings-3.5.9/admin/Doxyfile.am
--- old/kdebindings-3.5.8/admin/Doxyfile.am 2007-10-08 13:33:46.000000000 +0200
+++ new/kdebindings-3.5.9/admin/Doxyfile.am 2008-02-13 14:17:05.000000000 +0100
@@ -72,11 +72,11 @@
uninstall-apidox:
@if test "$(subdir)" != "."; then \
if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
- rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
+ rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
fi \
else \
if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
- rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
+ rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
fi \
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdebindings-3.5.8/configure.in new/kdebindings-3.5.9/configure.in
--- old/kdebindings-3.5.8/configure.in 2007-10-08 16:20:58.000000000 +0200
+++ new/kdebindings-3.5.9/configure.in 2008-02-13 15:59:36.000000000 +0100
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kdebindings, "3.5.8") dnl searches for some needed programs
+AM_INIT_AUTOMAKE(kdebindings, "3.5.9") dnl searches for some needed programs
KDE_SET_PREFIX
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdebindings-3.5.8/kdebindings.lsm new/kdebindings-3.5.9/kdebindings.lsm
--- old/kdebindings-3.5.8/kdebindings.lsm 2007-10-08 13:04:34.000000000 +0200
+++ new/kdebindings-3.5.9/kdebindings.lsm 2008-02-13 10:52:06.000000000 +0100
@@ -1,7 +1,7 @@
Begin4
Title: kdebindings
-Version: 3.5.8
-Entered-date: 2007-10-15
+Version: 3.5.9
+Entered-date: 2008-02-13
Description: Non-C++ bindings for the K Desktop Environment (KDE)
Keywords: KDE X11 desktop Qt
Author: http://bugs.kde.org/ (KDE Bugtracking System)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdebindings-3.5.8/smoke/kde/qtguess.pl.in new/kdebindings-3.5.9/smoke/kde/qtguess.pl.in
--- old/kdebindings-3.5.8/smoke/kde/qtguess.pl.in 2005-09-10 10:16:39.000000000 +0200
+++ new/kdebindings-3.5.9/smoke/kde/qtguess.pl.in 2008-02-13 10:36:19.000000000 +0100
@@ -100,12 +100,12 @@
{
if( check_exit_status($?) )
{
- while( $symbols =~/^#\s*define\s*(QT_\S+)/gm )
+ while( $symbols =~/^#\s*define\s*(QT_\S+)\s*$/gm )
{
$qtdefs{$1} = 1;
}
print "Found ". scalar( keys %qtdefs )." predefined symbol".((scalar( keys %qtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtdefs));
- while( $symbols =~/^#\s*define\s*QT_MODULE_(\S+)/gm )
+ while( $symbols =~/^#\s*define\s*QT_MODULE_(\S+)\s*$/gm )
{
$qtundefs{"QT_NO_$1"} = 1;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdebindings-3.5.8/smoke/qt/qtguess.pl.in new/kdebindings-3.5.9/smoke/qt/qtguess.pl.in
--- old/kdebindings-3.5.8/smoke/qt/qtguess.pl.in 2005-09-10 10:16:39.000000000 +0200
+++ new/kdebindings-3.5.9/smoke/qt/qtguess.pl.in 2008-02-13 10:36:20.000000000 +0100
@@ -100,12 +100,12 @@
{
if( check_exit_status($?) )
{
- while( $symbols =~/^#\s*define\s*(QT_\S+)/gm )
+ while( $symbols =~/^#\s*define\s*(QT_\S+)\s*$/gm )
{
$qtdefs{$1} = 1;
}
print "Found ". scalar( keys %qtdefs )." predefined symbol".((scalar( keys %qtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtdefs));
- while( $symbols =~/^#\s*define\s*QT_MODULE_(\S+)/gm )
+ while( $symbols =~/^#\s*define\s*QT_MODULE_(\S+)\s*$/gm )
{
$qtundefs{"QT_NO_$1"} = 1;
}
++++++ kdebindings3.spec.in ++++++
--- KDE/kdebindings3/kdebindings3.spec.in 2007-11-27 17:49:40.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebindings3/kdebindings3.spec.in 2008-02-13 22:11:40.000000000 +0100
@@ -21,7 +21,7 @@
License: LGPL
Group: System/GUI/KDE
Summary: Bindings for Qt and KDE Libraries
-Version: 3.5.8
+Version: 3.5.9
Release: 1
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Url: http://www.kde.org/
@@ -29,7 +29,6 @@
Source0: kdebindings-%{version}.tar.bz2
#Patch0: 3_5_BRANCH.diff
Patch2: perl.diff
-Patch3: kdebindings-3.5-gcc-4.3.diff
Patch4: fix-return-value-kjsembed.diff
#Patch5: FIXME.diff
Patch6: 64bit.diff
@@ -74,7 +73,6 @@
%setup -q -n kdebindings-%{version}
#%patch0
%patch2
-%patch3
%patch4
#%patch5
#%patch6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org