Hello community,
here is the log from the commit of package kdelibs3
checked in at Tue Feb 19 02:29:41 CET 2008.
--------
--- KDE/kdelibs3/kdelibs3.changes 2008-02-08 22:19:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdelibs3/kdelibs3.changes 2008-02-13 19:53:21.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Feb 13 19:52:59 CET 2008 - dmueller@suse.de
+
+- update to 3.5.9:
+ * 9th bugfix release of KDE 3.5
+ * remove patches that are already upstream
+
+-------------------------------------------------------------------
Old:
----
3_5_BRANCH.diff
kdelibs-3.5.8.tar.bz2
r772369.diff
r772413.diff
New:
----
kdelibs-3.5.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs3-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.v17904/_old 2008-02-19 02:29:20.000000000 +0100
+++ /var/tmp/diff_new_pack.v17904/_new 2008-02-19 02:29:20.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdelibs3-devel-doc (Version 3.5.8)
+# spec file for package kdelibs3-devel-doc (Version 3.5.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: kdelibs3-devel-doc
BuildRequires: OpenEXR-devel aspell-devel cups-devel db-devel doxygen graphviz kdelibs3-devel krb5-devel libjasper libsndfile openldap2-devel qt3-devel-doc utempter xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-scalable
%if %suse_version > 1020
@@ -22,8 +23,8 @@
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Additional Package Documentation
-Version: 3.5.8
-Release: 44
+Version: 3.5.9
+Release: 1
%define kdelibs_patch_level b
BuildArch: noarch
Requires: kdelibs3 qt3-devel-doc
++++++ kdelibs3.spec ++++++
--- /var/tmp/diff_new_pack.v17904/_old 2008-02-19 02:29:20.000000000 +0100
+++ /var/tmp/diff_new_pack.v17904/_new 2008-02-19 02:29:20.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdelibs3 (Version 3.5.8)
+# spec file for package kdelibs3 (Version 3.5.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: kdelibs3
BuildRequires: OpenEXR-devel arts-devel aspell-devel cups-devel fam-devel flac-devel krb5-devel
BuildRequires: libart_lgpl-devel libidn-devel libsndfile libtiff-devel
@@ -29,8 +30,8 @@
Group: System/GUI/KDE
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: KDE Base Libraries
-Version: 3.5.8
-Release: 43
+Version: 3.5.9
+Release: 1
Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons kdepim3-networkstatus
Provides: kups keramik kdelibs3-cups kdelibs3-33addons kdepim3-networkstatus
Provides: kdelibs3_base = 3.3
@@ -59,7 +60,7 @@
Source14: vnd.openxmlformats-officedocument.wordprocessingml.document.desktop
Source15: vnd.openxmlformats-officedocument.presentationml.presentation.desktop
Source16: vnd.openxmlformats-officedocument.spreadsheetml.sheet.desktop
-Patch0: 3_5_BRANCH.diff
+#Patch0: 3_5_BRANCH.diff
Patch1: kdeversion.diff
Patch2: admin.diff
Patch3: show-distribution.diff
@@ -127,8 +128,6 @@
Patch133: flash-player-non-oss.diff
Patch134: bundle-locale-help.diff
Patch149: networkstatus.diff
-Patch150: r772369.diff
-Patch151: r772413.diff
%description
This package contains kdelibs, one of the basic packages of the K
@@ -231,7 +230,7 @@
%prep
echo %suse_version
%setup -q -n kdelibs-%{version}
-%patch0
+#%patch0
%patch1
%patch3
%patch5
@@ -324,8 +323,6 @@
%patch134
%endif
%patch149
-%patch150
-%patch151
tar xfvj %SOURCE12
#
# define KDE version exactly
@@ -818,6 +815,10 @@
/opt/kde3/%_lib/libconnectionmanager.so
%changelog
+* Wed Feb 13 2008 dmueller@suse.de
+- update to 3.5.9:
+ * 9th bugfix release of KDE 3.5
+ * remove patches that are already upstream
* Fri Feb 08 2008 stbinner@suse.de
- prevent autostarted application crashes under KDE4 (bnc#359800)
* Thu Jan 10 2008 dmueller@suse.de
++++++ admin.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/admin/acinclude.m4.in new/admin/acinclude.m4.in
--- old/admin/acinclude.m4.in 2007-03-22 18:02:12.000000000 +0100
+++ new/admin/acinclude.m4.in 2007-12-21 11:16:33.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 old/admin/cvs.sh new/admin/cvs.sh
--- old/admin/cvs.sh 2007-10-09 10:57:19.000000000 +0200
+++ new/admin/cvs.sh 2008-02-13 10:49:33.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 old/admin/detect-autoconf.pl new/admin/detect-autoconf.pl
--- old/admin/detect-autoconf.pl 2007-08-15 11:41:54.000000000 +0200
+++ new/admin/detect-autoconf.pl 2008-02-13 03:20:50.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 old/admin/Doxyfile.am new/admin/Doxyfile.am
--- old/admin/Doxyfile.am 2006-01-12 17:14:51.000000000 +0100
+++ new/admin/Doxyfile.am 2008-01-28 16:07:32.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
++++++ kdelibs-3.5.8.tar.bz2 -> kdelibs-3.5.9.tar.bz2 ++++++
KDE/kdelibs3/kdelibs-3.5.8.tar.bz2 /mounts/work_src_done/STABLE/kdelibs3/kdelibs-3.5.9.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org