rpms/kdepim/devel .cvsignore, 1.42, 1.43 kdepim.spec, 1.165, 1.166 sources, 1.47, 1.48 crystalsvg-conflicts.txt, 1.2, NONE kdepim-3.4.0-kandy-icons.patch, 1.1, NONE kdepim-3.5.9-gnokii-no-libintl.patch, 1.1, NONE kdepim-3.5.9-kde#127696.patch, 1.1, NONE kdepim-3.5.9-opensync03.patch, 1.2, NONE kdepim-3.5.x-kmail-imap-crash.patch, 1.1, NONE kdepim-enterprise-svn_checkout.sh, 1.1, NONE kdepim-kde#151150.patch, 1.1, NONE kdepim-xdg_open.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon May 19 19:49:07 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2276
Modified Files:
.cvsignore kdepim.spec sources
Removed Files:
crystalsvg-conflicts.txt kdepim-3.4.0-kandy-icons.patch
kdepim-3.5.9-gnokii-no-libintl.patch
kdepim-3.5.9-kde#127696.patch kdepim-3.5.9-opensync03.patch
kdepim-3.5.x-kmail-imap-crash.patch
kdepim-enterprise-svn_checkout.sh kdepim-kde#151150.patch
kdepim-xdg_open.patch
Log Message:
* Mon May 19 2008 Rex Dieter <rdieter at fedoraproject.org> 6:4.0.72-1
- first stab at kdepim4
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore 15 Feb 2008 03:04:32 -0000 1.42
+++ .cvsignore 19 May 2008 19:48:20 -0000 1.43
@@ -1,4 +1 @@
-cr16-app-kandy.png
-cr32-app-kandy.png
-cr48-app-kandy.png
-kdepim-3.5.9.tar.bz2
+kdepim-4.0.72.tar.bz2
Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- kdepim.spec 11 Apr 2008 14:54:16 -0000 1.165
+++ kdepim.spec 19 May 2008 19:48:20 -0000 1.166
@@ -1,128 +1,57 @@
-## enterprise branch
-#define etch_ver 3.5.6
-#define ent_date 20080109
-#define ent_rev 744693
-
-#define debug 1
-## --enable-final requires > 1GB VM, sometimes kills fedora's builders
-#define final 1
-
-%define make_cvs 1
-
-%define _with_gnokii --with-gnokii
-%define _with_mal --with-mal
-
-%if 0%{?fedora} > 7
-# make -libs subpkg
-%define libs 1
-%endif
-
Name: kdepim
Summary: PIM (Personal Information Manager) applications
Epoch: 6
-Version: 3.5.9
+Version: 4.0.72
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Productivity
URL: http://www.kde.org/
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?ent_date} > 0
-# hmm, v3.5.6 eh? FIXME? -- Rex
-#Source0: http://apt.intevation.de/dists/etch/unstable/source/kdepim_3.5.6.enterprise.0.20071204.744693.orig.tar.gz
-Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
-# script used to generate svn checkout Source0 above
-Source1: kdepim-enterprise-svn_checkout.sh
-
-Release: 9.%{ent_date}svn.ent%{?dist}
-%else
-Release: 9%{?dist}
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-%endif
-
-Source10: cr48-app-kandy.png
-Source11: cr32-app-kandy.png
-Source12: cr16-app-kandy.png
-Source20: crystalsvg-conflicts.txt
-
-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 \
-# svn://anonsvn.kde.org/home/kde/branches/work/kitchensync-OpenSync0.30API@774532 >kdepim-3.5.9-opensync03.patch
-Patch3: kdepim-3.5.9-opensync03.patch
-# http://websvn.kde.org/?view=rev&revision=775015
-# http://bugs.kde.org/127696
-# Upstream fix for "Unable to complete LIST operation" errors with some servers,
-Patch4: kdepim-3.5.9-kde#127696.patch
-# http://bugs.kde.org/151150
-# http://websvn.kde.org/?view=rev&revision=779994
-Patch5: kdepim-kde#151150.patch
-Patch100: kdepim-3.5.x-kmail-imap-crash.patch
-Provides: kdepim3 = %{version}-%{release}
+Provides: kdepim4 = %{version}-%{release}
-%if 0%{?libs}
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+BuildRequires: akonadi-devel
BuildRequires: bison flex
-BuildRequires: desktop-file-utils
-BuildRequires: kdelibs3-devel >= %{version}
-BuildRequires: zlib-devel
-BuildRequires: libart_lgpl-devel
+BuildRequires: boost-devel
+BuildRequires: cmake
BuildRequires: cyrus-sasl-devel
-BuildRequires: lockdev-devel
-BuildRequires: python-devel
-%ifnarch s390 s390x
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
-%define _with_pilot_link --with-pilot-link
-BuildRequires: pilot-link-devel >= 0.12
-# AvantGo support via libmal
-%{?_with_mal:BuildRequires: libmal-devel}
-%endif
-%endif
-%{?_with_gnokii:BuildRequires: gnokii-devel}
-## Crypto Stuff from http://kmail.kde.org/kmail-pgpmime-howto.html
+BuildRequires: desktop-file-utils
+BuildRequires: gnokii-devel
BuildRequires: gpgme-devel
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: libXpm-devel libXScrnSaver-devel
-%endif
-%if 0%{?fedora} > 5
+# TODO: libmapi from http://www.openchange.org/
+#BuildRequires: libmapi-devel
BuildRequires: libopensync-devel
+BuildRequires: libxslt-devel
+BuildRequires: lockdev-devel
+%ifnarch s390 s390x
+BuildRequires: pilot-link-devel >= 0.12
%endif
-%if %{make_cvs}
-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}
+BuildRequires: python-devel
+BuildRequires: qca2-devel
+BuildRequires: zlib-devel
+# these seem mostly bogus, not checked for, but linked nonetheless -- Rex
+BuildRequires: giflib-devel
+BuildRequires: openldap-devel
+BuildRequires: pcre-devel
##Optional bits
Requires(hint): pinentry-gui
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
Requires(hint): spambayes
#Requires(hint): spamassassin
-%endif
#%{?fedora:Requires(hint): bogofilter}
-%if "%{?_with_gnokii:1}" == "1"
-Obsoletes: %{name}-gnokii < %{epoch}:%{version}-%{release}
-Provides: %{name}-gnokii = %{epoch}:%{version}-%{release}
-%endif
%description
%{summary}, including:
@@ -137,82 +66,42 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Provides: kdepim3-devel = %{version}-%{release}
+Provides: kdepim4-devel = %{version}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: kdelibs3-devel
+Requires: kdelibs4-devel
%description devel
%{summary}.
Install %{name}-devel if you want to write or compile %{name} plugins.
-%if 0%{?libs}
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
-Requires: kdelibs3 >= %{version}
+#Requires: kdelibs4 >= %{version}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description libs
%{summary}.
-%endif
%prep
-## Ugh 3 options, switch this by hand
-# stock upstream
%setup -q
-# etch upstream sources
-#setup -q %{?etch_ver: -n kdepim-%{etch_ver}.enterprise.0.%{ent_date}.%{ent_rev}}
-# svn snapshot
-#setup -q -n kdepim
-
-install -m644 -p %{SOURCE10} %{SOURCE11} %{SOURCE12} kandy/src/
-%patch1 -p1 -b .kandy-icons
-
-%patch2 -p1 -b .xdg_open
-
-%patch6 -p0 -b .gnokii
-
-%if 0%{?fedora} > 8
-pushd kitchensync
-%patch3 -p0 -b .opensync03
-popd
-%endif
-
-%patch4 -p0 -b .kde127696
-%patch5 -p1 -b .kde151150
-
-%patch100 -p0 -b .kmail-imap-crash
-
-%if %{make_cvs}
- make -f admin/Makefile.common cvs
-%endif
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure \
- --enable-new-ldflags \
- --disable-dependency-tracking \
- --disable-rpath \
- %{!?debug:--disable-debug --disable-warnings} \
- %{?final: --enable-final} \
- --includedir=%{_includedir}/kde \
- --with-gpg=%{_bindir}/gpg \
- --with-gpgsm=%{_bindir}/gpgsm \
- --with-sasl \
- %{?_with_gnokii} %{!?_with_gnokii:--without-gnokii} \
- %{?_with_mal} %{!?_with_mal:--without-mal} \
- %{?_with_pilot_link} %{!?_with_pilot_link:--without-pilot-link}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
-make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
+rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
# make symlinks relative
mkdir -p %{buildroot}%{_docdir}/HTML/en/common
@@ -225,45 +114,21 @@
done
popd
-## remove references to extraneous/optional libraries in .la files (#170602)
-find %{buildroot}%{_libdir} -name "*.la" | xargs \
- sed -i \
- -e "s at -lpng@@g" \
- -e "s@%{_libdir}/libqgpgme.la@@g" \
- -e "s@%{_libdir}/libgpgme++.la@@g" \
- -e "s at -lgpgme@@g" \
- -e "s at -lgpg-error@@g"
-
-%if 0%{?fedora} > 8
-# omit conflicts with kdeartwork-icons-crystalsvg
-# keep only: {kandy,kpilotDaemon}.png
-for icon in `cat %{SOURCE20}` ; do
- rm -f %{buildroot}%{_datadir}/icons/crystalsvg/*/*/${icon}
-done
-%endif
-
%post
-%{!?libs:/sbin/ldconfig}
-for i in crystalsvg hicolor locolor ; do
- touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
-done
-%{_bindir}/update-desktop-database >& /dev/null ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
%postun
-%{!?libs:/sbin/ldconfig}
-for i in crystalsvg hicolor locolor ; do
- touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
-done
-%{_bindir}/update-desktop-database >& /dev/null ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
-%if 0%{?libs}
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%endif
%clean
@@ -272,48 +137,38 @@
%files
%defattr(-,root,root,-)
-%doc README korganizer/COPYING
-%{_bindir}/*
-%{_libdir}/libakregatorprivate.so
-%{_libdir}/libkmailprivate.so
-%{_libdir}/libknodecommon.so
-%{_libdir}/kde3/*
-%{_libdir}/kconf_update_bin/*
-%{_datadir}/applications/kde/*
-%{_datadir}/applnk/.hidden/*
-%{_datadir}/applnk/Applications/*
-%{_datadir}/applnk/Utilities/*
-%{_datadir}/apps/*
-%{_datadir}/autostart/*
-%{_datadir}/config/*
-%{_datadir}/config.kcfg/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/mimelnk/application/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-%{_docdir}/HTML/en/*
-%exclude %{_docdir}/HTML/en/kdepim*-apidocs
+%doc README README.Kolab
+%doc COPYING
+%{_kde4_bindir}/*
+%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/strigi/*.so
+%{_kde4_datadir}/applications/kde4/*
+%{_kde4_appsdir}/*
+%{_datadir}/dbus-1/interfaces/*.xml
+%{_kde4_datadir}/akonadi/agents/*.desktop
+%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/config/*rc
+%{_kde4_datadir}/config.kcfg/*
+%{_kde4_datadir}/icons/hicolor/*/*/*
+%{_kde4_datadir}/icons/oxygen/*/*/*
+%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_docdir}/HTML/en/*
-%if 0%{?libs}
%files libs
%defattr(-,root,root,-)
-%endif
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
+%{_kde4_libdir}/lib*.so.*
%files devel
%defattr(-,root,root,-)
-%{_docdir}/HTML/en/kdepim*-apidocs/
-%{_includedir}/kde/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libakregatorprivate.so
-%exclude %{_libdir}/libkmailprivate.so
-%exclude %{_libdir}/libknodecommon.so
+%{_kde4_includedir}/*
+%{_kde4_libdir}/lib*.so
%changelog
+* Mon May 19 2008 Rex Dieter <rdieter at fedoraproject.org> 6:4.0.72-1
+- first stab at kdepim4
+
* Fri Apr 11 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-9
- omit multilib upgrade hacks (see also #441222)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 15 Feb 2008 03:04:32 -0000 1.47
+++ sources 19 May 2008 19:48:20 -0000 1.48
@@ -1,4 +1 @@
-024ab01d199f9e93c43df1ef0a03510c cr16-app-kandy.png
-496c7bfc6247df2cf03aec342094ffd6 cr32-app-kandy.png
-fef385691270bad1e58e6eb5ed0ad6d6 cr48-app-kandy.png
-ba27b06599556c572a26f03608471ee2 kdepim-3.5.9.tar.bz2
+36ccb21363a13a789fef2c59fe26472d kdepim-4.0.72.tar.bz2
--- crystalsvg-conflicts.txt DELETED ---
--- kdepim-3.4.0-kandy-icons.patch DELETED ---
--- kdepim-3.5.9-gnokii-no-libintl.patch DELETED ---
--- kdepim-3.5.9-kde#127696.patch DELETED ---
--- kdepim-3.5.9-opensync03.patch DELETED ---
--- kdepim-3.5.x-kmail-imap-crash.patch DELETED ---
--- kdepim-enterprise-svn_checkout.sh DELETED ---
--- kdepim-kde#151150.patch DELETED ---
--- kdepim-xdg_open.patch DELETED ---
More information about the fedora-extras-commits
mailing list