rpms/kdepim/devel .cvsignore, 1.44, 1.45 kdepim.spec, 1.170, 1.171 sources, 1.49, 1.50

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
* Sun Jun 15 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.82-1
- 4.0.82



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	26 May 2008 13:44:10 -0000	1.44
+++ .cvsignore	15 Jun 2008 16:16:38 -0000	1.45
@@ -1,2 +1 @@
-kdepim-4.0.72.tar.bz2
-kdepim-4.0.80.tar.bz2
+kdepim-4.0.82.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kdepim.spec	6 Jun 2008 16:11:16 -0000	1.170
+++ kdepim.spec	15 Jun 2008 16:16:38 -0000	1.171
@@ -1,9 +1,13 @@
 
+%ifnarch s390 s390x
+#define _with_pilot_link 1
+%endif
+
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.0.80
-Release: 2%{?dist}
+Version: 4.0.82
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -28,15 +32,14 @@
 BuildRequires: gpgme-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: libassuan-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
 # TODO: libmapi from http://www.openchange.org/
 #BuildRequires: libmapi-devel
 BuildRequires: libopensync-devel
 BuildRequires: libxslt-devel
 BuildRequires: lockdev-devel
-%ifnarch s390 s390x
-BuildRequires: pilot-link-devel >= 0.12
-%endif
+%{?_with_pilot_link:BuildRequires: pilot-link-devel >= 0.12}
 BuildRequires: python-devel
 BuildRequires: qca2-devel
 BuildRequires: zlib-devel
@@ -158,16 +161,19 @@
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
 # unversioned library
-%{_kde4_libdir}/libkpilot_conduit_base.so
+#{_kde4_libdir}/libkpilot_conduit_base.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-%exclude %{_kde4_libdir}/libkpilot_conduit_base.so
+#exclude %{_kde4_libdir}/libkpilot_conduit_base.so
 
 
 %changelog
+* Sun Jun 15 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.82-1
+- 4.0.82
+
 * Wed May 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-2
 - put unversioned libkpilot_conduit_base.so in -libs instead of -devel (#448395)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	26 May 2008 13:44:10 -0000	1.49
+++ sources	15 Jun 2008 16:16:38 -0000	1.50
@@ -1 +1 @@
-e08922f0620dcc7f35719406c6997c6b  kdepim-4.0.80.tar.bz2
+dd3cee8aac2bea4cd1124ecf6d5dfe8c  kdepim-4.0.82.tar.bz2