rpms/kdenetwork/devel kdenetwork-4.0.3-libidn.patch, NONE, 1.1 kdenetwork.spec, 1.133, 1.134

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Sat Mar 29 03:15:52 UTC 2008


Author: kkofler

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

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.0.3-libidn.patch 
Log Message:
* Sat Mar 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-2
- look for libidn in /lib${LIB_SUFFIX} if pkgconfig lies (see #439549) (#439465)

kdenetwork-4.0.3-libidn.patch:

--- NEW FILE kdenetwork-4.0.3-libidn.patch ---
diff -ur kdenetwork-4.0.3/cmake/modules/FindIDN.cmake kdenetwork-4.0.3-libidn/cmake/modules/FindIDN.cmake
--- kdenetwork-4.0.3/cmake/modules/FindIDN.cmake	2008-01-05 00:58:34.000000000 +0100
+++ kdenetwork-4.0.3-libidn/cmake/modules/FindIDN.cmake	2008-03-29 04:05:33.000000000 +0100
@@ -25,6 +25,7 @@
   FIND_LIBRARY(IDN_LIBRARY NAMES idn
     PATHS
     ${_IDNLinkDir} 
+    /lib${LIB_SUFFIX}
     NO_DEFAULT_PATH 
   )
 ELSE (NOT WIN32)


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- kdenetwork.spec	28 Mar 2008 17:45:22 -0000	1.133
+++ kdenetwork.spec	29 Mar 2008 03:15:15 -0000	1.134
@@ -6,30 +6,19 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# look for libidn in /lib${LIB_SUFFIX} if pkgconfig lies to work around #439549
+Patch0: kdenetwork-4.0.3-libidn.patch
 
 # upstream patches
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# FIXME/TODO: Missing BRs from CMakeCache.txt
-# DNSSD_INCLUDE_DIR:PATH=DNSSD_INCLUDE_DIR-NOTFOUND
-# LIBVNCCLIENT_INCLUDE_DIR:PATH=LIBVNCCLIENT_INCLUDE_DIR-NOTFOUND
-# LIBVNCCLIENT_LIBRARIES:FILEPATH=LIBVNCCLIENT_LIBRARIES-NOTFOUND
-# LIBVNCSERVER_INCLUDE_DIR:PATH=LIBVNCSERVER_INCLUDE_DIR-NOTFOUND
-# LIBVNCSERVER_LIBRARIES:FILEPATH=LIBVNCSERVER_LIBRARIES-NOTFOUND
-# QT_QTMOTIF_INCLUDE_DIR:PATH=QT_QTMOTIF_INCLUDE_DIR-NOTFOUND
-# QT_QTMOTIF_LIBRARY:FILEPATH=QT_QTMOTIF_LIBRARY-NOTFOUND
-# QT_QTNSPLUGIN_INCLUDE_DIR:PATH=QT_QTNSPLUGIN_INCLUDE_DIR-NOTFOUND
-# QT_QTNSPLUGIN_LIBRARY:FILEPATH=QT_QTNSPLUGIN_LIBRARY-NOTFOUND
-# Is this one already used?
-# QT_TAPIOCA_LIBRARY:FILEPATH=QT_TAPIOCA_LIBRARY-NOTFOUND
-
 BuildRequires: avahi-compat-libdns_sd-devel
 BuildRequires: boost-devel
 BuildRequires: cmake
@@ -100,6 +89,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .libidn
 
 %build
 mkdir -p %{_target_platform}
@@ -176,6 +166,9 @@
 
 
 %changelog
+* Sat Mar 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-2
+- look for libidn in /lib${LIB_SUFFIX} if pkgconfig lies (see #439549) (#439465)
+
 * Fri Mar 28 2008 Than Ngo <than at redhat.com> 4.0.3-1
 - 4.0.3
 - drop kdenetwork-4.0.2-kopete-crash.patch, it's included in 4.0.3




More information about the fedora-extras-commits mailing list