rpms/kdepim/devel .cvsignore, 1.40, 1.41 kdepim.spec, 1.146, 1.147 sources, 1.45, 1.46

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-15.20080109.ent
- 20080109 snapshot (sync with F-7/8 branches)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	12 Dec 2007 20:29:21 -0000	1.40
+++ .cvsignore	9 Jan 2008 14:56:16 -0000	1.41
@@ -1,5 +1,5 @@
 cr16-app-kandy.png
 cr32-app-kandy.png
 cr48-app-kandy.png
-kdepim-enterprise-svn20071129.tar.bz2
 kdepim_3.5.6.enterprise.0.20071204.744693.orig.tar.gz
+kdepim-enterprise-svn20080109.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- kdepim.spec	8 Jan 2008 20:01:24 -0000	1.146
+++ kdepim.spec	9 Jan 2008 14:56:16 -0000	1.147
@@ -1,8 +1,8 @@
 
 ## enterprise branch
-%define etch_ver 3.5.6 
-%define ent_date 20071204
-%define ent_rev 744693
+#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 
@@ -30,14 +30,14 @@
 
 %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
+#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: 14.svn%{ent_date}.ent%{?dist}
+Release: 15.svn%{ent_date}.ent%{?dist}
 %else
-Release: 14%{?dist}
+Release: 15%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %endif
 
@@ -150,7 +150,13 @@
 
 
 %prep
-%setup -q %{?etch_ver: -n kdepim-%{etch_ver}.enterprise.0.%{ent_date}.%{ent_rev}}
+## 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
@@ -288,6 +294,9 @@
 
 
 %changelog
+* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-15.20080109.ent
+- 20080109 snapshot (sync with F-7/8 branches)
+
 * Tue Jan 08 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-14.20071204.ent
 - omit kpalmdoc.png icons too (f9+)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	12 Dec 2007 20:29:21 -0000	1.45
+++ sources	9 Jan 2008 14:56:16 -0000	1.46
@@ -1,4 +1,5 @@
 024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
 496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
 fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
-798c195ad2fc62407491b2244e8fd860  kdepim_3.5.6.enterprise.0.20071204.744693.orig.tar.gz
+f1c8b673849a66865050c37dd7bb5feb  kdepim-enterprise-svn20080109.tar.bz2
+