Author: rdieter
Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5630/devel
Modified Files:
.cvsignore sources
Added Files:
kdepimlibs-3.91.0-kde4home.diff kdepimlibs.spec
Log Message:
import
kdepimlibs-3.91.0-kde4home.diff:
--- NEW FILE kdepimlibs-3.91.0-kde4home.diff ---
diff -ur kdepimlibs-3.91.0/kabc/HOWTO kdepimlibs-3.91.0-kde4home/kabc/HOWTO
--- kdepimlibs-3.91.0/kabc/HOWTO 2007-05-03 10:36:21.000000000 +0200
+++ kdepimlibs-3.91.0-kde4home/kabc/HOWTO 2007-06-27 23:08:42.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.91.0/kabc/scripts/createisomap.pl kdepimlibs-3.91.0-kde4home/kabc/scripts/createisomap.pl
--- kdepimlibs-3.91.0/kabc/scripts/createisomap.pl 2006-10-26 04:06:01.000000000 +0200
+++ kdepimlibs-3.91.0-kde4home/kabc/scripts/createisomap.pl 2007-06-27 23:08:42.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.91.0/kcal/tests/data/resource_test_config kdepimlibs-3.91.0-kde4home/kcal/tests/data/resource_test_config
--- kdepimlibs-3.91.0/kcal/tests/data/resource_test_config 2006-10-26 04:06:38.000000000 +0200
+++ kdepimlibs-3.91.0-kde4home/kcal/tests/data/resource_test_config 2007-06-27 23:08:43.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.91.0/kcal/tests/testresource.cpp kdepimlibs-3.91.0-kde4home/kcal/tests/testresource.cpp
--- kdepimlibs-3.91.0/kcal/tests/testresource.cpp 2007-06-27 12:40:53.000000000 +0200
+++ kdepimlibs-3.91.0-kde4home/kcal/tests/testresource.cpp 2007-06-27 23:08:43.000000000 +0200
@@ -59,8 +59,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", "Part of LibKCal's test suite.", "0.1");
diff -ur kdepimlibs-3.91.0/kmime/tests/test_kmime_codec.cpp kdepimlibs-3.91.0-kde4home/kmime/tests/test_kmime_codec.cpp
--- kdepimlibs-3.91.0/kmime/tests/test_kmime_codec.cpp 2007-05-03 10:36:21.000000000 +0200
+++ kdepimlibs-3.91.0-kde4home/kmime/tests/test_kmime_codec.cpp 2007-06-27 23:08:43.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.91.0/kresources/idmapper.h kdepimlibs-3.91.0-kde4home/kresources/idmapper.h
--- kdepimlibs-3.91.0/kresources/idmapper.h 2007-06-27 12:40:38.000000000 +0200
+++ kdepimlibs-3.91.0-kde4home/kresources/idmapper.h 2007-06-27 23:08:43.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.91.0/kresources/README.design kdepimlibs-3.91.0-kde4home/kresources/README.design
--- kdepimlibs-3.91.0/kresources/README.design 2006-10-26 04:06:00.000000000 +0200
+++ kdepimlibs-3.91.0-kde4home/kresources/README.design 2007-06-27 23:08:43.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
--- NEW FILE kdepimlibs.spec ---
Name: kdepimlibs
Version: 3.91.0
Release: 3%{?dist}%{?kde}
Summary: K Desktop Environment 4 - PIM Libraries
License: LGPL
Group: System Environment/Libraries
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 7
# wee!
%else
%define _prefix /opt/kde4
# macros sensitive to _prefix mods
%define __cmake cmake
%define _sysconfdir %{_prefix}/etc
%endif
# use ~/.kde4 instead of ~/.kde
Patch0: kdepimlibs-%{version}-kde4home.diff
Obsoletes: kdepimlibs4 < %{version}-%{release}
Provides: kdepimlibs4 = %{version}-%{release}
Requires: kdelibs4 >= %{version}
BuildRequires: cmake
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: openldap-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: libXtst-devel libXpm-devel
BuildRequires: boost-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.
Also, the API and ABI are NOT fully stable yet (soft freeze only).
%package devel
Group: Development/Libraries
Summary: Header files for kdepimlibs4
Requires: %{name} = %{version}-%{release}
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 kdepimlibs4.
WARNING: This is an alpha version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).
%prep
%setup -q -n kdepimlibs-%{version}
%if "%{_prefix}" != "/usr"
%patch0 -p1 -b .kde4home
%endif
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
-DSHARE_INSTALL_PREFIX=%{_datadir} \
-DINCLUDE_INSTALL_DIR=%{_includedir} \
-DLIB_INSTALL_DIR=%{_libdir} \
../
popd
make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%if "%{_prefix}" != "/usr"
%dir %{_datadir}/kde4
%endif
%{_datadir}/apps/cmake/modules/*
%{_datadir}/apps/kabc/
%{_datadir}/apps/kconf_update/*
%{_datadir}/apps/libical/
%{_datadir}/config.kcfg/*
%{_datadir}/dbus-1/interfaces/*
%{_datadir}/kde4/services/
%{_datadir}/kde4/servicetypes/
%{_libdir}/lib*.so.*
%{_libdir}/kde4/*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/lib*.so
%changelog
* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
- fix %%_sysconfdir for %%_prefix != /usr case.
* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
- updated kde4home.diff
- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)
- drop SNPRINTF hack
* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
- kde-3.91.0
- CMAKE_BUILD_TYPE=debug
* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-2
- specfile cleanup (%%prefix issues mostly)
* Sun May 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-1
- update to 3.90.1
- bump cmake BR to 2.4.5 as required upstream now
- don't set execute bits by hand anymore, cmake has been fixed
- use multilibs in /opt/kde4
- add BR boost-devel
* Fri Mar 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-4
- restore minimum version requirement for cmake
- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed
* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
- +eXecute perms for %%{prefix}/lib/*
* Fri Feb 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-2
- rebuild for patched FindKDE4Internal.cmake
* Wed Feb 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-1
- update to 3.80.3
- update and improve parallel-installability patch
- readd BR cyrus-sasl-devel
- don't set LD_LIBRARY_PATH
- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
- define HAVE_SNPRINTF to work around vsnprintf.c build failure
* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
- compiling with QA_RPATHS=0x0003; export QA_RPATHS
- added libXtst-devel libXpm-devel as BR
* Fri Nov 24 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
- parallel build support
- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
- dropped qt4-devel >= 4.2.0, cyrus-sasl-devel as BR
- spec file cleanups and added clean up in %%install
- fixed PATH for libkdecore.so.5; cannot open shared object file;
* Sat Oct 07 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.2-0.1.20061003svn
- first Fedora RPM (parts borrowed from the OpenSUSE kdepimlibs 4 RPM and the Fedora kdelibs 3 RPM)
- apply parallel-installability patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 24 Jul 2007 17:39:23 -0000 1.1
+++ .cvsignore 24 Jul 2007 23:34:28 -0000 1.2
@@ -0,0 +1 @@
+kdepimlibs-3.91.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 24 Jul 2007 17:39:23 -0000 1.1
+++ sources 24 Jul 2007 23:34:28 -0000 1.2
@@ -0,0 +1 @@
+978712ededae818f2b9225897684b752 kdepimlibs-3.91.0.tar.bz2