- killed -libs, rel. 3

Changed files:
    glib2.spec -> 1.155

diff --git a/glib2.spec b/glib2.spec
index 25ad1060ec5bd94883459d598ed314b4d043e6fb..3f44916ae82688785cc8c22b3ade1d6170318c16 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -17,7 +17,7 @@ Summary(tr.UTF-8):    Yararlı ufak yordamlar kitaplığı
 Summary(zh_CN.UTF-8):  实用工具函数库
 Name:          glib2
 Version:       2.12.11
-Release:       2
+Release:       3
 Epoch:         1
 License:       LGPL
 Group:         Libraries
@@ -40,7 +40,7 @@ BuildRequires:        pkgconfig >= 1:0.14.0
 BuildRequires: rpmbuild(macros) >= 1.197
 %{!?with_apidocs:BuildRequires:        sed >= 4.0}
 Requires:      iconv
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes:     %{name}-libs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -92,25 +92,13 @@ arquivos de inclusão estão em glib-devel.
 Yararlı yordamlar kitaplığı. Geliştirme kitaplıkları ve başlık
 dosyaları glib-devel paketinde yer almaktadır.
 
-%package libs
-Summary:       Shared Glib libraries
-Summary(pl.UTF-8):     Biblioteki współdzielone Glib
-Group:         Libraries
-Conflicts:     glib2 < 1:2.12.11-2
-
-%description libs
-Glib shared libraries.
-
-%description libs -l pl.UTF-8
-Biblioteki współdzielone Glib.
-
 %package devel
 Summary:       Glib heades files, documentation
 Summary(es.UTF-8):     Conjunto de funciones gráficas utilitarias para desarrollo
 Summary(pl.UTF-8):     Pliki nagłówkowe i dokumentacja do glib
 Summary(pt_BR.UTF-8):  Conjunto de ferramentas e biblioteca do kit de desenho do GIMP
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 Header files for the support library for the GIMP's X libraries, which
@@ -207,15 +195,12 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  libs -p /sbin/ldconfig
-%postun        libs -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files -f glib20.lang
 %defattr(644,root,root,755)
 %doc AUTHORS README NEWS
-
-%files libs
-%defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel