rpms/kdepim/devel .cvsignore, 1.53, 1.54 kdepim.spec, 1.193, 1.194 sources, 1.62, 1.63 kdepim-4.1.2-kabcdistlistupdater.patch, 1.1, NONE

Than Ngo than at fedoraproject.org
Thu Nov 20 15:39:10 UTC 2008


Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13475

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-4.1.2-kabcdistlistupdater.patch 
Log Message:
4.2 beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	27 Sep 2008 02:17:55 -0000	1.53
+++ .cvsignore	20 Nov 2008 15:38:40 -0000	1.54
@@ -1 +1,2 @@
 kdepim-4.1.2.tar.bz2
+kdepim-4.1.80.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- kdepim.spec	26 Oct 2008 00:16:00 -0000	1.193
+++ kdepim.spec	20 Nov 2008 15:38:40 -0000	1.194
@@ -1,4 +1,3 @@
-
 %ifnarch s390 s390x
 #define _with_pilot_link 1
 %endif
@@ -6,14 +5,13 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.1.2
-Release: 4%{?dist}
+Version: 4.1.80
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	 http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0:  kdepim-4.1.2-kabcdistlistupdater.patch
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: kdepim4 = %{version}-%{release}
@@ -26,12 +24,10 @@
 BuildRequires: akonadi-devel
 BuildRequires: bison flex
 BuildRequires: boost-devel
-BuildRequires: cmake
 BuildRequires: cyrus-sasl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gnokii-devel
 BuildRequires: gpgme-devel
-BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libassuan-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
@@ -49,6 +45,7 @@
 BuildRequires: giflib-devel
 BuildRequires: openldap-devel
 BuildRequires: pcre-devel
+BuildRequires: libical-devel
 
 ##Optional bits
 Requires(hint): pinentry-gui
@@ -59,7 +56,7 @@
 
 %description
 %{summary}, including:
-* akregator: feed aggregator 
+* akregator: feed aggregator
 * kmail: email client
 * knode: newsreader
 * knotes: sticky notes for the desktop
@@ -68,7 +65,7 @@
 %{?_with_pilot_link:* kpilot: HotSync® software for Palm OS® devices}
 
 %package devel
-Summary: Development files for %{name} 
+Summary: Development files for %{name}
 Group: Development/Libraries
 Provides: kdepim4-devel = %{version}-%{release}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
@@ -89,7 +86,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 # upstream patches
 
@@ -97,7 +93,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} --debug-output ..
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
@@ -107,7 +103,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # conflict with oxygen-icon-theme
 rm -rvf %{buildroot}%{_kde4_iconsdir}/oxygen/32x32/actions/appointment-new.png
@@ -167,18 +163,27 @@
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
-# unversioned library
-#{_kde4_libdir}/libkpilot_conduit_base.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/kde4/plugins/designer/*
-#exclude %{_kde4_libdir}/libkpilot_conduit_base.so
 
 
 %changelog
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+- kdepim-4.1.2-kabcdistlistupdater.patch upstreamed
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
 * Sun Oct 26 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-4
 - add missing BR soprano-devel
 
@@ -246,7 +251,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 
+- "Enterprise headers" makes impossible to select text in
   first paragraph of body (kde#151150)
 
 * Mon Feb 18 2008 Than Ngo <than at redhat.com> 6:3.5.9-5
@@ -278,7 +283,7 @@
 
 * Wed Dec 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-12.20071204.ent
 - omit crystalsvg icons (f9+)
-- kdepim_3.5.6.enterprise.0.20071204.744693 
+- kdepim_3.5.6.enterprise.0.20071204.744693
 
 * Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-10.20071129.ent
 - kdepim-enterprise branch 20071129 snapshot, r742984
@@ -287,7 +292,7 @@
 - omit "compacting mbox..." patch for now (doesn't apply)
 
 * Wed Nov 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-8.20071127.ent
-- include/reference kdepim-enterprise-svn_checkout.sh 
+- include/reference kdepim-enterprise-svn_checkout.sh
 
 * Mon Nov 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-7.20071127.ent
 - kdepim-enterprise branch 20071127 snapshot, r742277 (rh#401391, kde#152553)
@@ -330,7 +335,7 @@
 
 * Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-6
 - License: GPLv2
-- Provides: kdepim3(-devel) 
+- Provides: kdepim3(-devel)
 - (Build)Requires: kdelibs3(-devel)
 
 * Tue Jun 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
@@ -430,7 +435,7 @@
 - apply upstream patches
 
 * Mon Jun 19 2006 Than Ngo <than at redhat.com> 6:3.5.3-2
-- BR: cyrus-sasl-devel, #195500 
+- BR: cyrus-sasl-devel, #195500
 
 * Fri Jun 02 2006 Than Ngo <than at redhat.com> 6:3.5.3-1
 - update to 3.5.3
@@ -454,7 +459,7 @@
 
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 6:3.5.1-1
 - update to 3.5.1
-- get rid of kdepim-3.5.0-kmail-113730.patch, which included in new upstream 
+- get rid of kdepim-3.5.0-kmail-113730.patch, which included in new upstream
 
 * Mon Dec 12 2005 Than Ngo <than at redhat.com> 6:3.5.0-1
 - apply patch to fix crash when applying pipe through filters
@@ -503,7 +508,7 @@
 - add missing kandy icons #141165
 
 * Mon Mar 21 2005 Than Ngo <than at redhat.com> 6:3.4.0-3
-- cleanup build dependencies #151673 
+- cleanup build dependencies #151673
 
 * Fri Mar 18 2005 Than Ngo <than at redhat.com> 6:3.4.0-2
 - fix broken dependencies on kdepim-devel #151508
@@ -558,7 +563,7 @@
 * Tue Aug 10 2004 Than Ngo <than at redhat.com> 3.3.0-0.1.rc1
 - update to 3.3.0 rc1
 
-* Wed Aug 04 2004 Than Ngo <than at redhat.com> 6:3.2.92-1 
+* Wed Aug 04 2004 Than Ngo <than at redhat.com> 6:3.2.92-1
 - update to KDE 3.3 Beta 2
 
 * Sat Jul 03 2004 Than Ngo <than at redhat.com> 6:3.2.91-1
@@ -576,10 +581,10 @@
 * Mon Mar 22 2004 Than Ngo <than at redhat.com> 6:3.2.1-4
 - fix conflict problem by update, #118709
 
-* Fri Mar 19 2004 Karsten Hopp <karsten at redhat.de> 3.2.1-3 
+* Fri Mar 19 2004 Karsten Hopp <karsten at redhat.de> 3.2.1-3
 - add Obsoletes: kmail
 
-* Sun Mar 14 2004 Karsten Hopp <karsten at redhat.de> 3.2.1-2 
+* Sun Mar 14 2004 Karsten Hopp <karsten at redhat.de> 3.2.1-2
 - add Provide: kmail
 
 * Sun Mar 07 2004 Than Ngo <than at redhat.com> 6:3.2.1-1
@@ -589,7 +594,7 @@
 - rebuilt
 
 * Mon Mar 01 2004 Than Ngo <than at redhat.com> 3.2.0-1.5
-- add Buildrequires on libart_lgpl-devel #115183  
+- add Buildrequires on libart_lgpl-devel #115183
 
 * Tue Feb 24 2004 Than Ngo <than at redhat.com> 6:3.2.0-1.4
 - some critical bugs in kmail, #116080
@@ -704,7 +709,7 @@
 
 * Mon Aug 12 2002 Than Ngo <than at redhat.com> 3.0.3-1
 - 3.0.3
-- Fixed a bug in clock applet 
+- Fixed a bug in clock applet
 
 * Tue Aug  6 2002 Than Ngo <than at redhat.com> 3.0.2-4
 - build against pilot-link-0.11.2
@@ -917,7 +922,7 @@
 - snapshot, includes kde 1.1.1 + fixes
 - kvt removed for security reasons.  It is a steaming pile of...
 
-* Mon Apr 19 1999 Preston Brown <pbrown at redhat.com> 
+* Mon Apr 19 1999 Preston Brown <pbrown at redhat.com>
 - last snapshot before release
 
 * Fri Apr 16 1999 Preston Brown <pbrown at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	27 Sep 2008 02:17:55 -0000	1.62
+++ sources	20 Nov 2008 15:38:40 -0000	1.63
@@ -1 +1 @@
-484b3b9685ecd258d0c562c5b0fce297  kdepim-4.1.2.tar.bz2
+dccd455696af39a8557b3a0c890a316d  kdepim-4.1.80.tar.bz2


--- kdepim-4.1.2-kabcdistlistupdater.patch DELETED ---




More information about the fedora-extras-commits mailing list