SPECS: allegro.spec - updated to 4.2.0 - removed unnecessary patch...

wolf wolf at pld-linux.org
Sun Nov 13 19:47:51 CET 2005


Author: wolf                         Date: Sun Nov 13 18:47:51 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 4.2.0
- removed unnecessary patches (resolved in sources), updated others
- added more bconds
- fixed BuildRequires
- adapterized, fixed Polish descriptions
- added previously unpacked files
(kiesyoo at o2 pl)

---- Files affected:
SPECS:
   allegro.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: SPECS/allegro.spec
diff -u SPECS/allegro.spec:1.60 SPECS/allegro.spec:1.61
--- SPECS/allegro.spec:1.60	Sat May 21 21:24:48 2005
+++ SPECS/allegro.spec	Sun Nov 13 19:47:46 2005
@@ -1,13 +1,20 @@
 # $Revision$, $Date$
 #
+# TODO: Handle situations when there are no modules (most bconds turned off)
+#
 # Conditional build:
 %bcond_without	alsa	# without ALSA modules
 %bcond_without	arts	# without aRts module
-%bcond_without	jack	# without JACK module
+%bcond_without	dga2	# without DGA2 module
 %bcond_without	dbglib	# don't build debug versions of library
+%bcond_without	esd	# without esound module
+%bcond_without	fbcon	# without framebuffer module
+%bcond_without	jack	# without JACK module
 %bcond_without	proflib	# don't debug profiling versions of library
+%bcond_without	sse	# build without sse
+%bcond_without	static	# don't build static versions of library
 %bcond_without	svga	# without svgalib module
-%bcond_without	sse	# build without sse (valgrind doesn't support it yet)
+%bcond_without	vga	# without vga module
 #
 Summary:	A game programming library
 Summary(de):	Eine Bibliothek zur Programmierung von Spielen
@@ -16,28 +23,28 @@
 Summary(it):	Una libreria per la programmazione di videogiochi
 Summary(pl):	Biblioteka do programowania gier
 Name:		allegro
-Version:	4.1.18
+Version:	4.2.0
 Release:	1
 License:	Giftware
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/alleg/%{name}-%{version}.tar.gz
-# Source0-md5:	215b84351f349f5998a77f99bf1218fa
+# Source0-md5:	a8b2c85c58b16345fe735f72763f3a6e
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-examples.patch
 Patch2:		%{name}-opt.patch
 Patch3:		%{name}-ldflags.patch
 Patch4:		%{name}-frame-pointer.patch
-Patch5:		%{name}-alsa-1_0.patch
-Patch6:		%{name}-am18.patch
-Patch7:		%{name}-asm.patch
 URL:		http://alleg.sourceforge.net/
-BuildRequires:	XFree86-devel
+BuildRequires:	X11-devel
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
-%{?with_arts:BuildRequires:	arts-devel}
+%{?with_arts:BuildRequires:	artsc-devel}
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
-BuildRequires:	esound-devel
-%{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
+%{?with_esd:BuildRequires:	esound-devel}
+%if %{with jack}
+BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:	pkgconfig
+%endif
 %{?with_svga:BuildRequires:	svgalib-devel}
 BuildRequires:	texinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,12 +62,12 @@
 programación de juegos u otro tipo de programación multimedia.
 
 %description -l fr
-Allegro est une librairie multi-plateforme destinée ŕ ętre utilisée dans
-les jeux vidéo ou d'autres types de programmation multimédia.
+Allegro est une librairie multi-plateforme destinée ŕ ętre utilisée
+dans les jeux vidéo ou d'autres types de programmation multimédia.
 
 %description -l it
-Allegro č una libreria multipiattaforma dedicata all'uso nei videogiochi
-ed in altri tipi di programmazione multimediale.
+Allegro č una libreria multipiattaforma dedicata all'uso nei
+videogiochi ed in altri tipi di programmazione multimediale.
 
 %description -l pl
 Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w
@@ -92,14 +99,14 @@
 paquete es necesario para compilar los programas que usen Allegro.
 
 %description devel -l fr
-Allegro est une librairie multi-plateforme destinée ŕ ętre utilisée dans
-les jeux vidéo ou d'autres types de programmation multimédia. Ce package
-est nécessaire pour compiler les programmes utilisant Allegro.
+Allegro est une librairie multi-plateforme destinée ŕ ętre utilisée
+dans les jeux vidéo ou d'autres types de programmation multimédia. Ce
+package est nécessaire pour compiler les programmes utilisant Allegro.
 
 %description devel -l it
-Allegro č una libreria multipiattaforma dedicata all'uso nei videogiochi
-ed in altri tipi di programmazione multimediale. Questo pacchetto č
-necessario per compilare programmi scritti con Allegro.
+Allegro č una libreria multipiattaforma dedicata all'uso nei
+videogiochi ed in altri tipi di programmazione multimediale. Questo
+pacchetto č necessario per compilare programmi scritti con Allegro.
 
 %description devel -l pl
 Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w
@@ -177,7 +184,7 @@
 %description profile-static
 liballp - profiling version of static allegro library.
 
-%description debug-static -l pl
+%description profile-static -l pl
 liballp - wersja statycznej biblioteki allegro służąca do
 profilowania.
 
@@ -185,7 +192,7 @@
 Summary:	A game programming library - svgalib module
 Summary(pl):	Biblioteka do programowania gier - moduł dla svgalib
 Group:		Libraries
-PreReq:		%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description svgalib
 Allegro is a cross-platform library intended for use in computer games
@@ -203,7 +210,7 @@
 Summary:	A game programming library - DGA2 module
 Summary(pl):	Biblioteka do programowania gier - moduł dla DGA2
 Group:		Libraries
-PreReq:		%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description dga2
 Allegro is a cross-platform library intended for use in computer games
@@ -221,7 +228,7 @@
 Summary:	A game programming library - esound module
 Summary(pl):	Biblioteka do programowania gier - moduł dla esound
 Group:		Libraries
-PreReq:		%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description esd
 Allegro is a cross-platform library intended for use in computer games
@@ -239,7 +246,7 @@
 Summary:	A game programming library - aRts module
 Summary(pl):	Biblioteka do programowania gier - moduł dla aRts
 Group:		Libraries
-PreReq:		%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description arts
 Allegro is a cross-platform library intended for use in computer games
@@ -257,7 +264,7 @@
 Summary:	A game programming library - framebuffer module
 Summary(pl):	Biblioteka do programowania gier - moduł dla framebuffera
 Group:		Libraries
-PreReq:		%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description fbcon
 Allegro is a cross-platform library intended for use in computer games
@@ -275,7 +282,7 @@
 Summary:	A game programming library - vga module
 Summary(pl):	Biblioteka do programowania gier - moduł dla vga
 Group:		Libraries
-PreReq:		%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description vga
 Allegro is a cross-platform library intended for use in computer games
@@ -293,7 +300,7 @@
 Summary:	A game programming library - ALSA modules
 Summary(pl):	Biblioteka do programowania gier - moduły dla ALSA
 Group:		Libraries
-PreReq:		%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	allegro-alsa9
 
 %description alsa
@@ -313,7 +320,7 @@
 Summary:	A game programming library - JACK module
 Summary(pl):	Biblioteka do programowania gier - moduł dla JACK-a
 Group:		Libraries
-PreReq:		%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description jack
 Allegro is a cross-platform library intended for use in computer games
@@ -321,12 +328,11 @@
 
 This package contains module for use with JACK sound library.
 
-%description alsa -l pl
+%description jack -l pl
 Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w
 grach komputerowych i innych rodzajach oprogramowania multimedialnego.
 
-Ten pakiet zawiera moduł do wykorzystania z biblioteką dźwiękową
-JACK.
+Ten pakiet zawiera moduł do wykorzystania z biblioteką dźwiękową JACK.
 
 %package tools
 Summary:	A game programming library - tools
@@ -336,7 +342,7 @@
 Summary(it):	Programmi di utilitŕ aggiuntivi per la libreria Allegro
 Summary(pl):	Biblioteka do programowania gier - narzędzia
 Group:		Libraries
-PreReq:		%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description tools
 Allegro is a cross-platform library intended for use in computer games
@@ -347,8 +353,8 @@
 %description tools -l de
 Allegro ist eine plattformübergreifende Bibliothek zur Verwendung in
 Computerspielen und anderen Formen von Multinediaprogrammierung.
-Dieses Paket enthält Programme, die für die Entwicklung von
-Allegro Programmen hilfreich sind.
+Dieses Paket enthält Programme, die für die Entwicklung von Allegro
+Programmen hilfreich sind.
 
 %description tools -l es
 Allegro es una librería multi-plataforma creada para ser usada en la
@@ -357,16 +363,16 @@
 desarrollar programas que usen Allegro.
 
 %description tools -l fr
-Allegro est une librairie multi-plateforme destinée ŕ ętre utilisée dans
-les jeux vidéo ou d'autres types de programmation multimédia. Ce package
-contient des outils supplémentaires qui sont utiles pour le développement
-de programmes avec Allegro.
+Allegro est une librairie multi-plateforme destinée ŕ ętre utilisée
+dans les jeux vidéo ou d'autres types de programmation multimédia. Ce
+package contient des outils supplémentaires qui sont utiles pour le
+développement de programmes avec Allegro.
 
 %description tools -l it
-Allegro č una libreria multipiattaforma dedicata all'uso nei videogiochi
-ed in altri tipi di programmazione multimediale. Questo pacchetto
-contiene programmi di utilitŕ aggiuntivi utili allo sviluppo di programmi
-con Allegro.
+Allegro č una libreria multipiattaforma dedicata all'uso nei
+videogiochi ed in altri tipi di programmazione multimediale. Questo
+pacchetto contiene programmi di utilitŕ aggiuntivi utili allo sviluppo
+di programmi con Allegro.
 
 %description tools -l pl
 Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w
@@ -407,9 +413,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 %{__aclocal}
@@ -418,13 +421,24 @@
 TARGET_ARCH="%{rpmcflags}" export TARGET_ARCH
 # dbglib & proflib are compiled besides normlib, so it's ok to have them here
 %configure \
-	--enable-static \
-	%{!?with_svga:--disable-svgalib} \
+	%{?with_static:--enable-static} \
 	%{?with_dbglib:--enable-dbglib} \
 	%{?with_proflib:--enable-proflib} \
+%if %{without alsa}
+	--disable-alsadigi \
+	--disable-alsamidi \
+%endif
 	%{!?with_arts:--disable-artsdigi} \
-	%{!?with_sse:--disable-sse} \
-	%{!?with_sse:--disable-asm} \
+	%{!?with_dga2:--disable-xwin-dga2} \
+	%{!?with_esd:--disable-esddigi} \
+	%{!?with_fbcon:--disable-fbcon} \
+	%{!?with_jack:--disable-jackdigi} \
+	%{!?with_svga:--disable-svgalib} \
+	%{!?with_vga:--disable-vga} \
+%if %{without sse}
+	--disable-sse \
+	--disable-asm \
+%endif
 %ifnarch %{ix86}
 	--disable-asm \
 	--disable-mmx \
@@ -440,7 +454,7 @@
 %{__make} install install-man install-info install-lib \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install modules.lst $RPM_BUILD_ROOT%{_libdir}/allegro/4.1
+install modules.lst $RPM_BUILD_ROOT%{_libdir}/allegro/4.2
 
 mv $RPM_BUILD_ROOT%{_bindir}/demo{,-allegro}
 mv $RPM_BUILD_ROOT%{_bindir}/play{,-allegro}
@@ -464,11 +478,11 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGES THANKS
+%doc AUTHORS CHANGES THANKS readme.txt
 %attr(755,root,root) %{_libdir}/liballeg-%{version}.so
 %dir %{_libdir}/allegro
-%dir %{_libdir}/allegro/4.1
-%{_libdir}/allegro/4.1/modules.lst
+%dir %{_libdir}/allegro/4.2
+%{_libdir}/allegro/4.2/modules.lst
 
 %files devel
 %defattr(644,root,root,755)
@@ -479,9 +493,11 @@
 %{_mandir}/man3/*
 %{_infodir}/*.info*
 
+%if %{with static}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/liballeg.a
+%endif
 
 %if %{with dbglib}
 %files debug
@@ -489,10 +505,12 @@
 %attr(755,root,root) %{_libdir}/liballd-%{version}.so
 %{_libdir}/liballd_unsharable.a
 
+%if %{with static}
 %files debug-static
 %defattr(644,root,root,755)
 %{_libdir}/liballd.a
 %endif
+%endif
 
 %if %{with proflib}
 %files profile
@@ -500,52 +518,62 @@
 %attr(755,root,root) %{_libdir}/liballp-%{version}.so
 %{_libdir}/liballp_unsharable.a
 
+%if %{with static}
 %files profile-static
 %defattr(644,root,root,755)
 %{_libdir}/liballp.a
 %endif
+%endif
 
 %if %{with svga}
 %files svgalib
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-svgalib.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-svgalib.so
 %endif
 
+%if %{with dga2}
 %files dga2
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-dga2.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-dga2.so
+%endif
 
+%if %{with esd}
 %files esd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-esddigi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-esddigi.so
+%endif
 
 %if %{with arts}
 %files arts
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-artsdigi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-artsdigi.so
 %endif
 
+%if %{with fbcon}
 %files fbcon
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-fbcon.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-fbcon.so
+%endif
 
 %ifarch %{ix86}
+%if %{with vga}
 %files vga
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-vga.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-vga.so
+%endif
 %endif
 
 %if %{with alsa}
 %files alsa
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-alsadigi.so
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-alsamidi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-alsadigi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-alsamidi.so
 %endif
 
 %if %{with jack}
 %files jack
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-jackdigi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-jackdigi.so
 %endif
 
 %files tools
@@ -555,6 +583,8 @@
 %attr(755,root,root) %{_bindir}/pack
 %attr(755,root,root) %{_bindir}/rgbmap
 %attr(755,root,root) %{_bindir}/textconv
+%attr(755,root,root) %{_bindir}/xkeymap
+%attr(755,root,root) %{_bindir}/xf2pcx
 %attr(755,root,root) %{_bindir}/dat
 %attr(755,root,root) %{_bindir}/dat2c
 %attr(755,root,root) %{_bindir}/dat2s
@@ -566,6 +596,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/afinfo
 %attr(755,root,root) %{_bindir}/akaitest
+%attr(755,root,root) %{_bindir}/cpptest
 %attr(755,root,root) %{_bindir}/demo-allegro
 %attr(755,root,root) %{_bindir}/digitest
 %attr(755,root,root) %{_bindir}/filetest
@@ -592,11 +623,11 @@
 %attr(755,root,root) %{_bindir}/excustom
 %attr(755,root,root) %{_bindir}/exdata
 %attr(755,root,root) %{_bindir}/exdbuf
-%attr(755,root,root) %{_bindir}/exdodgy
 %attr(755,root,root) %{_bindir}/exexedat
 %attr(755,root,root) %{_bindir}/exfixed
 %attr(755,root,root) %{_bindir}/exflame
 %attr(755,root,root) %{_bindir}/exflip
+%attr(755,root,root) %{_bindir}/exfont
 %attr(755,root,root) %{_bindir}/exgui
 %attr(755,root,root) %{_bindir}/exhello
 %attr(755,root,root) %{_bindir}/exjoy
@@ -605,11 +636,13 @@
 %attr(755,root,root) %{_bindir}/exmem
 %attr(755,root,root) %{_bindir}/exmidi
 %attr(755,root,root) %{_bindir}/exmouse
+%attr(755,root,root) %{_bindir}/expackf
 %attr(755,root,root) %{_bindir}/expal
 %attr(755,root,root) %{_bindir}/expat
 %attr(755,root,root) %{_bindir}/exquat
 %attr(755,root,root) %{_bindir}/exrgbhsv
 %attr(755,root,root) %{_bindir}/exsample
+%attr(755,root,root) %{_bindir}/exsyscur
 %attr(755,root,root) %{_bindir}/exscale
 %attr(755,root,root) %{_bindir}/exscn3d
 %attr(755,root,root) %{_bindir}/exscroll
@@ -633,6 +666,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2005/11/13 18:47:46  wolf
+- updated to 4.2.0
+- removed unnecessary patches (resolved in sources), updated others
+- added more bconds
+- fixed BuildRequires
+- adapterized, fixed Polish descriptions
+- added previously unpacked files
+(kiesyoo at o2 pl)
+
 Revision 1.60  2005/05/21 19:24:48  qboosh
 - updated to 4.1.18
 - fixed info patch, added asm patch for current gas
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/allegro.spec?r1=1.60&r2=1.61&f=u




More information about the pld-cvs-commit mailing list