rpms/kdelibs/F-7 kde-3.5-libtool-shlibext.patch, NONE, 1.1 kdelibs.spec, 1.214, 1.215

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1588

Modified Files:
	kdelibs.spec 
Added Files:
	kde-3.5-libtool-shlibext.patch 
Log Message:
* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
- include (but don't apply/use) experimental libtool patches
- kdesu: sudo support (kde bug #20914), Requires(hint): sudo


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",


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- kdelibs.spec	6 Jun 2007 13:26:23 -0000	1.214
+++ kdelibs.spec	11 Jun 2007 16:23:24 -0000	1.215
@@ -24,7 +24,7 @@
 Summary: K Desktop Environment - Libraries
 Epoch:   6
 Version: 3.5.7
-Release: 0.1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Url: http://www.kde.org/
@@ -62,6 +62,10 @@
 # automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
 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
+Patch139445: kdelibs-3.5.5-lib_loader-1.2.patch
 
 Requires: arts >= %{arts_epoch}:%{arts_version}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -72,12 +76,11 @@
 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: shadow-utils
+# kdesu/sudo support, http://bugs.kde.org/20914
+BuildRequires: sudo
+Requires(hint): sudo
 
 Requires(pre): coreutils
 Requires(post): /sbin/ldconfig
@@ -110,8 +113,7 @@
 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
@@ -192,6 +194,8 @@
 # upstream patches
 %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
 
@@ -451,6 +455,10 @@
 
 
 %changelog
+* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
+- include (but don't apply/use) experimental libtool patches
+- 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