rpms/kdelibs/devel kdelibs.spec,1.581,1.582

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8892

Modified Files:
	kdelibs.spec 
Log Message:
* Tue Feb 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-4
- -apidocs: build as normal noarch subpkg



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -p -r1.581 -r1.582
--- kdelibs.spec	2 Feb 2010 15:53:56 -0000	1.581
+++ kdelibs.spec	2 Feb 2010 17:05:41 -0000	1.582
@@ -3,10 +3,12 @@
 %define phonon_ver 4.3.80
 %define soprano_ver 2.3.70
 %define strigi_ver 0.7.1
+# to build/include apidocs or not
+%define apidocs 1
 
 Summary: KDE Libraries
 Version: 4.3.98
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -21,12 +23,6 @@ Group:   System Environment/Libraries
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}%{?alphatag}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%ifarch noarch
-%define apidocs 1
-%else
-%define rest 1
-%endif
-
 BuildRequires: kde4-macros(api) >= 2
 BuildRequires: kde-filesystem >= 4-23
 # used in kde.(sh|csh)
@@ -212,6 +208,7 @@ Summary: KDE 4 API documentation
 # Requires: %{name} = %{?epoch:%{epoch}:}%{version}
 Requires: kde-filesystem
 Provides: kdelibs4-apidocs = %{version}-%{release}
+BuildArch: noarch
 
 %description apidocs
 This package includes the KDE 4 API documentation in HTML
@@ -258,9 +255,7 @@ pushd %{_target_platform}
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
 popd
 
-%if 0%{?rest}
 make %{?_smp_mflags} -C %{_target_platform}
-%endif
 
 # build apidocs
 %if 0%{?apidocs}
@@ -272,7 +267,6 @@ doc/api/doxygen.sh .
 %install
 rm -rf %{buildroot}
 
-%if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings
@@ -322,7 +316,6 @@ bzip2 -9 %{buildroot}%{_kde4_docdir}/HTM
 
 # install apidocs and generator script
 install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
-%endif
 
 %if 0%{?apidocs}
 mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
@@ -353,7 +346,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 rm -rf %{buildroot}
 
 
-%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
@@ -442,7 +434,6 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/kdewidgets/
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/
-%endif
 
 %if 0%{?apidocs}
 %files apidocs
@@ -452,6 +443,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Feb 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-4
+- -apidocs: build as normal noarch subpkg
+
 * Tue Feb 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-3
 - respin no_rpath patch, add LIB_INSTALL_DIR rpath only if not in 
   CMAKE_SYSTEM_LIBRARY_PATH.  added some status messages to help debug.