SPECS: kde4-koffice.spec - prevent loops in requirements
shadzik
shadzik at pld-linux.org
Thu Jan 29 03:41:52 CET 2009
Author: shadzik Date: Thu Jan 29 02:41:52 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- prevent loops in requirements
---- Files affected:
SPECS:
kde4-koffice.spec (1.22 -> 1.23)
---- Diffs:
================================================================
Index: SPECS/kde4-koffice.spec
diff -u SPECS/kde4-koffice.spec:1.22 SPECS/kde4-koffice.spec:1.23
--- SPECS/kde4-koffice.spec:1.22 Thu Jan 29 02:44:15 2009
+++ SPECS/kde4-koffice.spec Thu Jan 29 03:41:46 2009
@@ -176,7 +176,7 @@
Summary: KOffice - kformula
Summary(pl.UTF-8): KOffice - kformula
Group: X11/Applications
-Requires: %{name}-common = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
%description kformula
KFormula is KOffice part for creating formulas, equations, etc...
@@ -256,7 +256,6 @@
%package kross-python
Summary: KOffice - Kross Python
Group: X11/Applications
-Requires: %{name}-common = %{version}-%{release}
%description kross-python
Kross is a scripting bridge to embed scripting functionality into an
@@ -267,7 +266,6 @@
%package kross-ruby
Summary: KOffice - Kross Ruby
Group: X11/Applications
-Requires: %{name}-common = %{version}-%{release}
%description kross-ruby
Kross is a scripting bridge to embed scripting functionality into an
@@ -310,25 +308,6 @@
%description kword -l pt_BR.UTF-8
Processador de texto do KOffice.
-%package apidocs
-Summary: Koffice API documentation
-Summary(pl.UTF-8): Dokumentacja API dla Koffice
-Group: Documentation
-Requires: %{name}-devel = %{version}-%{release}
-
-%description apidocs
-Annotated reference of KOffice libraries programming interface
-including:
-- class lists
-- class members
-- namespaces
-
-%description apidocs -l pl.UTF-8
-Dokumentacja interfejsu programowania bibliotek KOffice z przypisami.
-Zawiera:
-- listy klas i ich składników
-- listę przestrzeni nazw (namespace)
-
%prep
%setup -q -n %{origname}-%{version}
@@ -466,22 +445,20 @@
%attr(755,root,root) %{_libdir}/kde4/spreadsheetshape.so
%attr(755,root,root) %{_libdir}/kde4/textshape.so
%attr(755,root,root) %{_libdir}/kde4/textvariables.so
-%attr(755,root,root) %ghost %{_libdir}/libflake.so.?
-%attr(755,root,root) %{_libdir}/libflake.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkoguiutils.so.?
-%attr(755,root,root) %{_libdir}/libkoguiutils.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libkokross.so.?
%attr(755,root,root) %{_libdir}/libkokross.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkomain.so.?
-%attr(755,root,root) %{_libdir}/libkomain.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libkoodf.so.?
%attr(755,root,root) %{_libdir}/libkoodf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkoresources.so.?
-%attr(755,root,root) %{_libdir}/libkoresources.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libkostore.so.?
%attr(755,root,root) %{_libdir}/libkostore.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libkrossmodulekrita.so.?
%attr(755,root,root) %{_libdir}/libkrossmodulekrita.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkomain.so.?
+%attr(755,root,root) %{_libdir}/libkomain.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libflake.so.?
+%attr(755,root,root) %{_libdir}/libflake.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkoresources.so.?
+%attr(755,root,root) %{_libdir}/libkoresources.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libpigmentcms.so.?
%attr(755,root,root) %{_libdir}/libpigmentcms.so.*.*.*
%{_datadir}/kde4/services/Filterkpr2odf.desktop
@@ -500,12 +477,31 @@
%{_datadir}/kde4/services/spellcheck.desktop
%{_datadir}/kde4/services/textshape.desktop
%{_datadir}/kde4/services/textvariables.desktop
+# these libs actually need to be here, to prevent LOOPS
+%attr(755,root,root) %{_libdir}/libkarboncommon.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkarboncommon.so.?
+%attr(755,root,root) %ghost %{_libdir}/libkritaimage.so.?
+%attr(755,root,root) %{_libdir}/libkritaimage.so.*.*.*
+%attr(755,root,root) %{_libdir}/libkwordprivate.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkwordprivate.so.?
+%attr(755,root,root) %ghost %{_libdir}/libkoguiutils.so.?
+%attr(755,root,root) %{_libdir}/libkoguiutils.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkritaui.so.?
+%attr(755,root,root) %{_libdir}/libkritaui.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkspreadcommon.so.?
+%attr(755,root,root) %{_libdir}/libkspreadcommon.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkplatokernel.so.?
+%attr(755,root,root) %{_libdir}/libkplatokernel.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkplatomodels.so.?
+%attr(755,root,root) %{_libdir}/libkplatomodels.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkplatoprivate.so.?
+%attr(755,root,root) %{_libdir}/libkplatoprivate.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkplatoui.so.?
+%attr(755,root,root) %{_libdir}/libkplatoui.so.*.*.*
%files karbon
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/karbon
-%attr(755,root,root) %{_libdir}/libkarboncommon.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkarboncommon.so.?
%attr(755,root,root) %{_libdir}/libkarbonui.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libkarbonui.so.?
%attr(755,root,root) %{_libdir}/libkdeinit4_karbon.so
@@ -550,14 +546,6 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kplato
%attr(755,root,root) %{_libdir}/libkdeinit4_kplato.so
-%attr(755,root,root) %ghost %{_libdir}/libkplatokernel.so.?
-%attr(755,root,root) %{_libdir}/libkplatokernel.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkplatomodels.so.?
-%attr(755,root,root) %{_libdir}/libkplatomodels.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkplatoprivate.so.?
-%attr(755,root,root) %{_libdir}/libkplatoprivate.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkplatoui.so.?
-%attr(755,root,root) %{_libdir}/libkplatoui.so.*.*.*
%attr(755,root,root) %{_libdir}/kde4/libkplatopart.so
%{_datadir}/apps/kplato
%{_datadir}/kde4/services/kplatopart.desktop
@@ -609,12 +597,8 @@
%attr(755,root,root) %{_libdir}/libkrita_xyz_u16.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libkritagrayscale.so.?
%attr(755,root,root) %{_libdir}/libkritagrayscale.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkritaimage.so.?
-%attr(755,root,root) %{_libdir}/libkritaimage.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libkritalibpaintop.so.?
%attr(755,root,root) %{_libdir}/libkritalibpaintop.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkritaui.so.?
-%attr(755,root,root) %{_libdir}/libkritaui.so.*.*.*
%attr(755,root,root) %{_libdir}/kde4/krita*.so
%attr(755,root,root) %{_libdir}/kde4/libkritabmpexport.so
%attr(755,root,root) %{_libdir}/kde4/libkritagmagickexport.so
@@ -662,8 +646,6 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kspread
%attr(755,root,root) %{_libdir}/libkdeinit4_kspread.so
-%attr(755,root,root) %ghost %{_libdir}/libkspreadcommon.so.?
-%attr(755,root,root) %{_libdir}/libkspreadcommon.so.*.*.*
%attr(755,root,root) %{_libdir}/kde4/kspread_plugin_tool_calendar.so
%attr(755,root,root) %{_libdir}/kde4/kspreadbitopsmodule.so
%attr(755,root,root) %{_libdir}/kde4/kspreadconversionmodule.so
@@ -698,8 +680,6 @@
%attr(755,root,root) %{_bindir}/kthesaurus
%attr(755,root,root) %{_bindir}/kword
%attr(755,root,root) %{_libdir}/libkdeinit4_kword.so
-%attr(755,root,root) %{_libdir}/libkwordprivate.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkwordprivate.so.?
%attr(755,root,root) %{_libdir}/libkword*export*.so
%attr(755,root,root) %ghost %{_libdir}/libkwordexportfilters.so.?
%attr(755,root,root) %{_libdir}/libkdeinit4_kthesaurus.so
@@ -741,6 +721,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2009/01/29 02:41:46 shadzik
+- prevent loops in requirements
+
Revision 1.22 2009/01/29 01:44:15 shadzik
- libkdeinit4* lib for krita and kspread
- don't require kdebase from kde3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-koffice.spec?r1=1.22&r2=1.23&f=u
More information about the pld-cvs-commit
mailing list