rpms/kdepimlibs/F-8 .cvsignore, 1.9, 1.10 kdepimlibs.spec, 1.16, 1.17 sources, 1.9, 1.10

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Sat Mar 8 23:50:50 UTC 2008


Author: kkofler

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

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
Sync from devel:

* 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

* Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Feb 2008 14:06:23 -0000	1.9
+++ .cvsignore	8 Mar 2008 23:50:17 -0000	1.10
@@ -1,2 +1,3 @@
 kdepimlibs-4.0.0.tar.bz2
 kdepimlibs-4.0.1.tar.bz2
+kdepimlibs-4.0.2.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/kdepimlibs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdepimlibs.spec	7 Feb 2008 14:06:23 -0000	1.16
+++ kdepimlibs.spec	8 Mar 2008 23:50:17 -0000	1.17
@@ -1,7 +1,15 @@
+%if 0%{?fedora} > 8
+# set this to 0 to disable -apidocs for a faster build
+%define apidocs 1
+%else
+# don't build apidocs on Fedora < 9 for now, because we don't have the required
+# files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3
+%define apidocs 0
+%endif
 
 Name: kdepimlibs
 
-Version: 4.0.1
+Version: 4.0.2
 Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -23,6 +31,12 @@
 BuildRequires: openldap-devel
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
+%if "%{?apidocs}" == "1"
+BuildRequires: doxygen
+BuildRequires: graphviz
+BuildRequires: qt4-doc
+%endif
+
 %description
 Personal Information Management (PIM) libraries for the
 K Desktop Environment 4.
@@ -38,6 +52,15 @@
 %description devel
 Header files for developing applications using %{name}.
 
+%package apidocs
+Group: Development/Documentation
+Summary: kdepimlibs API documentation
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}
+
+%description apidocs
+This package includes the kdepimlibs API documentation in HTML
+format for easy browsing.
+
 
 %prep
 %setup -q -n kdepimlibs-%{version}
@@ -52,6 +75,12 @@
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+# build apidocs
+%if "%{?apidocs}" == "1"
+export QTDOCDIR=`pkg-config --variable=docdir Qt`
+kde4-doxygen.sh --doxdatadir=%{_kde4_docdir}/HTML/en/common .
+%endif
+
 
 %install
 rm -rf %{buildroot}
@@ -75,6 +104,12 @@
 done
 popd
 
+# install apidocs
+%if "%{?apidocs}" == "1"
+mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
+cp -prf kdepimlibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdepimlibs-apidocs
+%endif
+
 
 %post -p /sbin/ldconfig
 
@@ -105,8 +140,21 @@
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
 
+%if "%{?apidocs}" == "1"
+%files apidocs
+%defattr(-,root,root,-)
+%{_kde4_docdir}/HTML/en/kdepimlibs-apidocs/
+%endif
+
 
 %changelog
+* 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
+
+* Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.0.2-1
+- 4.0.2
+
 * Wed Jan 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.1-2
 - don't delete kconf_update script, it has been fixed to do the right thing
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Feb 2008 14:06:23 -0000	1.9
+++ sources	8 Mar 2008 23:50:17 -0000	1.10
@@ -1 +1 @@
-537b2034b48bc0c7b732f9fcf2b3397f  kdepimlibs-4.0.1.tar.bz2
+4d158d6b0fd44a9521b1a7c0fcc8315c  kdepimlibs-4.0.2.tar.bz2




More information about the fedora-extras-commits mailing list