From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 26 Dec 2008 16:56:43 +0000 (+0000)
Subject: - separated -libs (libgconf-2 + gconftool-2) to allow development without
X-Git-Tag: auto/th/GConf2-2_26_0-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2FGConf2.git;a=commitdiff_plain;h=10040bca4c1c2b4f6692e3bd2cb6c1c25dc06c2b

- separated -libs (libgconf-2 + gconftool-2) to allow development without
  installing daemons or suids (dbus and policykit)

Changed files:
    GConf2.spec -> 1.138
---

diff --git a/GConf2.spec b/GConf2.spec
index f8381aa..79a0d9f 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -11,7 +11,7 @@ Summary(pt_BR.UTF-8):	Sistema de Configuração do GNOME 2
 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
@@ -36,8 +36,7 @@ BuildRequires:	perl-base
 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@Latn vs. sr@latin
@@ -59,33 +58,38 @@ wykryć brak GNOME2 i skompilować tylko wersję podstawową GConf2.
 %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
+%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
-GConf2 API documentation.
+%description libs
+GConf2 shared library and gconftool utility (used both for
+configuration management and development purposes).
 
-%description apidocs -l pl.UTF-8
-Dokumentacja API GConf2.
+%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.
@@ -94,7 +98,7 @@ Sistema de Configuração do GNOME2 - arquivos para desenvolvimento.
 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
@@ -106,10 +110,22 @@ Biblioteki statyczne GConf2.
 %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
@@ -183,7 +199,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/GConf2/lib*.{la,a}
 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
@@ -196,18 +211,16 @@ for GCONF_DIR in %{_sysconfdir}/gconf/gconf.xml.mandatory %{_sysconfdir}/gconf/g
     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
@@ -223,11 +236,13 @@ done
 %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)
@@ -244,6 +259,10 @@ done
 %{_libdir}/libgconf-2.a
 %endif
 
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gconf
+
 %files examples
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-%{version}