rpms/kdelibs/devel kde-3.5-libtool-shlibext.patch, NONE, 1.1 kdelibs-3.5.5-lib_loader-1.2.patch, NONE, 1.1 kdelibs-3.5.6-lang.patch, NONE, 1.1 kdelibs-3.5.7-ICEauthority.patch, NONE, 1.1 kdelibs-3.5.7-kde#146105.patch, NONE, 1.1 .cvsignore, 1.38, 1.39 kdelibs.spec, 1.210, 1.211 sources, 1.50, 1.51 kdelibs-3.5.6-bz#225420-CVE-2007-0537.patch, 1.1, NONE kdelibs-3.5.6-kde#126812.patch, 1.2, NONE kdelibs-3.5.6-kde#140768.patch, 1.1, NONE kdelibs-3.5.6-qt3.3.8.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Fri Jun 15 18:10:46 UTC 2007


Author: rdieter

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

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kde-3.5-libtool-shlibext.patch 
	kdelibs-3.5.5-lib_loader-1.2.patch kdelibs-3.5.6-lang.patch 
	kdelibs-3.5.7-ICEauthority.patch 
	kdelibs-3.5.7-kde#146105.patch 
Removed Files:
	kdelibs-3.5.6-bz#225420-CVE-2007-0537.patch 
	kdelibs-3.5.6-kde#126812.patch kdelibs-3.5.6-kde#140768.patch 
	kdelibs-3.5.6-qt3.3.8.patch 
Log Message:
 Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
- include experimental libtool patches

* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
- kdesu: sudo support (kde bug #20914), Requires(hint): sudo

* Wed Jun 06 2007 Than Ngo <than at redhat.com> -  6:3.5.7-0.1.fc7
- 3.5.7


kde-3.5-libtool-shlibext.patch:

--- NEW FILE kde-3.5-libtool-shlibext.patch ---
Index: arts-1.5.4/acinclude.m4
===================================================================
--- arts-1.5.4.orig/acinclude.m4
+++ arts-1.5.4/acinclude.m4
@@ -12040,28 +12040,12 @@ fi
 ])# AC_LTDL_SYS_DLOPEN_DEPLIBS
 
 AC_DEFUN([AC_LTDL_SHLIBEXT],
-[AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl
+[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])dnl
 AC_CACHE_CHECK([which extension is used for shared libraries],
   libltdl_cv_shlibext, [dnl
-(
-  last=
-	case "$host_os" in
-    cygwin* | mingw*) 
-      last=".dll" 
-      ;;
-    *)
-      for spec in $library_names_spec; do
-        last="$spec"
-      done
-      ;;
-  esac
-changequote(, )
-  echo "$last" | sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//' > conftest
-changequote([, ])
-)
-libltdl_cv_shlibext=`cat conftest`
-rm -f conftest
-])
+module=yes
+eval libltdl_cv_shlibext=$shrext
+  ])
 if test -n "$libltdl_cv_shlibext"; then
   AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext",
     [Define to the extension used for shared libraries, say, ".so". ])
Index: arts-1.5.4/libltdl/ltdl.m4
===================================================================
--- arts-1.5.4.orig/libltdl/ltdl.m4
+++ arts-1.5.4/libltdl/ltdl.m4
@@ -118,27 +118,11 @@ fi
 ])# AC_LTDL_SYS_DLOPEN_DEPLIBS
 
 AC_DEFUN([AC_LTDL_SHLIBEXT],
-[AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl
+[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])dnl
 AC_CACHE_CHECK([which extension is used for shared libraries],
   libltdl_cv_shlibext, [dnl
-(
-  last=
-	case "$host_os" in
-    cygwin* | mingw*) 
-      last=".dll" 
-      ;;
-    *)
-      for spec in $library_names_spec; do
-        last="$spec"
-      done
-      ;;
-  esac
-changequote(, )
-  echo "$last" | sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//' > conftest
-changequote([, ])
-)
-libltdl_cv_shlibext=`cat conftest`
-rm -f conftest
+module=yes
+eval libltdl_cv_shlibext=$shrext
 ])
 if test -n "$libltdl_cv_shlibext"; then
   AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext",

kdelibs-3.5.5-lib_loader-1.2.patch:

--- NEW FILE kdelibs-3.5.5-lib_loader-1.2.patch ---

 kdecore/Makefile.am    |    2 +
 kdecore/klibloader.cpp |   86 +++++++++++++++++++++++++++----------------------
 kdecore/klibloader.h   |    2 -
 kinit/kinit.cpp        |    8 +---
 4 files changed, 55 insertions(+), 43 deletions(-)

--- kdelibs-3.5.5/kdecore/Makefile.am.orig	2006-10-01 19:33:38.000000000 +0200
+++ kdelibs-3.5.5/kdecore/Makefile.am	2007-01-05 00:17:27.235678750 +0100
@@ -115,8 +115,10 @@
 	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
 	kqiodevicegzip_p.cpp ktimezones.cpp
 
+CXXFLAGS += -fexceptions
 libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
 libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
+libkdecore_la_LIBADD += -lboost_filesystem -lboost_regex
 libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
 libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
 	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
--- kdelibs-3.5.5/kdecore/klibloader.h.orig	2005-10-10 17:06:03.000000000 +0200
+++ kdelibs-3.5.5/kdecore/klibloader.h	2007-01-04 23:19:39.868039250 +0100
@@ -270,7 +270,7 @@
      * wants to open modules.
      * @param name of the library. If it is not a path, the function searches in
      *             the "module" and "lib" resources. If there is no extension,
-     *             ".la" will be appended.
+     *             ".so*" will be appended.
      * @param instance a KInstance used to get the standard paths
      */
     static QString findLibrary( const char * name, const KInstance * instance = KGlobal::instance() );
--- kdelibs-3.5.5/kdecore/klibloader.cpp.orig	2006-01-19 17:06:18.000000000 +0000
+++ kdelibs-3.5.5/kdecore/klibloader.cpp	2007-01-05 00:08:39.215039750 +0000
@@ -331,43 +331,59 @@
     d = 0L;
 }
 
-static inline QCString makeLibName( const char* name )
+#include <boost/filesystem/exception.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/regex.hpp>
+
+QCString makeSharedLibraryName( char const* name, QString const& dir )
 {
-    QCString libname(name);
-    // only append ".la" if there is no extension
-    // this allows to load non-libtool libraries as well
-    // (mhk, 20000228)
-    int pos = libname.findRev('/');
-    if (pos < 0)
-      pos = 0;
-    if (libname.find('.', pos) < 0)
-      libname += ".la";
-    return libname;
+	try
+	{
+		boost::filesystem::path d( dir.ascii() );
+		std::string p = d.string() + "/" + name + ".so";
+		if ( boost::filesystem::exists( p ) )
+			return p.c_str();
+		boost::regex re( p + "\\..+", boost::regex::extended );
+		for ( boost::filesystem::directory_iterator i( d );
+			i != boost::filesystem::directory_iterator(); ++i )
+		{
+			boost::smatch m;
+			if ( boost::regex_match( i->string(), m, re ) )
+				return m.str().c_str();
+		}
+	}
+	catch ( boost::filesystem::filesystem_error const& )
+	{
+	}
+	return QCString();
 }
 
-//static
 QString KLibLoader::findLibrary( const char * name, const KInstance * instance )
 {
-    QCString libname = makeLibName( name );
-
-    // only look up the file if it is not an absolute filename
-    // (mhk, 20000228)
-    QString libfile;
-    if (!QDir::isRelativePath(libname))
-      libfile = QFile::decodeName( libname );
-    else
-    {
-      libfile = instance->dirs()->findResource( "module", libname );
-      if ( libfile.isEmpty() )
-      {
-        libfile = instance->dirs()->findResource( "lib", libname );
-#ifndef NDEBUG
-        if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for kdeinit modules
-          kdDebug(150) << "library " << libname << " not found under 'module' but under 'lib'" << endl;
-#endif
-      }
-    }
-    return libfile;
+	try
+	{
+		if ( boost::filesystem::exists( name ) )
+			return name;
+	}
+	catch ( boost::filesystem::filesystem_error const& )
+	{
+	}
+	QStringList dirs = instance->dirs()->resourceDirs( "module" );
+	for ( QStringList::ConstIterator i = dirs.begin(); i != dirs.end(); ++i )
+	{
+		QCString p = makeSharedLibraryName( name, *i );
+		if ( !p.isNull() )
+			return p;
+	}
+	dirs = instance->dirs()->resourceDirs( "lib" );
+	for ( QStringList::ConstIterator i = dirs.begin(); i != dirs.end(); ++i )
+	{
+		QCString p = makeSharedLibraryName( name, *i );
+		if ( !p.isNull() )
+			return p;
+	}
+	return QString::null;
 }
 
 
@@ -418,11 +434,7 @@
       QString libfile = findLibrary( name );
       if ( libfile.isEmpty() )
       {
-        const QCString libname = makeLibName( name );
-#ifndef NDEBUG
-        kdDebug(150) << "library=" << name << ": No file named " << libname << " found in paths." << endl;
-#endif
-        d->errorMessage = i18n("Library files for \"%1\" not found in paths.").arg(libname);
+        d->errorMessage = i18n("Library files for \"%1\" not found in paths.").arg(name);
         return 0;
       }
 
--- kdelibs-3.5.5/kinit/kinit.cpp.orig	2006-10-01 19:33:32.000000000 +0200
+++ kdelibs-3.5.5/kinit/kinit.cpp	2007-01-04 23:39:00.780591750 +0100
@@ -447,7 +447,7 @@
   {
      /* Relative name without '.la' */
      name = _name;
-     lib = name + ".la";
+     lib = name;
      exec = name;
      libpath = QFile::encodeName(KLibLoader::findLibrary( lib, s_instance ));
      execpath = execpath_avoid_loops( exec, envc, envs, avoid_loops );
@@ -458,9 +458,7 @@
      name = _name;
      name = name.mid( name.findRev('/') + 1);
      exec = _name;
-     if (lib.right(3) == ".la")
-        libpath = lib;
-     else
+     if ( libpath.findRev( ".so" ) == -1 )
         execpath = exec;
   }
   if (!args)
@@ -1807,7 +1805,7 @@
 #ifndef __CYGWIN__
    if (!d.suicide && !getenv("KDE_IS_PRELINKED"))
    {
-      QString konq = locate("lib", "libkonq.la", s_instance);
+      QString konq = KLibLoader::findLibrary( "libkonq", s_instance );
       if (!konq.isEmpty())
 	  (void) lt_dlopen(QFile::encodeName(konq).data());
    }

kdelibs-3.5.6-lang.patch:

--- NEW FILE kdelibs-3.5.6-lang.patch ---
--- kdelibs-3.5.6/kdecore/klocale.cpp.orig	2007-05-22 17:49:31.000000000 +0200
+++ kdelibs-3.5.6/kdecore/klocale.cpp	2007-05-23 20:37:54.000000000 +0200
@@ -140,9 +140,11 @@ void KLocale::initLanguageList(KConfig *
   KConfigGroupSaver saver(config, "Locale");
 
   m_country = config->readEntry( "Country" );
-  if ( m_country.isEmpty() )
-    m_country = defaultCountry();
-
+  if ( m_country.isEmpty() ) {
+    QString ln, ct, chrset;
+    splitLocale(QString(::getenv("LANG")), ln, ct, chrset);
+    m_country = (ct.isEmpty()) ? defaultCountry() : ct.lower();
+  }
   // Reset the list and add the new languages
   QStringList languageList;
   if ( useEnv )

kdelibs-3.5.7-ICEauthority.patch:

--- NEW FILE kdelibs-3.5.7-ICEauthority.patch ---
--- kdelibs-3.5.7/kdecore/kapplication.cpp.orig	2007-05-20 22:04:53.000000000 +0200
+++ kdelibs-3.5.7/kdecore/kapplication.cpp	2007-05-20 22:38:53.000000000 +0200
@@ -774,6 +774,12 @@
 
 void KApplication::init(bool GUIenabled)
 {
+  if (getuid() == 0) { 
+    setenv("ICEAUTHORITY", "/root/.ICEauthority", 0); 
+    setenv("KDEROOTHOME", "/root/.kde", 0); 
+    setenv("HOME", "/root", 1); 
+  } 
+
   d->guiEnabled = GUIenabled;
   if ((getuid() != geteuid()) ||
       (getgid() != getegid()))

kdelibs-3.5.7-kde#146105.patch:

--- NEW FILE kdelibs-3.5.7-kde#146105.patch ---
Index: kdecore/kcmdlineargs.cpp
===================================================================
--- kdecore/kcmdlineargs.cpp	(Revision 669593)
+++ kdecore/kcmdlineargs.cpp	(Revision 669594)
@@ -1248,21 +1248,22 @@
 
 KURL KCmdLineArgs::makeURL(const char *_urlArg)
 {
-   QString urlArg = QFile::decodeName(_urlArg);
-   if (!QDir::isRelativePath(urlArg))
-   {
+   const QString urlArg = QFile::decodeName(_urlArg);
+   QFileInfo fileInfo(urlArg);
+   if (!fileInfo.isRelative()) { // i.e. starts with '/', on unix
       KURL result;
       result.setPath(urlArg);
       return result; // Absolute path.
    }
 
-   if ( !KURL::isRelativeURL(urlArg) )
-     return KURL(urlArg); // Argument is a URL
+   if ( KURL::isRelativeURL(urlArg) || fileInfo.exists() ) {
+      KURL result;
+      result.setPath( cwd()+'/'+urlArg );
+      result.cleanPath();
+      return result;  // Relative path
+   }
 
-   KURL result;
-   result.setPath( cwd()+"/"+urlArg );
-   result.cleanPath();
-   return result;  // Relative path
+   return KURL(urlArg); // Argument is a URL
 }
 
 void


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	25 Jan 2007 14:07:12 -0000	1.38
+++ .cvsignore	15 Jun 2007 18:09:56 -0000	1.39
@@ -13,3 +13,4 @@
 kdelibs-3.5.3.tar.bz2
 kdelibs-3.5.4.tar.bz2
 kdelibs-3.5.6.tar.bz2
+kdelibs-3.5.7.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- kdelibs.spec	17 May 2007 15:19:44 -0000	1.210
+++ kdelibs.spec	15 Jun 2007 18:09:56 -0000	1.211
@@ -11,7 +11,7 @@
 %define cups_epoch 1
 
 %define qt_version 3.3.8
-%define arts_version 1.5.6
+%define arts_version 1.5.7
 %define kde_major_version 3
 
 %global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
@@ -22,9 +22,9 @@
 
 Name:    kdelibs
 Summary: K Desktop Environment - Libraries
-Epoch:	 6
-Version: 3.5.6
-Release: 9%{?dist}
+Epoch:   6
+Version: 3.5.7
+Release: 2%{?dist}
 
 License: LGPL
 Url: http://www.kde.org/
@@ -50,39 +50,46 @@
 Patch39: kdelibs-3.5.4-kabc-make.patch
 Patch40: kdelibs-3.5.4-kdeprint-utf8.patch
 Patch41: kdelibs-3.5.6-utempter.patch
+Patch42: kdelibs-3.5.7-ICEauthority.patch
+Patch43: kdelibs-3.5.6-lang.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch104: kdelibs-3.5.5-kstandarddirs.patch
 
 # upstream patches
-Patch500: kdelibs-3.5.6-qt3.3.8.patch
-Patch501: kdelibs-3.5.6-kde#126812.patch
 # kget ignores simultaneous download limit (kde #101956)
-Patch101956: kdelibs-3.5.0-101956.patch
+Patch502: kdelibs-3.5.0-101956.patch
 # automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
-Patch137675: kdelibs-3.5.6-137675.patch
-## http://bugs.kde.org/140768
-Patch140768: kdelibs-3.5.6-kde#140768.patch
-
-# security issue
-# CVE-2007-0537
-Patch1000: kdelibs-3.5.6-bz#225420-CVE-2007-0537.patch
+Patch503: kdelibs-3.5.6-137675.patch
+Patch505: kdelibs-3.5.7-kde#146105.patch
+# http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
+Patch93359: kde-3.5-libtool-shlibext.patch
+## See http://bugs.kde.org/139445, patch needs boost-devel
+Patch139445: kdelibs-3.5.5-lib_loader-1.2.patch
+BuildRequires: boost-devel
 
 Requires: arts >= %{arts_epoch}:%{arts_version}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
 Requires: cups-libs >= %{cups_epoch}:1.1.12
 Requires: hicolor-icon-theme
-Requires: iceauth
 %if %{kde_settings}
 Requires: kde-settings >= 3.5
 %endif
-Requires: libkdnssd
-## don't think these are *strictly* required anymore, and if so,
-## should prolly be in kdebase -- Rex
-#Requires: redhat-artwork >= 0.239-2
-#Requires: desktop-backgrounds-basic
-Requires: redhat-menus >= 5.0.4
+Requires: redhat-menus
 Requires: shadow-utils
+# kdesu/sudo support, http://bugs.kde.org/20914
+BuildRequires: sudo
+Requires(hint): sudo
+# dnssd, FIXME/TODO
+#BuildRequires: mDNSResponder-devel
+
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define libkdnssd libkdnssd
+Requires: libkdnssd
+%define BuildRequires: xorg-x11-proto-devel libX11-devel
+%define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
+Requires: iceauth
+%endif
 
 Requires(pre): coreutils
 Requires(post): /sbin/ldconfig
@@ -91,11 +98,11 @@
 BuildRequires: gettext
 BuildRequires: pcre-devel
 BuildRequires: cups-devel >= %{cups_epoch}:1.1.20, cups
-BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}, qt-devel-docs
+BuildRequires: qt-devel qt-devel-docs
 BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
-BuildRequires: libxslt-devel >= 1.1.15
+BuildRequires: libxslt-devel
 BuildRequires: sgml-common
 BuildRequires: openjade
 BuildRequires: jadetex
@@ -115,14 +122,19 @@
 BuildRequires: libtiff-devel
 BuildRequires: libacl-devel libattr-devel
 BuildRequires: aspell-devel
-# +keyutils-libs-devel until krb5-devel's Req's are fixed 
-BuildRequires: krb5-devel keyutils-libs-devel
+BuildRequires: krb5-devel
 BuildRequires: openldap-devel
 BuildRequires: db4-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: pkgconfig
 BuildRequires: glibc-kernheaders
+%if 0%{?fedora} > 5 || 0%{?rhel} > 4
+# See also http://bugzilla.redhat.com/205767
+%define _with_libutempter 1
 BuildRequires: libutempter-devel
+%else
+BuildRequires: utempter
+%endif
 BuildRequires: findutils
 BuildRequires: jasper-devel
 BuildRequires: OpenEXR-devel
@@ -143,7 +155,7 @@
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: qt-devel
 Requires: arts-devel
-Requires: libkdnssd-devel
+%{?libkdnssd:Requires: libkdnssd-devel}
 ## those below can/should be omitted from future builds -- Rex
 Requires: libart_lgpl-devel
 Requires: libxslt-devel
@@ -155,7 +167,6 @@
 Requires: libidn-devel
 Requires: libacl-devel
 Requires: pcre-devel
-Requires: libutempter-devel
 %description devel
 This package includes the header files you will need to compile
 applications for KDE.
@@ -188,18 +199,17 @@
 %patch38 -p1 -b .cupsdconf2-group
 %patch39 -p1 -b .kabc-make
 %patch40 -p1 -b .kdeprint-utf8
-%patch41 -p1 -b .utempter
+%{?_with_libutempter:%patch41 -p1 -b .utempter}
+%patch42 -p1 -b .ICEauthority
+%patch43 -p1 -b .lang
 
 %patch104 -p1 -b .kstandarddirs
 
 # upstream patches
-%patch500 -p0 -b .qt3.3.8
-%patch501 -p1 -b .kde#126812
-%patch137675 -p0 -b .kde#137675
-%patch140768 -p1 -b .kde#140768
-
-# security
-%patch1000 -p0 -b .bz#225420-CVE-2007-0537
+%patch503 -p0 -b .kde#137675
+%patch505 -p0 -b .kde#146105
+%patch93359 -p1 -b .libtool-shlibext
+%patch139445 -p1 -b .kde#139445
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -212,7 +222,8 @@
 unset QTDIR && . /etc/profile.d/qt.sh
 
 export QTDOC=%{qtdocdir}
-export libltdl_cv_shlibext=".so"
+# use patch93359 instead
+#export libltdl_cv_shlibext=".so"
 
 if [ -x /etc/profile.d/krb5.sh ]; then
   . /etc/profile.d/krb5.sh
@@ -243,12 +254,14 @@
    --enable-inotify \
    --with-utempter \
    %{!?arts:--without-arts} \
-   --with-rgbfile=%{_datadir}/X11/rgb.txt \
+   %{?_with_rgbfile} \
    --with-jasper \
    --with-openexr \
    --with-xinerama
 
 make %{?_smp_mflags}
+
+# FIXME/TODO: build as noarch?  -- Rex
 %if %{apidocs}
 make %{?_smp_mflags} apidox
 %endif
@@ -323,8 +336,8 @@
 
 ## unpackaged files
 # libkdnssd bits
-rm -f %{buildroot}%{_libdir}/libkdnssd.*
-rm -rf %{buildroot}%{_includedir}/kde/dnssd
+rm -f %{buildroot}%{_libdir}/libkdnssd.la
+%{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
 
 
 %clean
@@ -459,6 +472,20 @@
 
 
 %changelog
+* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
+- include experimental libtool patches
+
+* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
+- kdesu: sudo support (kde bug #20914), Requires(hint): sudo
+
+* Wed Jun 06 2007 Than Ngo <than at redhat.com> -  6:3.5.7-0.1.fc7
+- 3.5.7
+
+* Thu May 24 2007 Than Ngo <than at redhat.com> 6:3.5.6-10.fc7
+- don't change permission .ICEauthority by sudo KDE programs
+- apply patch to fix locale issue
+- apply upstream patch to fix kde#146105
+
 * Thu May 16 2007 Rex Dieter <rdieter[AT]fedorproject.org> - 6:3.5.6-9
 - make qtdocdir handling robust
 - kde_settings=1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	25 Jan 2007 14:07:12 -0000	1.50
+++ sources	15 Jun 2007 18:09:56 -0000	1.51
@@ -1 +1 @@
-e4d137879a66e92b895b3de5413a61d8  kdelibs-3.5.6.tar.bz2
+50ed644f2ec91963570fe2b155652957  kdelibs-3.5.7.tar.bz2


--- kdelibs-3.5.6-bz#225420-CVE-2007-0537.patch DELETED ---


--- kdelibs-3.5.6-kde#126812.patch DELETED ---


--- kdelibs-3.5.6-kde#140768.patch DELETED ---


--- kdelibs-3.5.6-qt3.3.8.patch DELETED ---




More information about the fedora-extras-commits mailing list