rpms/kdepim/F-8 kdepim-3.5.9-gnokii-no-libintl.patch, NONE, 1.1 kdepim.spec, 1.147, 1.148
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Apr 11 15:05:13 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/kdepim/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3122/F-8
Modified Files:
kdepim.spec
Added Files:
kdepim-3.5.9-gnokii-no-libintl.patch
Log Message:
sync w/devel branch
kdepim-3.5.9-gnokii-no-libintl.patch:
--- NEW FILE kdepim-3.5.9-gnokii-no-libintl.patch ---
--- configure.in.in
+++ configure.in.in
@@ -45,8 +45,8 @@ AC_DEFUN([KDE_CHECK_GNOKII],
[ LIB_GNOKII="-lgnokii $LIB_BLUETOOTH" ],
[
AC_CHECK_LIB(gnokii, gn_cfg_get,
- [ LIB_GNOKII="-lgnokii -lintl $LIB_BLUETOOTH" ],
- [], $all_libraries -lintl -lXpm -lX11 $LIB_BLUETOOTH )
+ [ LIB_GNOKII="-lgnokii $LIB_BLUETOOTH" ],
+ [], $all_libraries -lXpm -lX11 $LIB_BLUETOOTH )
],
$all_libraries -lXpm -lX11 $LIB_BLUETOOTH )
AC_SUBST(LIB_GNOKII)
Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-8/kdepim.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- kdepim.spec 27 Feb 2008 20:43:13 -0000 1.147
+++ kdepim.spec 11 Apr 2008 15:04:33 -0000 1.148
@@ -35,9 +35,9 @@
# script used to generate svn checkout Source0 above
Source1: kdepim-enterprise-svn_checkout.sh
-Release: 6.%{ent_date}svn.ent%{?dist}
+Release: 9.%{ent_date}svn.ent%{?dist}
%else
-Release: 6%{?dist}
+Release: 9%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
%endif
@@ -48,6 +48,8 @@
Patch1: kdepim-3.4.0-kandy-icons.patch
Patch2: kdepim-xdg_open.patch
+# patch by Dirk Müller from openSUSE to fix gnokii detection
+Patch6: kdepim-3.5.9-gnokii-no-libintl.patch
## upstream patches
# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.9/kdepim/kitchensync@774532 \
@@ -103,6 +105,8 @@
BuildRequires: automake libtool
%endif
+Requires: kdebase3-pim-ioslaves
+
%define akregator_ver 1.2.7
Obsoletes: akregator < 0:%{akregator_ver}-%{release}
#Provides: akregator = 0:%{akregator_ver}-%{release}
@@ -145,8 +149,6 @@
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: kdelibs3 >= %{version}
-# helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description libs
@@ -168,6 +170,8 @@
%patch2 -p1 -b .xdg_open
+%patch6 -p0 -b .gnokii
+
%if 0%{?fedora} > 8
pushd kitchensync
%patch3 -p0 -b .opensync03
@@ -310,6 +314,15 @@
%changelog
+* Fri Apr 11 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-9
+- omit multilib upgrade hacks (see also #441222)
+
+* Tue Apr 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.9-8
+- add Requires: kdebase3-pim-ioslaves (#441541)
+
+* Tue Apr 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.9-7
+- fix gnokii detection (thanks to Dirk Müller)
+
* Wed Feb 27 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-6
- "Enterprise headers" makes impossible to select text in
first paragraph of body (kde#151150)
More information about the scm-commits
mailing list