SPECS: glib2.spec - killed -libs, rel. 3

[ankry]

Author: ankry                        Date: Sat Mar 31 06:46:18 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- killed -libs, rel. 3

---- Files affected:
SPECS:
   glib2.spec (1.154 -> 1.155) 

---- Diffs:

================================================================
Index: SPECS/glib2.spec
diff -u SPECS/glib2.spec:1.154 SPECS/glib2.spec:1.155
--- SPECS/glib2.spec:1.154	Fri Mar 30 22:50:10 2007
+++ SPECS/glib2.spec	Sat Mar 31 08:46:12 2007
@@ -18,7 +18,7 @@
 Summary(zh_CN.UTF-8):	实用工具函数库
 Name:		glib2
 Version:	2.12.11
-Release:	2
+Release:	3
 Epoch:		1
 License:	LGPL
 Group:		Libraries
@@ -41,7 +41,7 @@
 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
@@ -93,25 +93,13 @@
 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
@@ -208,15 +196,12 @@
 %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
@@ -253,6 +238,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.155  2007/03/31 06:46:12  ankry
+- killed -libs, rel. 3
+
 Revision 1.154  2007/03/30 20:50:10  qboosh
 - fixed pl for -libs; but IMO separating it is overkill anyway
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glib2.spec?r1=1.154&r2=1.155&f=u