Author: shadzik Date: Fri Jun 13 11:04:00 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - killed -shared subpackage and moved it's insides to main package - re-added files conflicting with kde3 (we will solve it another way in kde3) - cleared todo
---- Files affected: SPECS: kde4-kdelibs.spec (1.76 -> 1.77) ---- Diffs: ================================================================ Index: SPECS/kde4-kdelibs.spec diff -u SPECS/kde4-kdelibs.spec:1.76 SPECS/kde4-kdelibs.spec:1.77 --- SPECS/kde4-kdelibs.spec:1.76 Thu Jun 12 20:47:17 2008 +++ SPECS/kde4-kdelibs.spec Fri Jun 13 13:03:54 2008 @@ -1,13 +1,9 @@ # $Revision$, $Date$ -# TODO: -# - drop kde4-kdelibs-shared subpackage. It claims to obsolete -# kde3 while it's lie. These packages aren't compatible. # # Conditional build: %bcond_without alsa # build without ALSA support %bcond_without apidocs # don't prepare API documentation %bcond_without kerberos5 # disable kerberos -%bcond_with verbose # verbose build # %define _state unstable %define orgname kdelibs @@ -20,7 +16,7 @@ Summary(uk.UTF-8): K Desktop Environment - Бібліотеки Name: kde4-kdelibs Version: 4.0.82 -Release: 1 +Release: 2 License: LGPL Group: X11/Libraries Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 @@ -94,7 +90,6 @@ BuildRequires: utempter-devel BuildRequires: zlib-devel Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-shared = %{version}-%{release} Requires: QtCore >= 4.4.0 Requires: docbook-dtd412-xml Requires: docbook-dtd42-xml @@ -106,6 +101,8 @@ Obsoletes: kdelibs4 Conflicts: kdelibs < 9:3.5.8-11 Conflicts: kdelibs4 +Provides: %{name}-shared +Obsoletes: %{name}-shared BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _defaultdocdir %{_prefix}/share/doc @@ -238,19 +235,6 @@ - listy klas i ich składników - listę przestrzeni nazw (namespace) -%package shared -Summary: KDE 3 and KDE 4 shared files -Summary(pl.UTF-8): Pliki współdzielone między KDE 3 i KDE 4 -Group: X11/Libraries -Provides: kdelibs-shared -Obsoletes: kdelibs-shared - -%description shared -KDE 3 and KDE 4 shared files. - -%description shared -l pl.UTF-8 -Pliki współdzielone między KDE 3 i KDE 4. - %prep %setup -q -n %{orgname}-%{version} %patch0 -p0 @@ -302,11 +286,6 @@ # For fileshare touch $RPM_BUILD_ROOT/etc/security/fileshare.conf -# avoid conflict with kde3. Looks like this is only for upgrading -# directory structure from some old kde version to current kde3/4 -rm $RPM_BUILD_ROOT%{_datadir}/apps/kconf_update/kio_help.upd -rm $RPM_BUILD_ROOT%{_datadir}/apps/kconf_update/move_kio_help_cache.sh - if [ -d $RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs ] ; then mv -f $RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-{%{version}-,}apidocs fi @@ -331,17 +310,15 @@ %attr(755,root,root) %{_bindir}/kdeinit4 %attr(755,root,root) %{_bindir}/kdeinit4_shutdown %attr(755,root,root) %{_bindir}/kdeinit4_wrapper -# -# conflict with kde3 -#%attr(755,root,root) %{_bindir}/kjscmd -# -#%attr(755,root,root) %{_bindir}/kjsconsole +%attr(755,root,root) %{_bindir}/kjscmd %attr(755,root,root) %{_bindir}/kross %attr(755,root,root) %{_bindir}/kshell4 %attr(755,root,root) %{_bindir}/kwrapper4 %attr(755,root,root) %{_bindir}/meinproc4 %attr(755,root,root) %{_bindir}/preparetips - +%attr(755,root,root) %{_bindir}/checkXML +%attr(755,root,root) %{_bindir}/kunittestmodrunner +%attr(755,root,root) %{_bindir}/makekdewidgets # nepomuk ??? %attr(755,root,root) %{_bindir}/nepomuk-rcgen %dir %{_datadir}/apps/nepomuk @@ -351,6 +328,7 @@ ##### nepomuk ??? %{_kdedocdir}/en/sonnet %{_mandir}/man1/kde4-config.1* +%{_mandir}/man1/makekdewidgets.1* %{_mandir}/man7/kdeoptions.7* %{_mandir}/man7/qtoptions.7* %{_mandir}/man8/kbuildsycoca4.8* @@ -359,7 +337,7 @@ %dir %{_datadir}/apps %attr(755,root,root) %{_datadir}/apps/kconf_update/*.pl %{_datadir}/apps/kconf_update/*.upd - +%{_datadir}/apps/kconf_update/move_kio_help_cache.sh %{_datadir}/apps/LICENSES %{_datadir}/apps/kcertpart %{_datadir}/apps/khtml/css/presentational.css @@ -402,6 +380,29 @@ %dir %{_datadir}/dbus-1/interfaces %{_datadir}/dbus-1/interfaces/*.xml +%{_datadir}/apps/katepart +%{_datadir}/apps/kcm_componentchooser +%dir %{_datadir}/apps/kconf_update +%{_datadir}/apps/kdeui +%{_datadir}/apps/kdewidgets +%dir %{_datadir}/apps/khtml +%dir %{_datadir}/apps/khtml/css +%{_datadir}/apps/khtml/css/html4.css +%{_datadir}/apps/khtml/css/quirks.css +%{_datadir}/apps/khtml/khtml_browser.rc +%dir %{_datadir}/apps/kjava +%{_datadir}/apps/kjava/kjava.jar +%{_datadir}/apps/ksgmltools2 +%{_datadir}/apps/kssl +%dir %{_datadir}/config +%dir %{_datadir}/config/ui +%{_datadir}/config/ui/ui_standards.rc +%{_datadir}/config/kdebug.areas +%{_datadir}/config/kdebugrc +%{_datadir}/locale/all_languages +%{_mandir}/man1/checkXML.1* +%lang(en) %{_kdedocdir}/en/common + %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libkde3support.so.* @@ -494,41 +495,17 @@ #%{_kdedocdir}/en/%{name}*-apidocs %endif -%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 -%dir %{_datadir}/apps/kconf_update -#%attr(755,root,root) %{_datadir}/apps/kconf_update/*.sh -%{_datadir}/apps/kdeui -%{_datadir}/apps/kdewidgets -%dir %{_datadir}/apps/khtml -%dir %{_datadir}/apps/khtml/css -%{_datadir}/apps/khtml/css/html4.css -%{_datadir}/apps/khtml/css/quirks.css -%{_datadir}/apps/khtml/khtml_browser.rc -%dir %{_datadir}/apps/kjava -%{_datadir}/apps/kjava/kjava.jar -%{_datadir}/apps/ksgmltools2 -%{_datadir}/apps/kssl -%dir %{_datadir}/config -%dir %{_datadir}/config/ui -%{_datadir}/config/ui/ui_standards.rc -%{_datadir}/config/kdebug.areas -%{_datadir}/config/kdebugrc -%{_datadir}/locale/all_languages -%{_mandir}/man1/checkXML.1* -%lang(en) %{_kdedocdir}/en/common - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.77 2008-06-13 11:03:54 shadzik +- killed -shared subpackage and moved it's insides to main package +- re-added files conflicting with kde3 (we will solve it another way in kde3) +- cleared todo + Revision 1.76 2008-06-12 18:47:17 arekm - TODO about broken -shared subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdelibs.spec?r1=1.76&r2=1.77&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit