rpms/kdelibs/devel kdelibs.spec,1.252,1.253
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Mon Dec 17 18:00:39 UTC 2007
Author: kkofler
Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26179/devel
Modified Files:
kdelibs.spec
Log Message:
* Mon Dec 17 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-7
- split out kdelibs-common on F9+ (shared with KDE 3)
- Requires: kdelibs-common (F9+)
Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- kdelibs.spec 11 Dec 2007 12:31:20 -0000 1.252
+++ kdelibs.spec 17 Dec 2007 17:59:59 -0000 1.253
@@ -4,7 +4,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 3.97.0
-Release: 6%{?dist}
+Release: 7%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@@ -35,6 +35,9 @@
Requires: kde-settings
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires: shared-mime-info
+%if "%{name}" == "kdelibs"
+Requires: kdelibs-common
+%endif
Source1: kde4.sh
Source2: kde4.csh
@@ -87,6 +90,14 @@
%description
Libraries for the K Desktop Environment 4.
+%if "%{name}" == "kdelibs"
+%package common
+Group: System Environment/Libraries
+Summary: Common files for KDE 3 and KDE 4 libraries
+%description common
+This package includes the common files for the KDE 3 and KDE 4 libraries.
+%endif
+
%package devel
Group: Development/Libraries
Summary: Header files for compiling KDE 4 applications
@@ -201,9 +212,6 @@
%{_kde4_sharedir}/kde4/services/*
%{_kde4_sharedir}/kde4/servicetypes/*
%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
-%if "%{name}" == "kdelibs"
-%{_kde4_datadir}/locale/all_languages/
-%endif
%{_kde4_docdir}/HTML/en/*
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkdeinit4_*.so
@@ -211,6 +219,26 @@
%exclude %{_kde4_libdir}/kde4/devel/
%{_kde4_sysconfdir}/xdg/menus/*.menu
%doc %{_mandir}/man*/*
+# kdelibs-common comes from here for fedora >= 9
+%if "%{name}" == "kdelibs"
+%exclude %{_kde4_bindir}/checkXML
+%exclude %{_kde4_bindir}/kunittestmodrunner
+%exclude %{_kde4_configdir}/kdebug.areas
+%exclude %{_kde4_configdir}/kdebugrc
+%exclude %{_kde4_configdir}/ui/ui_standards.rc
+%exclude %{_kde4_docdir}/HTML/en/common
+
+%files common
+%defattr(-,root,root,-)
+%{_kde4_bindir}/checkXML
+%{_kde4_bindir}/kunittestmodrunner
+%{_kde4_configdir}/kdebug.areas
+%{_kde4_configdir}/kdebugrc
+%dir %{_kde4_configdir}/ui
+%{_kde4_configdir}/ui/ui_standards.rc
+%{_kde4_docdir}/HTML/en/common
+%{_kde4_datadir}/locale/all_languages/
+%endif
%files devel
%defattr(-,root,root,-)
@@ -226,6 +254,10 @@
%changelog
+* Mon Dec 17 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-7
+- split out kdelibs-common on F9+ (shared with KDE 3)
+- Requires: kdelibs-common (F9+)
+
* Tue Dec 11 2007 Than Ngo <than at redhat.com> 3.97.0-6
- enable subversion again
More information about the scm-commits
mailing list