SPECS: NetworkManager.spec - unified

[qboosh]

Author: qboosh                       Date: Wed Sep  6 06:08:43 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   NetworkManager.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/NetworkManager.spec
diff -u SPECS/NetworkManager.spec:1.23 SPECS/NetworkManager.spec:1.24
--- SPECS/NetworkManager.spec:1.23	Tue Aug 29 20:51:53 2006
+++ SPECS/NetworkManager.spec	Wed Sep  6 08:08:37 2006
@@ -43,6 +43,18 @@
 %description -l pl
 Zarządca sieci dla GNOME.
 
+%package libs
+Summary:	Network Manager shared libraries
+Summary(pl):	Biblioteki dzielone Network Managera
+Group:		X11/Libraries
+Conflicts:	NetworkManager < 0.6.4-0.2
+
+%description libs
+Network Manager shared libraries.
+
+%description libs -l pl
+Biblioteki dzielone Network Managera.
+
 %package devel
 Summary:	Network Manager includes and more
 Summary(pl):	Pliki nagłówkowe Network Managera
@@ -57,18 +69,6 @@
 %description devel -l pl
 Pliki nagłówkowe Network Manager.
 
-%package libs
-Summary:	Network Manager shared libraries
-Summary(pl):	Biblioteki dzielone Network Managera
-Group:		X11/Libraries
-Conflicts:	NetworkManager < 0.6.4-0.2
-
-%description libs
-Network Manager shared libraries
-
-%description libs -l pl
-Biblioteki dzielone Network Managera
-
 %package static
 Summary:	Network Manager static libraries
 Summary(pl):	Statyczne biblioteki Network Managera
@@ -139,6 +139,10 @@
 %{_sysconfdir}/dbus-1/system.d/*
 %{_iconsdir}/*/*/apps/*.png
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnm-util.so
@@ -150,10 +154,6 @@
 %{_pkgconfigdir}/libnm-util.pc
 %{_pkgconfigdir}/libnm_glib.pc
 
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libnm-util.a
@@ -165,6 +165,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/09/06 06:08:37  qboosh
+- unified
+
 Revision 1.23  2006/08/29 18:51:53  patrys
 - add conflict with older main package
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/NetworkManager.spec?r1=1.23&r2=1.24&f=u