rpms/kdepimlibs/devel kdepimlibs-3.92.0-kde4home.diff, NONE, 1.1 kdepimlibs.spec, 1.2, 1.3 kdepimlibs-3.91.0-kde4home.diff, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Sun Jul 29 19:26:12 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15337
Modified Files:
kdepimlibs.spec
Added Files:
kdepimlibs-3.92.0-kde4home.diff
Removed Files:
kdepimlibs-3.91.0-kde4home.diff
Log Message:
update description
update kde4home patch (thanks Kevin!)
kdepimlibs-3.92.0-kde4home.diff:
--- NEW FILE kdepimlibs-3.92.0-kde4home.diff ---
diff -ur kdepimlibs-3.92.0/kabc/HOWTO kdepimlibs-3.92.0-kde4home/kabc/HOWTO
--- kdepimlibs-3.92.0/kabc/HOWTO 2007-05-03 10:36:21.000000000 +0200
+++ kdepimlibs-3.92.0-kde4home/kabc/HOWTO 2007-07-29 17:03:02.000000000 +0200
@@ -344,7 +344,7 @@
a pointer to a KABC::AddressBook, because he has to resolve the stored uids to
currently available email addresses.
In line 4 the manager loads all distribution lists from the central config file
-$HOME/.kde/share/apps/kabc/distlists.
+$HOME/.kde4/share/apps/kabc/distlists.
The next line queries the names of all available distribution lists, which are
used in line 9 to retrieve a pointer to the specific list.
Now that you have a KABC::DistributionList object, you can performe the
diff -ur kdepimlibs-3.92.0/kabc/scripts/createisomap.pl kdepimlibs-3.92.0-kde4home/kabc/scripts/createisomap.pl
--- kdepimlibs-3.92.0/kabc/scripts/createisomap.pl 2006-10-26 04:06:01.000000000 +0200
+++ kdepimlibs-3.92.0-kde4home/kabc/scripts/createisomap.pl 2007-07-29 17:03:02.000000000 +0200
@@ -4,7 +4,7 @@
# files in kdebase/l10n/*/
#
# USAGE EXAMPLE:
-# ./createisomap.pl $KDEDIR/share/locale/l10n > countrytransl.map
+# ./createisomap.pl $KDE4DIR/share/locale/l10n > countrytransl.map
#
# Don't laugh at me. I put this together with an old perl book, perl
# being a language I've never used before.
diff -ur kdepimlibs-3.92.0/kcal/tests/data/resource_test_config kdepimlibs-3.92.0-kde4home/kcal/tests/data/resource_test_config
--- kdepimlibs-3.92.0/kcal/tests/data/resource_test_config 2006-10-26 04:06:38.000000000 +0200
+++ kdepimlibs-3.92.0-kde4home/kcal/tests/data/resource_test_config 2007-07-29 17:03:04.000000000 +0200
@@ -1,5 +1,5 @@
[Resource_test_ical]
-CalendarURL=file:$KDEHOME/test.ics
+CalendarURL=file:$KDE4HOME/test.ics
Format=ical
ResourceIdentifier=sUiQkXeIro
ResourceIsActive=true
diff -ur kdepimlibs-3.92.0/kcal/tests/testresource.cpp kdepimlibs-3.92.0-kde4home/kcal/tests/testresource.cpp
--- kdepimlibs-3.92.0/kcal/tests/testresource.cpp 2007-07-26 12:35:17.000000000 +0200
+++ kdepimlibs-3.92.0-kde4home/kcal/tests/testresource.cpp 2007-07-29 17:03:04.000000000 +0200
@@ -48,8 +48,8 @@
int main(int argc, char *argv[])
{
// Use another directory than the real one, just to keep things clean
- // KDEHOME needs to be writable though, for a ksycoca database
- setenv( "KDEHOME", QFile::encodeName( QDir::homePath() + "/.kde-testresource" ), true );
+ // KDE4HOME needs to be writable though, for a ksycoca database
+ setenv( "KDE4HOME", QFile::encodeName( QDir::homePath() + "/.kde4-testresource" ), true );
setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
KAboutData aboutData("testresource", 0, ki18n("Part of LibKCal's test suite."), "0.1");
diff -ur kdepimlibs-3.92.0/kmime/tests/test_kmime_codec.cpp kdepimlibs-3.92.0-kde4home/kmime/tests/test_kmime_codec.cpp
--- kdepimlibs-3.92.0/kmime/tests/test_kmime_codec.cpp 2007-05-03 10:36:21.000000000 +0200
+++ kdepimlibs-3.92.0-kde4home/kmime/tests/test_kmime_codec.cpp 2007-07-29 17:03:04.000000000 +0200
@@ -1,6 +1,6 @@
/* test program for KMime::Codec's:
compile with:
- g++ -I$QTDIR/include -I$KDEDIR/include -L$QTDIR/lib -L$KDEDIR/lib \
+ g++ -I$QTDIR/include -I$KDE4DIR/include -L$QTDIR/lib -L$KDE4DIR/lib \
-lqt-mt -lkdecore -lkdenetwork -O2 -pthread -DQT_THREAD_SUPPORT \
-o test_kmime_codec{,.cpp}
*/
diff -ur kdepimlibs-3.92.0/kresources/idmapper.h kdepimlibs-3.92.0-kde4home/kresources/idmapper.h
--- kdepimlibs-3.92.0/kresources/idmapper.h 2007-06-27 12:40:38.000000000 +0200
+++ kdepimlibs-3.92.0-kde4home/kresources/idmapper.h 2007-07-29 17:03:04.000000000 +0200
@@ -65,7 +65,7 @@
or save().
The current implementation stores the data at
- $(KDEHOME)/share/apps/\<path\>/\<identifier\>.
+ $(KDE4HOME)/share/apps/\<path\>/\<identifier\>.
@param path Category of mapping (path into the mapping namespace)
@param identifier The concrete mapping object (filename in namespace)
diff -ur kdepimlibs-3.92.0/kresources/README.design kdepimlibs-3.92.0-kde4home/kresources/README.design
--- kdepimlibs-3.92.0/kresources/README.design 2006-10-26 04:06:00.000000000 +0200
+++ kdepimlibs-3.92.0-kde4home/kresources/README.design 2007-07-29 17:03:04.000000000 +0200
@@ -42,7 +42,7 @@
and they are managed by the ResourceManager for the calendar
resource family. The list of resources, and the settings for
each resource, are stored by the resource manager using KConfig,
-in $HOME/.kde/share/config/<family>.
+in $HOME/.kde4/share/config/<family>.
The resource manager is a singleton object for every resource family.
Use the resource manager to get the list of available resource types
Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdepimlibs.spec 29 Jul 2007 02:18:56 -0000 1.2
+++ kdepimlibs.spec 29 Jul 2007 19:25:40 -0000 1.3
@@ -22,7 +22,7 @@
%endif
# use ~/.kde4 instead of ~/.kde
-Patch0: kdepimlibs-3.91.0-kde4home.diff
+Patch0: kdepimlibs-%{version}-kde4home.diff
Obsoletes: kdepimlibs4 < %{version}-%{release}
Provides: kdepimlibs4 = %{version}-%{release}
@@ -33,13 +33,13 @@
BuildRequires: cmake
BuildRequires: cyrus-sasl-devel
BuildRequires: kdelibs4-devel >= %{version}
-BuildRequires: libXtst-devel libXpm-devel
+BuildRequires: libXpm-devel libXtst-devel
BuildRequires: openldap-devel
%description
Personal Information Management (PIM) libraries for the
K Desktop Environment 4.
-WARNING: This is an alpha version. It probably has many bugs left.
+WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).
%package devel
@@ -49,12 +49,9 @@
Obsoletes: kdepimlibs4-devel < %{version}-%{release}
Provides: kdepimlibs4-devel = %{version}-%{release}
Requires: kdelibs4-devel
-# FIXME/TODO: trim these down -- Rex
-Requires: openldap-devel libXtst-devel libXpm-devel cyrus-sasl-devel
-Requires: boost-devel
%description devel
Header files for developing applications using %{name}.
-WARNING: This is an beta version. It probably has many bugs left.
+WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).
--- kdepimlibs-3.91.0-kde4home.diff DELETED ---
More information about the fedora-extras-commits
mailing list