SPECS: openoffice.org.spec - -libs-{kde, gtk} are still optional - ...

[glen]

Author: glen                         Date: Fri Jan 26 16:22:51 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- -libs-{kde,gtk} are still optional
- dropped -dirs as no longer needed
- not tested as my build fails ;(

---- Files affected:
SPECS:
   openoffice.org.spec (1.695 -> 1.696) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.695 SPECS/openoffice.org.spec:1.696
--- SPECS/openoffice.org.spec:1.695	Tue Jan 23 23:30:21 2007
+++ SPECS/openoffice.org.spec	Fri Jan 26 17:22:46 2007
@@ -68,7 +68,7 @@
 %endif
 
 %define		ver		2.1.0
-%define		_rel		0.16
+%define		_rel		0.17
 %define		subver		680
 %define		snap		OOE680
 %define		snap2		SRC680
@@ -279,8 +279,7 @@
 Summary:	OpenOffice.org KDE Interface
 Summary(pl):	Interfejs KDE dla OpenOffice.org
 Group:		X11/Libraries
-Requires:	%{name}-dirs = %{epoch}:%{version}-%{release}
-Provides:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:	openoffice-i18n-en
 Obsoletes:	openoffice-i18n-en-kde
 Obsoletes:	openoffice-libs-kde
@@ -295,8 +294,7 @@
 Summary:	OpenOffice.org GTK+ Interface
 Summary(pl):	Interfejs GTK+ dla OpenOffice.org
 Group:		X11/Libraries
-Requires:	%{name}-dirs = %{epoch}:%{version}-%{release}
-Provides:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:	openoffice-i18n-en
 Obsoletes:	openoffice-i18n-en-gtk
 Obsoletes:	openoffice-libs-gtk
@@ -307,26 +305,15 @@
 %description libs-gtk -l pl
 Pakiet biurowy OpenOffice.org - Interfejs GTK+.
 
-%package dirs
-Summary:	Common directories for OpenOffice.org
-Summary(pl):	Katalogi wspólne dla OpenOffice.org
-Group:		X11/Applications
-
-%description dirs
-Common directories for OpenOffice.org.
-
-%description dirs -l pl
-Katalogi wspólne dla OpenOffice.org.
-
 %package core
 Summary:	Core modules for OpenOffice.org
 Summary(pl):	Podstawowe moduły dla OpenOffice.org
 Group:		X11/Applications
-Requires:	%{name}-dirs = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	shared-mime-info
 Obsoletes:	oooqs
 Obsoletes:	openoffice-libs
+Obsoletes:	openoffice.org-dirs
 Obsoletes:	openoffice.org-libs < 1:2.1.0-0.m6.0.11
 # libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
 Requires:	cups-lib
@@ -2428,8 +2415,11 @@
 %files
 %defattr(644,root,root,755)
 
-%files dirs
+%files core
 %defattr(644,root,root,755)
+%doc %{_libdir}/%{name}/LICENSE*
+%doc %{_libdir}/%{name}/*README*
+
 %dir %{_sysconfdir}/openoffice.org
 %dir %{_libdir}/%{name}
 %if %{with java}
@@ -2470,10 +2460,6 @@
 %dir %{_libdir}/%{name}/share/registry/schema/org/openoffice/TypeDetection
 %dir %{_libdir}/%{name}/share/registry/schema/org/openoffice/ucb
 
-%files core
-%defattr(644,root,root,755)
-%doc %{_libdir}/%{name}/LICENSE*
-%doc %{_libdir}/%{name}/*README*
 %attr(755,root,root) %{_libdir}/%{name}/install-dict
 %{_libdir}/%{name}/program/*.rdb
 %{_libdir}/%{name}/program/*.bmp
@@ -3779,6 +3765,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.696  2007/01/26 16:22:46  glen
+- -libs-{kde,gtk} are still optional
+- dropped -dirs as no longer needed
+- not tested as my build fails ;(
+
 Revision 1.695  2007/01/23 22:30:21  glen
 - internal db & java won't work (xmlhelp will fail)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.695&r2=1.696&f=u