rpms/kdepim/devel .cvsignore, 1.41, 1.42 kdepim.spec, 1.151, 1.152 sources, 1.46, 1.47 kdepim-3.5.7-kde#146967.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6035

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-3.5.7-kde#146967.patch 
Log Message:
* Thu Feb 14 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-1
- kde-3.5.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	9 Jan 2008 14:56:16 -0000	1.41
+++ .cvsignore	15 Feb 2008 03:04:32 -0000	1.42
@@ -1,5 +1,4 @@
 cr16-app-kandy.png
 cr32-app-kandy.png
 cr48-app-kandy.png
-kdepim_3.5.6.enterprise.0.20071204.744693.orig.tar.gz
-kdepim-enterprise-svn20080109.tar.bz2
+kdepim-3.5.9.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- kdepim.spec	9 Feb 2008 00:29:25 -0000	1.151
+++ kdepim.spec	15 Feb 2008 03:04:32 -0000	1.152
@@ -1,7 +1,7 @@
 
 ## enterprise branch
 #define etch_ver 3.5.6 
-%define ent_date 20080109 
+#define ent_date 20080109 
 #define ent_rev 744693
 
 #define debug 1 
@@ -21,7 +21,7 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 3.5.8
+Version: 3.5.9
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -35,9 +35,9 @@
 # script used to generate svn checkout Source0 above
 Source1: kdepim-enterprise-svn_checkout.sh
 
-Release: 17.svn%{ent_date}.ent%{?dist}
+Release: 1.%{ent_date}svn.ent%{?dist}
 %else
-Release: 17%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %endif
 
@@ -68,13 +68,7 @@
 
 BuildRequires: bison flex
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs3-devel >= %{version}
-#if 0%{?fedora} < 9
-## kmix (?)
-#BuildRequires: kdemultimedia3
-## kttsd
-#BuildRequires: kdeaccessibility
-#endif
+#BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: zlib-devel
 BuildRequires: libart_lgpl-devel
 BuildRequires: cyrus-sasl-devel
@@ -155,18 +149,19 @@
 %prep
 ## Ugh 3 options, switch this by hand
 # stock upstream 
-#setup -q
+%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
+#setup -q -n kdepim
 
 install -m644 -p %{SOURCE10} %{SOURCE11} %{SOURCE12} kandy/src/
 %patch1 -p1 -b .kandy-icons
 
 %patch2 -p1 -b .xdg_open
 
-%if 0%{?fedora} >= 9
+#if 0%{?fedora} > 8 
+%if 0
 pushd kitchensync
 %patch3 -p0 -b .opensync03
 popd
@@ -303,6 +298,9 @@
 
 
 %changelog
+* Thu Feb 14 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-1
+- kde-3.5.9
+
 * Sat Feb 09 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.8-17.20080109.ent
 - rebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	9 Jan 2008 14:56:16 -0000	1.46
+++ sources	15 Feb 2008 03:04:32 -0000	1.47
@@ -1,5 +1,4 @@
 024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
 496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
 fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
-f1c8b673849a66865050c37dd7bb5feb  kdepim-enterprise-svn20080109.tar.bz2
-
+ba27b06599556c572a26f03608471ee2  kdepim-3.5.9.tar.bz2


--- kdepim-3.5.7-kde#146967.patch DELETED ---