SPECS: GConf2.spec - separated -libs (libgconf-2 + gconftool-2) to allow de...

Fri Dec 26 17:56:48 CET 2008

Author: qboosh                       Date: Fri Dec 26 16:56:48 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- separated -libs (libgconf-2 + gconftool-2) to allow development without
  installing daemons or suids (dbus and policykit)

---- Files affected:
SPECS:
   GConf2.spec (1.137 -> 1.138) 

---- Diffs:

================================================================
Index: SPECS/GConf2.spec
diff -u SPECS/GConf2.spec:1.137 SPECS/GConf2.spec:1.138

--- SPECS/GConf2.spec:1.137	Tue Oct 14 01:26:19 2008
+++ SPECS/GConf2.spec	Fri Dec 26 17:56:43 2008
@@ -12,7 +12,7 @@
 Summary(ru.UTF-8):	Система конфигурации GNOME 2
 Name:		GConf2
 Version:	2.24.0
-Release:	1
+Release:	2
 License:	LGPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/GConf/2.24/GConf-%{version}.tar.bz2
@@ -37,8 +37,7 @@
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 Requires(post):	findutils
-Requires:	ORBit2 >= 1:2.14.9
-Requires:	glib2 >= 1:2.18.0
+Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	GConf2-xinitrc
 Obsoletes:	libGConf2
 # sr at Latn vs. sr at latin
@@ -60,33 +59,38 @@
 %description -l pt_BR.UTF-8
 Gconf2 é o sistema de banco de dados de configuração do GNOME2.
 
-%package apidocs
-Summary:	GConf2 API documentation
-Summary(pl.UTF-8):	Dokumentacja API GConf2
-Group:		Documentation
-Requires:	gtk-doc-common
-
-%description apidocs
-GConf2 API documentation.
+%package libs
+Summary:	GConf2 shared library
+Summary(pl.UTF-8):	Biblioteka współdzielona GConf2
+Group:		Libraries
+Requires:	ORBit2 >= 1:2.14.9
+Requires:	glib2 >= 1:2.18.0
+Conflicts:	GConf2 < 2.24.0-2
 
-%description apidocs -l pl.UTF-8
-Dokumentacja API GConf2.
+%description libs
+GConf2 shared library and gconftool utility (used both for
+configuration management and development purposes).
+
+%description libs -l pl.UTF-8
+Biblioteka współdzielona GConf2 oraz narzędzie gconftool (używane
+zarówno przy zarządzaniu konfiguracją, jak i tworzeniu
+oprogramowania).
 
 %package devel
-Summary:	GConf2 includes, etc
-Summary(pl.UTF-8):	Pliki nagłówkowe GConf2
+Summary:	Header files for GConf2 library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki GConf2
 Summary(pt_BR.UTF-8):	Sistema de Configuração do GNOME2 - arquivos para desenvolvimento
-Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Group:		Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	ORBit2-devel >= 1:2.14.9
 Requires:	libxml2-devel >= 1:2.6.30
 Obsoletes:	libGConf2-devel
 
 %description devel
-GConf2 includes etc.
+Header files for GConf2 library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe GConf2.
+Pliki nagłówkowe biblioteki GConf2.
 
 %description devel -l pt_BR.UTF-8
 Sistema de Configuração do GNOME2 - arquivos para desenvolvimento.
@@ -95,7 +99,7 @@
 Summary:	GConf2 static libraries
 Summary(pl.UTF-8):	Biblioteki statyczne GConf2
 Summary(pt_BR.UTF-8):	Bibliotecas estáticas para desenvolvimento com gconf2
-Group:		X11/Development/Libraries
+Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
@@ -107,10 +111,22 @@
 %description static -l pt_BR.UTF-8
 Bibliotecas estáticas para desenvolvimento com gconf
 
+%package apidocs
+Summary:	GConf2 API documentation
+Summary(pl.UTF-8):	Dokumentacja API GConf2
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+GConf2 API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API GConf2.
+
 %package examples
 Summary:	GConf2 - example programs
 Summary(pl.UTF-8):	GConf2 - przykładowe programy
-Group:		X11/Development/Libraries
+Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description examples
@@ -184,7 +200,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 umask 022
 for GCONF_DIR in %{_sysconfdir}/gconf/gconf.xml.mandatory %{_sysconfdir}/gconf/gconf.xml.defaults ;
     do
@@ -197,18 +212,16 @@
     fi
 done
 
-%postun	-p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
 %attr(755,root,root) %{_bindir}/gconf-merge-tree
-%attr(755,root,root) %{_bindir}/gconftool-2
 %attr(755,root,root) %{_libexecdir}/gconf-defaults-mechanism
 %attr(755,root,root) %{_libexecdir}/gconf-sanity-check-2
 %attr(755,root,root) %{_libexecdir}/gconfd-2
-%attr(755,root,root) %{_libdir}/libgconf-2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgconf-2.so.4
 %dir %{_libdir}/GConf2
 %attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-oldxml.so
 %attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-xml.so
@@ -224,11 +237,13 @@
 %dir %{_datadir}/GConf
 %dir %{_datadir}/GConf/schema
 %{_datadir}/sgml/gconf
-%{_mandir}/man1/gconftool-2.1*
 
-%files apidocs
+%files libs -f %{name}.lang
 %defattr(644,root,root,755)
-%{_gtkdocdir}/gconf
+%attr(755,root,root) %{_libdir}/libgconf-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgconf-2.so.4
+%attr(755,root,root) %{_bindir}/gconftool-2
+%{_mandir}/man1/gconftool-2.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -245,6 +260,10 @@
 %{_libdir}/libgconf-2.a
 %endif
 
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gconf
+
 %files examples
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-%{version}
@@ -262,6 +281,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.138  2008/12/26 16:56:43  qboosh
+- separated -libs (libgconf-2 + gconftool-2) to allow development without
+  installing daemons or suids (dbus and policykit)
+
 Revision 1.137  2008/10/13 23:26:19  sls
 - BR: PolicyKit-devel >= 0.9 for polkit_dbus_error_generate
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/GConf2.spec?r1=1.137&r2=1.138&f=u

