rpms/kdepim/F-7 .cvsignore, 1.37, 1.38 kdepim.spec, 1.131, 1.132 sources, 1.43, 1.44

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23245

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
* Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-10.20071129.ent
- kdepim-enterprise branch 20071129 snapshot, r742984



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	25 Oct 2007 10:01:01 -0000	1.37
+++ .cvsignore	30 Nov 2007 00:55:55 -0000	1.38
@@ -1,6 +1,5 @@
-kdepim-3.5.7.tar.bz2
 cr16-app-kandy.png
 cr32-app-kandy.png
 cr48-app-kandy.png
-kdepim-enterprise-svn20070926.tar.bz2
 kdepim-enterprise-svn20071013.tar.bz2
+kdepim-enterprise-svn20071129.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/kdepim.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kdepim.spec	6 Nov 2007 22:15:07 -0000	1.131
+++ kdepim.spec	30 Nov 2007 00:55:55 -0000	1.132
@@ -1,8 +1,8 @@
 
 
-# enterprise branch
-%define ent_date 20071013
-%define ent_rev 724979
+## enterprise branch
+%define ent_date 20071129
+%define ent_rev 742984 
 
 #define debug 1 
 ## --enable-final requires > 1GB VM, sometimes kills fedora's builders 
@@ -30,14 +30,16 @@
 
 %if 0%{?ent_date} > 0
 Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
-Release: 5.svn%{ent_date}.ent%{?dist}
+# script used to generate Source0 above
+Source1: kdepim-enterprise-svn_checkout.sh
+Release: 10.svn%{ent_date}.ent%{?dist}
 %else
-Release: 5%{?dist}
+Release: 10%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %endif
-Source1: cr48-app-kandy.png
-Source2: cr32-app-kandy.png
-Source3: cr16-app-kandy.png
+Source10: cr48-app-kandy.png
+Source11: cr32-app-kandy.png
+Source12: cr16-app-kandy.png
 
 Patch1: kdepim-3.4.0-kandy-icons.patch
 Patch2: kdepim-xdg_open.patch
@@ -99,7 +101,9 @@
 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}
@@ -143,19 +147,19 @@
 %prep
 %setup -q %{?ent_date: -n %{name}}
 
-install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
+install -m644 -p %{SOURCE10} %{SOURCE11} %{SOURCE12} kandy/src/
 %patch1 -p1 -b .kandy-icons
 
 %patch2 -p1 -b .xdg_open
 
-%patch200 -p0 -b .kde#146967
+# FIXME/TODO: patch doesn't apply, confirm whether it's still needed or not -- Rex
+#patch200 -p0 -b .kde#146967
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
 
-
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -272,6 +276,21 @@
 
 
 %changelog
+* Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-10.20071129.ent
+- kdepim-enterprise branch 20071129 snapshot, r742984
+
+* Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-9.20071127.ent
+- 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 
+
+* 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)
+
+* Thu Nov 22 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.8-6.20071013.ent
+- rebuild for new pilot-link
+
 * Tue Nov 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-5.20071013.ent
 - compacting mbox shows empty folder (kde#146967, rh#352391)
 
@@ -286,7 +305,7 @@
 - -libs subpkg (to be more multilib friendly)
 
 * Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-1.20071013.ent
-- kdepim-enterprise branch 20071013 snapshot (r724979)
+- kdepim-enterprise branch 20071013 snapshot, r724979
 
 * Wed Oct 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-10.20070926.ent
 - xdg-open patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	25 Oct 2007 10:01:01 -0000	1.43
+++ sources	30 Nov 2007 00:55:55 -0000	1.44
@@ -1,4 +1,4 @@
 024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
 496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
 fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
-20ceb8e93d65c956f6b607d553be1fc2  kdepim-enterprise-svn20071013.tar.bz2
+e98af20c7fd60df48a4a1c692a7eb0e3  kdepim-enterprise-svn20071129.tar.bz2