rpms/kdelibs/devel kdelibs.spec, 1.635, 1.636 kde4.csh, 1.6, NONE kde4.sh, 1.7, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6529

Modified Files:
	kdelibs.spec 
Removed Files:
	kde4.csh kde4.sh 
Log Message:
- (Build)Requires: docbook-dtds, docbook-style-xsl
- -devel: move checkXML, meinproc4 here
- drop fedora < 12 conditionals



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -p -r1.635 -r1.636
--- kdelibs.spec	8 Jun 2010 14:38:24 -0000	1.635
+++ kdelibs.spec	8 Jun 2010 15:35:14 -0000	1.636
@@ -25,10 +25,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 BuildRequires: kde4-macros(api) >= 2
 BuildRequires: kde-filesystem >= 4-23
-%if 0%{?fedora} &&  0%{?fedora} < 12
-# used in kde.(sh|csh)
-Requires: coreutils grep
-%endif
+BuildRequires: docbook-dtds docbook-style-xsl
+Requires: docbook-dtds docbook-style-xsl
 Requires: hicolor-icon-theme
 Requires: kde-filesystem >= 4-23
 Requires: kde-settings
@@ -45,10 +43,6 @@ Requires: shared-mime-info
 Requires: soprano%{?_isa} >= %{soprano_version} 
 %global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
 Requires: strigi-libs%{?_isa} >= %{strigi_version} 
-Requires: docbook-dtds docbook-style-xsl
-
-Source1: kde4.sh
-Source2: kde4.csh
 
 # make -devel packages parallel-installable
 Patch0: kdelibs-4.4.85-parallel_devel.patch
@@ -171,9 +165,6 @@ This package includes the common files f
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
 # stuff moved, help upgrade path
-%if 0%{?fedora} && 0%{?fedora} < 12
-Conflicts: kdebase-runtime < 4.2.90
-%endif
 %if 0%{?fedora} && 0%{?fedora} < 13
 Conflicts: kdebase-workspace-devel < 4.3.80
 Obsoletes: kdelibs-experimental-devel < 4.3.75
@@ -297,11 +288,6 @@ do
 done
 popd
 
-%if 0%{?fedora} &&  0%{?fedora} < 12 
-install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
-install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
-%endif
-
 # fix Sonnet documentation multilib conflict
 bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2
 sed -i -e 's!<a name="id[0-9]*"></a>!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
@@ -343,18 +329,41 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
 %doc COPYING.LIB
-%if 0%{?fedora} &&  0%{?fedora} < 12
-%config(noreplace) %{_sysconfdir}/profile.d/*
-%endif
-%{_kde4_bindir}/*
-%exclude %{_kde4_bindir}/kconfig_compiler4
-%{_kde4_appsdir}/*
-# kdewidgets
-%exclude %{_kde4_bindir}/makekdewidgets4
-%exclude %{_kde4_bindir}/kde4-doxygen.sh
-%exclude %{_kde4_appsdir}/kdewidgets/
-%exclude %{_kde4_appsdir}/cmake/
-%{_kde4_configdir}/*
+%{_kde4_bindir}/kbuildsycoca4
+%{_kde4_bindir}/kcookiejar4
+%{_kde4_bindir}/kde4-config
+%{_kde4_bindir}/kded4
+%{_kde4_bindir}/kdeinit4
+%{_kde4_bindir}/kdeinit4_shutdown
+%{_kde4_bindir}/kdeinit4_wrapper
+%{_kde4_bindir}/kjs
+%{_kde4_bindir}/kjscmd
+%{_kde4_bindir}/kross
+%{_kde4_bindir}/kshell4
+%{_kde4_bindir}/kunittestmodrunner
+%{_kde4_bindir}/kwrapper4
+%{_kde4_bindir}/nepomuk-rcgen
+%{_kde4_appsdir}/katepart/
+%{_kde4_appsdir}/kauth/
+%{_kde4_appsdir}/kcharselect/
+%{_kde4_appsdir}/kcm_componentchooser/
+%{_kde4_appsdir}/kconf_update/
+%{_kde4_appsdir}/khtml/
+%{_kde4_appsdir}/kjava/
+%{_kde4_appsdir}/knewstuff/
+%{_kde4_appsdir}/ksgmltools2/
+%{_kde4_appsdir}/kssl/
+%{_kde4_appsdir}/ktexteditor_exporter/
+%{_kde4_appsdir}/ktexteditor_insertfile/
+%{_kde4_appsdir}/ktexteditor_kdatatool/
+%{_kde4_appsdir}/LICENSES/
+%{_kde4_appsdir}/nepomuk/
+%{_kde4_appsdir}/plasma/
+%{_kde4_appsdir}/proxyscout/
+%{_kde4_configdir}/accept-languages.codes
+%{_kde4_configdir}/katemoderc
+%{_kde4_configdir}/katepartpluginsrc
+%{_kde4_configdir}/plasmoids.knsrc
 %{_datadir}/dbus-1/interfaces/*
 %{_sysconfdir}/dbus-1/system.d/*
 %{_kde4_datadir}/mime/packages/kde.xml
@@ -386,7 +395,6 @@ rm -rf %{buildroot}
 %{_kde4_libexecdir}/start_kdeinit_wrapper
 %{_kde4_libdir}/kde4/plugins/
 %{_kde4_sysconfdir}/xdg/menus/*.menu
-%{_mandir}/man1/checkXML.1*
 %{_mandir}/man1/kde4-config.1*
 %{_mandir}/man1/kjs.1*
 %{_mandir}/man1/kjscmd.1*
@@ -397,42 +405,30 @@ rm -rf %{buildroot}
 %{_mandir}/man8/kcookiejar4.8*
 %{_mandir}/man8/kded4.8*
 %{_mandir}/man8/kdeinit4.8*
-%{_mandir}/man8/meinproc4.8*
-# these are in kdelibs-common:
-%exclude %{_kde4_configdir}/kdebug.areas
-%exclude %{_kde4_configdir}/kdebugrc
-%exclude %{_kde4_configdir}/ui/ui_standards.rc
-%exclude %{_kde4_appsdir}/kdeui
-%exclude %{_kde4_configdir}/colors/40.colors
-%exclude %{_kde4_configdir}/colors/Rainbow.colors
-%exclude %{_kde4_configdir}/colors/Royal.colors
-%exclude %{_kde4_configdir}/colors/Web.colors
-%exclude %{_kde4_configdir}/ksslcalist
-%exclude %{_kde4_bindir}/preparetips
 
 %files common
 %defattr(-,root,root,-)
-%{_kde4_configdir}/colors/40.colors
-%{_kde4_configdir}/colors/Rainbow.colors
-%{_kde4_configdir}/colors/Royal.colors
-%{_kde4_configdir}/colors/Web.colors
-%{_kde4_configdir}/ksslcalist
 %{_kde4_bindir}/preparetips
+%{_kde4_configdir}/colors/
+%{_kde4_configdir}/ksslcalist
 %{_kde4_configdir}/kdebug.areas
 %{_kde4_configdir}/kdebugrc
-%dir %{_kde4_configdir}/ui
-%{_kde4_configdir}/ui/ui_standards.rc
-%{_kde4_appsdir}/kdeui
+%{_kde4_configdir}/ui/
+%{_kde4_appsdir}/kdeui/
 %{_kde4_docdir}/HTML/en/common/
 %{_kde4_datadir}/locale/all_languages/
 
 %files devel
 %defattr(-,root,root,-)
 %doc KDE4PORTING.html
+%{_mandir}/man1/checkXML.1*
 %{_mandir}/man1/kdecmake.1*
 %{_mandir}/man1/makekdewidgets.1*
+%{_mandir}/man8/meinproc4.8*
+%{_kde4_bindir}/checkXML
 %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_bindir}/makekdewidgets4
+%{_kde4_bindir}/meinproc4
 %{_kde4_bindir}/kde4-doxygen.sh
 %{_kde4_appsdir}/cmake/
 %{_kde4_appsdir}/kdewidgets/
@@ -448,7 +444,9 @@ rm -rf %{buildroot}
 
 %changelog
 * Tue Jun 08 2010 Jaroslav Reznik <jreznik at redhat.com> - 6:4.4.85-2
-- requires docbook-dtds and docbook-style-xsl
+- (Build)Requires: docbook-dtds, docbook-style-xsl
+- -devel: move checkXML, meinproc4 here
+- drop fedora < 12 conditionals
 
 * Mon Jun 07 2010 Jaroslav Reznik <jreznik at redhat.com> - 6:4.4.85-1
 - 4.5 Beta 2 (4.4.85)


--- kde4.csh DELETED ---


--- kde4.sh DELETED ---