rpms/kdepim/devel kdepim-enterprise-svn_checkout.sh, NONE, 1.1 .cvsignore, 1.35, 1.36 kdepim.spec, 1.131, 1.132 sources, 1.40, 1.41 cr16-app-kandy.png, 1.1, NONE cr32-app-kandy.png, 1.1, NONE cr48-app-kandy.png, 1.1, NONE kdepim-3.4.0-s390.patch, 1.1, NONE kdepim-3.4.92-libz.patch, 1.1, NONE kdepim-3.5.7-kde#140549.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Sep 26 19:36:42 UTC 2007 

Author: rdieter

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

Modified Files:
	.cvsignore kdepim.spec sources 
Added Files:
	kdepim-enterprise-svn_checkout.sh 
Removed Files:
	cr16-app-kandy.png cr32-app-kandy.png cr48-app-kandy.png 
	kdepim-3.4.0-s390.patch kdepim-3.4.92-libz.patch 
	kdepim-3.5.7-kde#140549.patch 
Log Message:
* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-9.20070926.ent
- kdepim-enterprise branch 20070926 snapshot (r717374)

* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8.20070920.714749.ent
- kdepim-enterprise branch 20070920 snapshot (r714749)




--- NEW FILE kdepim-enterprise-svn_checkout.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
EXPORT_DIR=kdepim

set -x
rm -rf $EXPORT_DIR

# app
svn export  svn://anonsvn.kde.org/home/kde/branches/kdepim/enterprise/kdepim $EXPORT_DIR/

# auto*/configure bits
# svn export svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin $EXPORT_DIR/admin/

tar cjf kdepim-enterprise-svn${DATE}.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	16 Jun 2007 19:14:32 -0000	1.35
+++ .cvsignore	26 Sep 2007 19:36:09 -0000	1.36
@@ -1,16 +1,5 @@
-kdepim-3.3.0.tar.bz2
-kdepim-3.3.1.tar.bz2
-kdepim-3.3.2.tar.bz2
-kdepim-3.4.0-rc1.tar.bz2
-kdepim-3.4.0.tar.bz2
-kdepim-3.4.1.tar.bz2
-kdepim-3.4.2.tar.bz2
-kdepim-3.4.91.tar.bz2
-kdepim-3.4.92.tar.bz2
-kdepim-3.5.0.tar.bz2
-kdepim-3.5.1.tar.bz2
-kdepim-3.5.2.tar.bz2
-kdepim-3.5.3.tar.bz2
-kdepim-3.5.4.tar.bz2
-timezone-update.diff.bz2
 kdepim-3.5.7.tar.bz2
+cr16-app-kandy.png
+cr32-app-kandy.png
+cr48-app-kandy.png
+kdepim-enterprise-svn20070926.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kdepim.spec	12 Sep 2007 15:47:56 -0000	1.131
+++ kdepim.spec	26 Sep 2007 19:36:09 -0000	1.132
@@ -1,7 +1,12 @@
 
-%define debug 0
-# --enable-final requires > 1GB VM, sometimes kills our builders 
-%define final 0
+
+# enterprise branch
+%define ent_date 20070926
+%define ent_rev 714749
+
+#define debug 1 
+## --enable-final requires > 1GB VM, sometimes kills fedora's builders 
+#define final 1 
 
 %define make_cvs 1
 
@@ -12,23 +17,24 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 3.5.7
-Release: 8%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.kde.org
 
+%if 0%{?ent_date} > 0
+Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
+Release: 9.svn%{ent_date}.ent%{?dist}
+%else
+Release: 8%{?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
 
-Patch2: kdepim-3.4.0-s390.patch
 Patch3: kdepim-3.4.0-kandy-icons.patch
-Patch4: kdepim-3.4.92-libz.patch
-#upstream
-Patch140549: kdepim-3.5.7-kde#140549.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -49,7 +55,7 @@
 BuildRequires: lockdev-devel
 BuildRequires: python-devel
 %ifnarch s390 s390x
-%if 0%{?fedora} > 6
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
 %define _with_pilot_link --with-pilot-link
 BuildRequires: pilot-link-devel >= 0.12
 # AvantGo support via libmal
@@ -58,7 +64,6 @@
 %endif
 %{?_with_gnokii:BuildRequires: gnokii-devel}
 ## Crypto Stuff from http://kmail.kde.org/kmail-pgpmime-howto.html
-# may have to drop this when/if gpgme becomes LGPLv3
 BuildRequires: gpgme-devel
 %if 0%{?fedora} > 4  || 0%{?rhel} > 4
 BuildRequires: libXpm-devel libXScrnSaver-devel
@@ -106,39 +111,26 @@
 Install %{name}-devel if you want to write or compile %{name} plugins.
 
 %prep
-%setup -q
-
-%ifarch s390 s390x
-%patch2 -p1 -b .s390
-rm -rf kpilot
-%endif
+%setup -q %{?ent_date: -n %{name}}
 
+install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
 %patch3 -p1 -b .kandy-icons
-%patch4 -p1 -b .libz
 
-%patch140549 -p1 -b .kde#140549
+%if %{make_cvs}
+   make -f admin/Makefile.common cvs
+%endif
+
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
-
-%if %{make_cvs}
-   make -f admin/Makefile.common cvs
-%endif
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
+   %{!?debug:--disable-debug --disable-warnings} \
+   %{?final: --enable-final} \
    --includedir=%{_includedir}/kde \
    --with-gpg=%{_bindir}/gpg \
    --with-gpgsm=%{_bindir}/gpgsm \
@@ -167,18 +159,6 @@
 done
 popd
 
-
-## FIXME.  *ALL* of these?  Surely, non-kde users should get to see
-## some of these gems.  -- Rex
-%if 0
-for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
-   KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
-   if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
-   fi
-done
-%endif
-
 ## remove references to extraneous/optional libraries in .la files (#170602)
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
  sed -i \
@@ -247,6 +227,12 @@
 
 
 %changelog
+* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-9.20070926.ent
+- kdepim-enterprise branch 20070926 snapshot (r717374)
+
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8.20070920.714749.ent
+- kdepim-enterprise branch 20070920 snapshot (r714749)
+
 * Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
 - drop OnlyShowIn=KDE munging
 - update %%description


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	16 Jun 2007 19:14:32 -0000	1.40
+++ sources	26 Sep 2007 19:36:09 -0000	1.41
@@ -1 +1,4 @@
-8571db6dcf4168614c96bb72c493f931  kdepim-3.5.7.tar.bz2
+024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
+496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
+fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
+0d1f3d94721fbc40367aacbac91d6d34  kdepim-enterprise-svn20070926.tar.bz2


--- kdepim-3.4.0-s390.patch DELETED ---


--- kdepim-3.4.92-libz.patch DELETED ---


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

More information about the fedora-extras-commits mailing list