From fd9c8cfca1607322e00cfa788a2f70708a5d9474 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Nov 27 2007 18:43:09 +0000 Subject: - kdepim-enterprise branch 20071127 snapshot, r742277 (rh#401391, kde#152553) --- diff --git a/.cvsignore b/.cvsignore index d296357..bebf18a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -4,3 +4,4 @@ cr32-app-kandy.png cr48-app-kandy.png kdepim-enterprise-svn20070926.tar.bz2 kdepim-enterprise-svn20071013.tar.bz2 +kdepim-enterprise-svn20071127.tar.bz2 diff --git a/kdepim.spec b/kdepim.spec index 370b5b6..2170799 100644 --- a/kdepim.spec +++ b/kdepim.spec @@ -1,8 +1,10 @@ -# enterprise branch -%define ent_date 20071013 -%define ent_rev 724979 +## enterprise branch +#define ent_date 20071013 +#define ent_rev 724979 +%define ent_date 20071127 +%define ent_rev 742277 #define debug 1 ## --enable-final requires > 1GB VM, sometimes kills fedora's builders @@ -30,9 +32,9 @@ URL: http://www.kde.org %if 0%{?ent_date} > 0 Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2 -Release: 6.svn%{ent_date}.ent%{?dist} +Release: 7.svn%{ent_date}.ent%{?dist} %else -Release: 6%{?dist} +Release: 7%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 %endif Source1: cr48-app-kandy.png @@ -99,7 +101,9 @@ Obsoletes: akregator < 0:%{akregator_ver}-%{release} 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} @@ -272,6 +276,9 @@ rm -rf %{buildroot} %changelog +* Mon Nov 27 2007 Rex Dieter 6:3.5.8-7.20071127.ent +- kdepim-enterprise branch 20071127 snapshot, r742277 (rh#401391, kde#152553) + * Thu Nov 22 2007 Kevin Kofler - 6:3.5.8-6.20071013.ent - rebuild for new pilot-link @@ -289,7 +296,7 @@ rm -rf %{buildroot} - -libs subpkg (to be more multilib friendly) * Sat Oct 13 2007 Rex Dieter - 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 - 6:3.5.7-10.20070926.ent - xdg-open patch diff --git a/sources b/sources index cec4907..c9cf608 100644 --- a/sources +++ b/sources @@ -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 +3da457c43ed2f086b1f993db944f157d kdepim-enterprise-svn20071127.tar.bz2