rpms/kdelibs/devel kdelibs.spec,1.292,1.293

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Mar 20 20:38:33 UTC 2008


Author: rdieter

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

Modified Files:
	kdelibs.spec 
Log Message:
import what I've got so far, haven't confirmed correctness or buildability.
not tagging or building (yet).

* Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-11
- include noarch build hooks (not enabled)



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- kdelibs.spec	10 Mar 2008 05:28:14 -0000	1.292
+++ kdelibs.spec	20 Mar 2008 20:37:51 -0000	1.293
@@ -1,9 +1,7 @@
-# set this to 0 to disable -apidocs for a faster build
-%define apidocs 1
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -23,6 +21,12 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#ifarch noarch
+%define apidocs 1
+#else
+%define rest 1
+#endif
+
 # for macros.kde4
 BuildRequires: kde-filesystem >= 4
 Requires: dbus-x11
@@ -153,7 +157,7 @@
 Group: Development/Documentation
 Summary: KDE 4 API documentation
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}
-%if "%{name}" == "kdelibs"
+%if "%{name}" != "kdelibs4"
 Provides: kdelibs4-apidocs = %{version}-%{release}
 #else
 # Don't do that for now, we'd need to make sure all Requires: kdelibs-apidocs
@@ -195,10 +199,12 @@
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
 popd
 
+%if 0%{?rest}
 make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+%endif
 
 # build apidocs
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 export QTDOCDIR=`pkg-config --variable=docdir Qt`
 doc/api/doxygen.sh .
 %endif
@@ -207,6 +213,7 @@
 %install
 rm -rf %{buildroot}
 
+%if 0%{?rest}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 # see also use-of/patching of XDG_MENU_PREFIX in kdebase
@@ -245,7 +252,10 @@
 
 # install apidocs and generator script
 install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
-%if "%{?apidocs}" == "1"
+%endif
+
+%if 0%{?apidocs}
+mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
 cp -prf kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs
 %endif
 
@@ -265,6 +275,7 @@
 rm -rf %{buildroot}
 
 
+%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
@@ -297,7 +308,7 @@
 %{_kde4_libdir}/kde4/plugins/phonon_platform/
 %{_kde4_sysconfdir}/xdg/menus/*.menu
 %doc %{_mandir}/man*/*
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 %exclude %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/
 %endif
 # kdelibs-common comes from here for fedora >= 9
@@ -329,15 +340,19 @@
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/
 %{_kde4_libdir}/kde4/plugins/designer/
+%endif
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 %files apidocs
 %defattr(-,root,root,-)
 %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/
 %endif
 
 
-%changelog
+*%changelog
+* Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-11
+- include noarch build hooks (not enabled)
+
 * Mon Mar 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-10
 - work around #436725: BR: libtool-ltdl so graphviz gets a valid libltdl
 




More information about the fedora-extras-commits mailing list