rpms/kdepim/devel crystalsvg-conflicts.txt, NONE, 1.1 .cvsignore, 1.39, 1.40 kdepim.spec, 1.142, 1.143 sources, 1.44, 1.45

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdepim.spec sources 
Added Files:
	crystalsvg-conflicts.txt 
Log Message:
* Wed Dec 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-11.20071204.ent
- omit crystalsvg icons (f9+)
- kdepim_3.5.6.enterprise.0.20071204.744693 



--- NEW FILE crystalsvg-conflicts.txt ---
akregator_empty.png
button_fewer.png
button_more.png
gpg.png
gpgsm.png
kalarm.png
kmailcvt.png
kmaillight.png
konsolekalendar.png
kontact_contacts.png
kontact_date.png
kontact_journal.png
kontact_mail.png
kontact_news.png
kontact_notes.png
kontact_summary_green.png
kontact_summary.png
kontact_todo.png
rss_tag.png


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	29 Nov 2007 20:54:35 -0000	1.39
+++ .cvsignore	12 Dec 2007 20:29:21 -0000	1.40
@@ -1,5 +1,5 @@
 cr16-app-kandy.png
 cr32-app-kandy.png
 cr48-app-kandy.png
-kdepim-enterprise-svn20071013.tar.bz2
 kdepim-enterprise-svn20071129.tar.bz2
+kdepim_3.5.6.enterprise.0.20071204.744693.orig.tar.gz


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- kdepim.spec	29 Nov 2007 20:54:35 -0000	1.142
+++ kdepim.spec	12 Dec 2007 20:29:21 -0000	1.143
@@ -1,8 +1,8 @@
 
-
 ## enterprise branch
-%define ent_date 20071129
-%define ent_rev 742984 
+%define etch_ver 3.5.6 
+%define ent_date 20071204
+%define ent_rev 744693
 
 #define debug 1 
 ## --enable-final requires > 1GB VM, sometimes kills fedora's builders 
@@ -24,29 +24,32 @@
 Version: 3.5.8
 
 License: GPLv2
-Group: Applications/Productivity
+Group:   Applications/Productivity
+URL:	 http://www.kde.org/
 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
-# script used to generate Source0 above
+# 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
+# script used to generate svn checkout Source0 above
 Source1: kdepim-enterprise-svn_checkout.sh
-Release: 10.svn%{ent_date}.ent%{?dist}
+
+Release: 11.svn%{ent_date}.ent%{?dist}
 %else
-Release: 10%{?dist}
+Release: 11%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %endif
+
 Source10: cr48-app-kandy.png
 Source11: cr32-app-kandy.png
 Source12: cr16-app-kandy.png
+Source20: crystalsvg-conflicts.txt
 
 Patch1: kdepim-3.4.0-kandy-icons.patch
 Patch2: kdepim-xdg_open.patch
 
 ## upstream patches
-# http://bugs.kde.org/146967 , http://bugzilla.redhat.com/352391
-Patch200: kdepim-3.5.7-kde#146967.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -63,10 +66,12 @@
 BuildRequires: bison flex
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs3-devel >= %{version}
+#if 0%{?fedora} < 9
 ## kmix (?)
-BuildRequires: kdemultimedia3
+#BuildRequires: kdemultimedia3
 ## kttsd
-BuildRequires: kdeaccessibility
+#BuildRequires: kdeaccessibility
+#endif
 BuildRequires: zlib-devel
 BuildRequires: libart_lgpl-devel
 BuildRequires: cyrus-sasl-devel
@@ -145,16 +150,13 @@
 
 
 %prep
-%setup -q %{?ent_date: -n %{name}}
+%setup -q %{?etch_ver: -n kdepim-%{etch_ver}.enterprise.0.%{ent_date}.%{ent_rev}}
 
 install -m644 -p %{SOURCE10} %{SOURCE11} %{SOURCE12} kandy/src/
 %patch1 -p1 -b .kandy-icons
 
 %patch2 -p1 -b .xdg_open
 
-# FIXME/TODO: patch doesn't apply, confirm whether it's still needed or not -- Rex
-#patch200 -p0 -b .kde#146967
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -198,7 +200,7 @@
 popd
 
 ## remove references to extraneous/optional libraries in .la files (#170602)
-find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
+find %{buildroot}%{_libdir} -name "*.la" | xargs \
  sed -i \
  -e "s at -lpng@@g" \
  -e "s@%{_libdir}/libqgpgme.la@@g" \
@@ -206,6 +208,14 @@
  -e "s at -lgpgme@@g" \
  -e "s at -lgpg-error@@g"
 
+%if 0%{?fedora} > 8
+# omit conflicts with kdeartwork-icons-crystalsvg
+# keep only: {kandy,kpalmdoc,kpilotDaemon}.png
+for icon in `cat %{SOURCE20}` ; do 
+  rm -f %{buildroot}%{_datadir}/icons/crystalsvg/*/*/${icon}
+done
+%endif
+
 
 %post
 %{!?libs:/sbin/ldconfig}
@@ -258,6 +268,7 @@
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_docdir}/HTML/en/*
+%exclude %{_docdir}/kdepim*-apidocs
 
 %if 0%{?libs}
 %files libs
@@ -268,6 +279,7 @@
 
 %files devel
 %defattr(-,root,root,-)
+%{_docdir}/kdepim*-apidocs/
 %{_includedir}/kde/*
 %{_libdir}/lib*.so
 %exclude %{_libdir}/libakregatorprivate.so
@@ -276,6 +288,10 @@
 
 
 %changelog
+* Wed Dec 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-11.20071204.ent
+- omit crystalsvg icons (f9+)
+- kdepim_3.5.6.enterprise.0.20071204.744693 
+
 * Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-10.20071129.ent
 - kdepim-enterprise branch 20071129 snapshot, r742984
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	29 Nov 2007 20:54:35 -0000	1.44
+++ sources	12 Dec 2007 20:29:21 -0000	1.45
@@ -1,4 +1,4 @@
 024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
 496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
 fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
-e98af20c7fd60df48a4a1c692a7eb0e3  kdepim-enterprise-svn20071129.tar.bz2
+798c195ad2fc62407491b2244e8fd860  kdepim_3.5.6.enterprise.0.20071204.744693.orig.tar.gz