SPECS: kdelibs.spec, kdelibs4.spec - kde3 and kde4 shared files

pascalek pascalek at pld-linux.org
Sun Jan 20 10:58:04 CET 2008 

Author: pascalek                     Date: Sun Jan 20 09:58:04 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kde3 and kde4 shared files

---- Files affected:
SPECS:
   kdelibs.spec (1.542 -> 1.543) , kdelibs4.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.542 SPECS/kdelibs.spec:1.543
--- SPECS/kdelibs.spec:1.542	Sat Jan 19 15:31:27 2008
+++ SPECS/kdelibs.spec	Sun Jan 20 10:57:59 2008
@@ -106,6 +106,7 @@
 Requires:	docbook-dtd42-xml
 Requires:	docbook-style-xsl
 Requires:	hicolor-icon-theme
+Requires:	kdelibs-shared
 Requires:	libxml2-progs
 Requires:	qt >= 6:3.3.3-4
 Requires:	setup >= 2.4.6-7
@@ -340,6 +341,14 @@
 nieobsługującej pts-ów typu Unix98 i obawiasz się inwigilacji ze
 strony innych użytkowników lokalnych.
 
+%package shared
+Summary:	KDE3 and KDE4 shared files
+Group:		X11/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description shared
+KDE3 and KDE4 shared files
+
 %prep
 %setup -q -a1
 %patch100 -p0
@@ -441,7 +450,6 @@
 %files
 %defattr(644,root,root,755)
 %ghost /etc/security/fileshare.conf
-%attr(755,root,root) %{_bindir}/checkXML
 %attr(755,root,root) %{_bindir}/cupsdconf
 %attr(755,root,root) %{_bindir}/cupsdoprint
 %attr(755,root,root) %{_bindir}/dcop
@@ -490,12 +498,10 @@
 %attr(755,root,root) %{_bindir}/ksvgtopng
 %attr(755,root,root) %{_bindir}/ktelnetservice
 %attr(755,root,root) %{_bindir}/ktradertest
-%attr(755,root,root) %{_bindir}/kunittestmodrunner
 %attr(755,root,root) %{_bindir}/kwrapper
 %attr(755,root,root) %{_bindir}/lnusertemp
 %attr(755,root,root) %{_bindir}/make_driver_db_cups
 %attr(755,root,root) %{_bindir}/make_driver_db_lpr
-%attr(755,root,root) %{_bindir}/makekdewidgets
 %attr(755,root,root) %{_bindir}/meinproc
 %attr(755,root,root) %{_bindir}/preparetips
 %attr(4755,root,root) %{_bindir}/start_kdeinit
@@ -506,24 +512,22 @@
 %dir %{_datadir}/apps/dcopidlng
 %attr(755,root,root) %{_datadir}/apps/dcopidlng/kalyptus
 %{_datadir}/apps/dcopidlng/*.pm
-%{_datadir}/apps/katepart
 %{_datadir}/apps/kcertpart
-%{_datadir}/apps/kcm_componentchooser
-%dir %{_datadir}/apps/kconf_update
 %attr(755,root,root) %{_datadir}/apps/kconf_update/*.pl
-%attr(755,root,root) %{_datadir}/apps/kconf_update/*.sh
 %{_datadir}/apps/kconf_update/*.upd
 %{_datadir}/apps/kdeprint
-%{_datadir}/apps/kdeui
-%{_datadir}/apps/kdewidgets
 # also contains 3rdparty kpartplugins dir
-%{_datadir}/apps/khtml
+%{_datadir}/apps/khtml/domain_info
+%{_datadir}/apps/khtml/icons
+%{_datadir}/apps/khtml/khtml.rc
+%{_datadir}/apps/khtml/khtml_popupmenu.rc
+%{_datadir}/apps/khtml/kpartplugins
 %{_datadir}/apps/knewstuff
 %{_datadir}/apps/kio_uiserver
-%{_datadir}/apps/kjava
+%{_datadir}/apps/kjava/icons
+%{_datadir}/apps/kjava/kjava.policy
+%{_datadir}/apps/kjava/pluginsinfo
 %{_datadir}/apps/knotify
-%{_datadir}/apps/ksgmltools2
-%{_datadir}/apps/kssl
 %{_datadir}/apps/kstyle
 %{_datadir}/apps/ktexteditor_docwordcompletion
 %{_datadir}/apps/ktexteditor_insertfile
@@ -531,10 +535,19 @@
 %{_datadir}/apps/ktexteditor_kdatatool
 %{_datadir}/apps/proxyscout
 %dir %{_datadir}/autostart
-%{_datadir}/config
+%{_datadir}/config/colors
+%{_datadir}/config/ipv6blacklist
+%{_datadir}/config/katefiletyperc
+%{_datadir}/config/katesyntaxhighlightingrc
+%{_datadir}/config/kdeprintrc
+%{_datadir}/config/khotnewstuffrc
+%{_datadir}/config/ksslcalist
+%{_datadir}/config/kthemestylerc
+%{_datadir}/config/language.codes
+%{_datadir}/config/magic
+%{_datadir}/config/ui/kprintpreviewui.rc
 %dir %{_datadir}/emoticons
 %{_datadir}/emoticons/Default
-%{_datadir}/locale/all_languages
 %{_datadir}/mimelnk
 %dir %{_datadir}/services
 %dir %{_datadir}/services/kresources
@@ -613,7 +626,6 @@
 %dir %{_docdir}/kde
 %dir %{_kdedocdir}
 %dir %{_kdedocdir}/en
-%{_kdedocdir}/en/common
 %lang(en) %{_kdedocdir}/en/kspell
 
 %lang(ca) %dir %{_kdedocdir}/ca
@@ -668,11 +680,6 @@
 %lang(zh_TW) %dir %{_kdedocdir}/zh_TW/common
 
 # 3rdparty directories
-%dir %{_datadir}/applnk
-%dir %{_datadir}/applnk/.hidden
-%dir %{_datadir}/apps/profiles
-%dir %{_datadir}/apps/remotes
-%dir %{_datadir}/config.kcfg
 %dir %{_datadir}/services/kconfiguredialog
 
 # merged kabc files
@@ -923,12 +930,43 @@
 %defattr(644,root,root,755)
 %attr(4755,root,root) %{_bindir}/kgrantpty
 
+%files shared
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/checkXML
+%attr(755,root,root) %{_bindir}/kunittestmodrunner
+%attr(755,root,root) %{_bindir}/makekdewidgets
+%{_datadir}/apps/katepart
+%{_datadir}/apps/kcm_componentchooser
+%attr(755,root,root) %{_datadir}/apps/kconf_update/*.sh
+%{_datadir}/apps/kdeui
+%{_datadir}/apps/kdewidgets
+%{_datadir}/apps/khtml/css/html4.css
+%{_datadir}/apps/khtml/css/quirks.css
+%{_datadir}/apps/khtml/khtml_browser.rc
+%{_datadir}/apps/kjava/kjava.jar
+%{_datadir}/apps/ksgmltools2
+%{_datadir}/apps/kssl
+%{_datadir}/config/ui/ui_standards.rc
+%{_datadir}/config/kdebug.areas
+%{_datadir}/config/kdebugrc
+%lang(en) %{_kdedocdir}/en/common
+%{_datadir}/locale/all_languages
+%dir %{_datadir}/apps/khtml
+%dir %{_datadir}/apps/khtml/css
+%dir %{_datadir}/apps/kjava
+%dir %{_datadir}/config
+%dir %{_datadir}/config/ui
+%dir %{_datadir}/apps/kconf_update
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.543  2008-01-20 09:57:59  pascalek
+- kde3 and kde4 shared files
+
 Revision 1.542  2008-01-19 14:31:27  qboosh
 - bcond descs cleanup
 

================================================================
Index: SPECS/kdelibs4.spec
diff -u SPECS/kdelibs4.spec:1.15 SPECS/kdelibs4.spec:1.16
--- SPECS/kdelibs4.spec:1.15	Sun Jan 20 06:25:24 2008
+++ SPECS/kdelibs4.spec	Sun Jan 20 10:57:59 2008
@@ -100,6 +100,7 @@
 Requires:	docbook-dtd42-xml
 Requires:	docbook-style-xsl
 Requires:	hicolor-icon-theme
+Requires:	kdelibs-shared = %{epoch}:%{version}-%{release}
 Requires:	setup >= 2.4.6-7
 Requires:	xorg-app-iceauth
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -238,33 +239,13 @@
 - listy klas i ich składników
 - listę przestrzeni nazw (namespace)
 
-#%package kgrantpty
-#Summary:	Helper program to fix terminal permissions
-#Summary(pl.UTF-8):   Program pomocniczy do ustawiania uprawnień terminala
-#Group:		Applications/Terminal
-#Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-#%description kgrantpty
-#This suid root program fixes the permissions of pseudo-terminal device
-#files so that they cannot be eavesdropped by other local users.
-#Systems that support /dev/pts (typical PLD installations do) don't
-#require an extra program to do it, in that case this package is
-#useless.
-
-#Install this package if you're running a custom system that lacks
-#Unix98 pts support and privacy from other local users is a concern for
-#you.
-
-#%description kgrantpty -l pl.UTF-8
-#Ten program, działający z uprawnieniami roota, poprawia uprawnienia
-#plików pseudo-terminali, żeby uniknąć ich podsłuchiwania przez innych
-#lokalnych użytkowników. Systemy obsługujące /dev/pts (typowe
-#instalacje PLD go obsługują) nie wymagają do tego dodatkowego
-#programu, w tym przypadku ten pakiet jest bezużyteczny.
-
-#Zainstaluj ten pakiet jeżeli korzystasz z nietypowej konfiguracji
-#nieobsługującej pts-ów typu Unix98 i obawiasz się inwigilacji ze
-#strony innych użytkowników lokalnych.
+%package -n kdelibs-shared
+Summary:	KDE3 and KDE4 shared files
+Group:		X11/Libraries
+Provides:	kdelibs-shared
+
+%description -n kdelibs-shared
+KDE3 and KDE4 shared files
 
 %prep
 %setup -q -n %{orgname}-%{version}
@@ -331,10 +312,8 @@
 %dir %{_docdir}/kde
 %dir %{_kdedocdir}
 %dir %{_kdedocdir}/en
-%lang(en) %{_kdedocdir}/en/common
 %ghost /etc/security/fileshare.conf
 %attr(755,root,root) %{_bindir}/kde4automoc
-%attr(755,root,root) %{_bindir}/checkXML
 %attr(755,root,root) %{_bindir}/kjs
 %attr(755,root,root) %{_bindir}/kbuildsycoca4
 %attr(755,root,root) %{_bindir}/kcookiejar4
@@ -347,9 +326,7 @@
 %attr(755,root,root) %{_bindir}/kjsconsole
 %attr(755,root,root) %{_bindir}/kross
 %attr(755,root,root) %{_bindir}/kshell4
-%attr(755,root,root) %{_bindir}/kunittestmodrunner
 %attr(755,root,root) %{_bindir}/kwrapper4
-%attr(755,root,root) %{_bindir}/makekdewidgets
 %attr(755,root,root) %{_bindir}/meinproc4
 %attr(755,root,root) %{_bindir}/preparetips
 
@@ -369,21 +346,18 @@
 
 %dir %{_datadir}/autostart
 %dir %{_datadir}/apps
-%dir %{_datadir}/apps/kconf_update
 %attr(755,root,root) %{_datadir}/apps/kconf_update/*.pl
-%attr(755,root,root) %{_datadir}/apps/kconf_update/*.sh
 %{_datadir}/apps/kconf_update/*.upd
 
 %{_datadir}/apps/LICENSES
-%{_datadir}/apps/katepart
 %{_datadir}/apps/kcertpart
-%{_datadir}/apps/kcm_componentchooser
-%{_datadir}/apps/kdeui
-%{_datadir}/apps/kdewidgets
-%{_datadir}/apps/khtml
-%{_datadir}/apps/kjava
-%{_datadir}/apps/ksgmltools2
-%{_datadir}/apps/kssl
+%{_datadir}/apps/khtml/css/presentational.css
+%{_datadir}/apps/khtml/domain_info
+%{_datadir}/apps/khtml/icons
+%{_datadir}/apps/khtml/khtml.rc
+%{_datadir}/apps/khtml/kpartplugins
+%{_datadir}/apps/kjava/kjava.policy
+%{_datadir}/apps/kjava/pluginsinfo
 %{_datadir}/apps/ktexteditor_docwordcompletion
 %{_datadir}/apps/ktexteditor_insertfile
 %{_datadir}/apps/ktexteditor_kdatatool
@@ -405,11 +379,12 @@
 %dir %{_datadir}/applnk/.hidden
 %dir %{_datadir}/apps/profiles
 %dir %{_datadir}/apps/remotes
-%dir %{_datadir}/config.kcfg
 %dir %{_datadir}/services/kconfiguredialog
-
-%{_datadir}/config
-%{_datadir}/locale/all_languages
+%{_datadir}/config/accept-languages.codes
+%{_datadir}/config/colors
+%{_datadir}/config/kdxspreviewrc
+%{_datadir}/config/ksslcalist
+%{_datadir}/config/magic
 %{_datadir}/mime/packages
 %dir %{_datadir}/kde4
 %{_datadir}/kde4/servicetypes
@@ -517,12 +492,43 @@
 #%{_kdedocdir}/en/%{name}*-apidocs
 %endif
 
+%files -n kdelibs-shared
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/checkXML
+%attr(755,root,root) %{_bindir}/kunittestmodrunner
+%attr(755,root,root) %{_bindir}/makekdewidgets
+%{_datadir}/apps/katepart
+%{_datadir}/apps/kcm_componentchooser
+%attr(755,root,root) %{_datadir}/apps/kconf_update/*.sh
+%{_datadir}/apps/kdeui
+%{_datadir}/apps/kdewidgets
+%{_datadir}/apps/khtml/css/html4.css
+%{_datadir}/apps/khtml/css/quirks.css
+%{_datadir}/apps/khtml/khtml_browser.rc
+%{_datadir}/apps/kjava/kjava.jar
+%{_datadir}/apps/ksgmltools2
+%{_datadir}/apps/kssl
+%{_datadir}/config/ui/ui_standards.rc
+%{_datadir}/config/kdebug.areas
+%{_datadir}/config/kdebugrc
+%lang(en) %{_kdedocdir}/en/common
+%{_datadir}/locale/all_languages
+%dir %{_datadir}/apps/khtml
+%dir %{_datadir}/apps/khtml/css
+%dir %{_datadir}/apps/kjava
+%dir %{_datadir}/config
+%dir %{_datadir}/config/ui
+%dir %{_datadir}/apps/kconf_update
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2008-01-20 09:57:59  pascalek
+- kde3 and kde4 shared files
+
 Revision 1.15  2008-01-20 05:25:24  glen
 - rpm macros for cmake
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdelibs.spec?r1=1.542&r2=1.543&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdelibs4.spec?r1=1.15&r2=1.16&f=u

More information about the pld-cvs-commit mailing list