packages: allegro/allegro.spec - moved static-only addon libs to -devel; -s...

[qboosh]

Author: qboosh                       Date: Thu Oct 14 07:41:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- moved static-only addon libs to -devel; -static is gone

---- Files affected:
packages/allegro:
   allegro.spec (1.81 -> 1.82) 

---- Diffs:

================================================================
Index: packages/allegro/allegro.spec
diff -u packages/allegro/allegro.spec:1.81 packages/allegro/allegro.spec:1.82
--- packages/allegro/allegro.spec:1.81	Thu Oct 14 09:27:17 2010
+++ packages/allegro/allegro.spec	Thu Oct 14 09:41:21 2010
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 #
-# TODO: - check (and update if required) allegro-frame-pointer.patch
-#	- unpackaged files
-#	- create bconds for gl, jpg, loadpng and logg
+# TODO: shared gl, jpg, loadpng, logg (instead of static)?
 #
 # Conditional build:
 %bcond_without	alsa	# without ALSA modules
@@ -81,6 +79,12 @@
 Summary(pl.UTF-8):	Biblioteka do programowania gier - pliki nagłówkowe
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	xorg-lib-libX11-devel
+Requires:	xorg-lib-libXcursor-devel
+Requires:	xorg-lib-libXext-devel
+Requires:	xorg-lib-libXpm-devel
+Requires:	xorg-lib-libXxf86vm-devel
+Obsoletes:	allegro-static
 
 %description devel
 Allegro is a cross-platform library intended for use in computer games
@@ -117,31 +121,6 @@
 Ten pakiet zawiera pliki nagłówkowe niezbędne do kompilowania
 aplikacji wykorzystujących bibliotekę allegro.
 
-%package static
-Summary:	A game programming library - static libraries
-Summary(pl.UTF-8):	Biblioteka do programowania gier - biblioteki statyczne
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-Requires:	xorg-lib-libX11-devel
-Requires:	xorg-lib-libXcursor-devel
-Requires:	xorg-lib-libXext-devel
-Requires:	xorg-lib-libXpm-devel
-Requires:	xorg-lib-libXxf86vm-devel
-
-%description static
-Allegro is a cross-platform library intended for use in computer games
-and other types of multimedia programming.
-
-This package contains static libraries for linking with allegro
-applications.
-
-%description static -l pl.UTF-8
-Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w
-grach komputerowych i innych rodzajach oprogramowania multimedialnego.
-
-Ten pakiet zawiera biblioteki statyczne do konsolidacji z aplikacjami
-wykorzystującymi allegro.
-
 %package dga2
 Summary:	A game programming library - DGA2 module
 Summary(pl.UTF-8):	Biblioteka do programowania gier - moduł dla DGA2
@@ -395,6 +374,11 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/allegro-config
 %attr(755,root,root) %{_libdir}/liballeg.so
+# static-only
+%{_libdir}/liballeggl.a
+%{_libdir}/libjpgalleg.a
+%{_libdir}/libloadpng.a
+%{_libdir}/liblogg.a
 %{_includedir}/alleggl.h
 %{_includedir}/allegro.h
 %{_includedir}/jpgalleg.h
@@ -413,14 +397,6 @@
 %{_pkgconfigdir}/loadpng.pc
 %{_pkgconfigdir}/logg.pc
 
-%files static
-%defattr(644,root,root,755)
-# XXX: static-only libs belong to -devel!
-%{_libdir}/liballeggl.a
-%{_libdir}/libjpgalleg.a
-%{_libdir}/libloadpng.a
-%{_libdir}/liblogg.a
-
 %if %{with dga2}
 %files dga2
 %defattr(644,root,root,755)
@@ -543,6 +519,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.82  2010/10/14 07:41:21  qboosh
+- moved static-only addon libs to -devel; -static is gone
+
 Revision 1.81  2010/10/14 07:27:17  qboosh
 - dropped outdated/unsupported/unmaintained frame-pointer patch
 - restored svgalib BR
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/allegro/allegro.spec?r1=1.81&r2=1.82&f=u