rpms/kdepimlibs/devel .cvsignore, 1.15, 1.16 kdepimlibs.spec, 1.28, 1.29

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdepimlibs.spec 
Log Message:
- -apidocs: Drop Requires: %%name
- include noarch build hooks (not enabled)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	28 Mar 2008 16:38:56 -0000	1.15
+++ .cvsignore	28 Mar 2008 18:19:06 -0000	1.16
@@ -1,4 +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/devel/kdepimlibs.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kdepimlibs.spec	28 Mar 2008 16:38:56 -0000	1.28
+++ kdepimlibs.spec	28 Mar 2008 18:19:06 -0000	1.29
@@ -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,6 +8,9 @@
 # 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
 
@@ -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/
@@ -150,6 +163,8 @@
 %changelog
 * 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)