rpms/kdepimlibs/F-7 .cvsignore, 1.10, 1.11 kdepimlibs.spec, 1.16, 1.17 sources, 1.10, 1.11

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13835/F-7

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
sync w/devel (kde-4.0.3)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Mar 2008 23:50:14 -0000	1.10
+++ .cvsignore	17 Apr 2008 17:38:21 -0000	1.11
@@ -1,3 +1 @@
-kdepimlibs-4.0.0.tar.bz2
-kdepimlibs-4.0.1.tar.bz2
-kdepimlibs-4.0.2.tar.bz2
+kdepimlibs-4.0.3.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-7/kdepimlibs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdepimlibs.spec	8 Mar 2008 23:50:14 -0000	1.16
+++ kdepimlibs.spec	17 Apr 2008 17:38:21 -0000	1.17
@@ -1,3 +1,5 @@
+
+#ifarch noarch
 %if 0%{?fedora} > 8
 # set this to 0 to disable -apidocs for a faster build
 %define apidocs 1
@@ -6,11 +8,14 @@
 # files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3
 %define apidocs 0
 %endif
+#else
+%define rest 1
+#endif
 
 Name: kdepimlibs
 
-Version: 4.0.2
-Release: 2%{?dist}
+Version: 4.0.3
+Release: 3%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -31,7 +36,7 @@
 BuildRequires: openldap-devel
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: qt4-doc
@@ -55,7 +60,9 @@
 %package apidocs
 Group: Development/Documentation
 Summary: kdepimlibs API documentation
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}
+## Not strictly required -- Rex
+#Requires: %{name} = %{version}
+Requires: kde-filesystem
 
 %description apidocs
 This package includes the kdepimlibs API documentation in HTML
@@ -73,10 +80,12 @@
 %{cmake_kde4} ..
 popd
 
+%if 0%{?rest}
 make %{?_smp_mflags} -C %{_target_platform}
+%endif
 
 # build apidocs
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 export QTDOCDIR=`pkg-config --variable=docdir Qt`
 kde4-doxygen.sh --doxdatadir=%{_kde4_docdir}/HTML/en/common .
 %endif
@@ -85,6 +94,7 @@
 %install
 rm -rf %{buildroot}
 
+%if 0%{?rest}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 # move devel symlinks
@@ -103,9 +113,10 @@
   esac
 done
 popd
+%endif
 
 # install apidocs
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
 cp -prf kdepimlibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdepimlibs-apidocs
 %endif
@@ -120,6 +131,7 @@
 rm -rf %{buildroot} 
 
 
+%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kabc/
@@ -139,8 +151,9 @@
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
+%endif
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 %files apidocs
 %defattr(-,root,root,-)
 %{_kde4_docdir}/HTML/en/kdepimlibs-apidocs/
@@ -148,6 +161,17 @@
 
 
 %changelog
+* Thu Apr 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-3
+- rebuild (again) for the fixed %%{_kde4_buildtype}
+
+* Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-2
+- rebuild for NDEBUG and _kde4_libexecdir
+
+* Fri Mar 28 2008 Than Ngo <than at redhat.com> 4.0.3-1
+- 4.0.3
+- -apidocs: Drop Requires: %%name
+- include noarch build hooks (not enabled)
+
 * Thu Mar 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
 - build apidocs and put them into an -apidocs subpackage (can be turned off)
 - BR doxygen, graphviz and qt4-doc when building apidocs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	8 Mar 2008 23:50:14 -0000	1.10
+++ sources	17 Apr 2008 17:38:21 -0000	1.11
@@ -1 +1 @@
-4d158d6b0fd44a9521b1a7c0fcc8315c  kdepimlibs-4.0.2.tar.bz2
+cd202abc2637aa887d74b54690a432f5  kdepimlibs-4.0.3.tar.bz2