rpms/allegro/devel allegro.spec,1.4,1.5

[Ville Skytta (scop)]

Changeset from: scop

Update of /cvs/extras/rpms/allegro/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv20400

Modified Files:
	allegro.spec 
Log Message:
Disable svgalib, let rpm strip, MMX and friends are detected at runtime.


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- allegro.spec	10 Nov 2004 16:10:05 -0000	1.4
+++ allegro.spec	27 Nov 2004 10:18:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.0.3
-Release:        6
+Release:        7
 Epoch:          0
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -95,20 +95,13 @@
 %prep
 %setup -q
 %patch -p1 -b .mmaptest
-perl -pi -e 's|\$TARGET_ARCH\s+-O\S+|\$RPM_OPT_FLAGS|g' configure
+%{__perl} -pi -e \
+  's|\$TARGET_ARCH\s+-O\S+|\$RPM_OPT_FLAGS| ; s|LDFLAGS="-s |LDFLAGS="|' \
+  configure
 
 
 %build
-%configure \
-%ifarch i686
-  --enable-mmx --enable-sse
-%else
- %ifarch athlon
-  --enable-mmx --disable-sse
- %else
-  --disable-mmx --disable-sse
- %endif
-%endif
+%configure --enable-svgalib=no
 make %{?_smp_mflags}
 MKDATA_PRELOAD=../../lib/unix/liballeg-%{version}.so \
   DAT=../../tools/dat sh misc/mkdata.sh
@@ -117,8 +110,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install install-man install-info DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir},%{_datadir}/allegro}
-install -pm 644 allegro.cfg $RPM_BUILD_ROOT%{_sysconfdir}/allegrorc
+install -Dpm 644 allegro.cfg $RPM_BUILD_ROOT%{_sysconfdir}/allegrorc
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/allegro
 install -pm 644 keyboard.dat language.dat $RPM_BUILD_ROOT%{_datadir}/allegro
 find demo examples setup -type f -perm +111 -print | xargs rm
 chmod 755 `find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.so"`
@@ -133,7 +126,7 @@
 /sbin/install-info %{_infodir}/allegro.info %{_infodir}/dir 2>/dev/null || :
 
 %preun devel
-if [ "$1" = "0" ]; then
+if [ $1 -eq 0 ] ; then
   /sbin/install-info --delete %{_infodir}/allegro.info %{_infodir}/dir \
     2>/dev/null || :
 fi
@@ -148,7 +141,7 @@
 %doc readme.txt docs/build/unix.txt docs/build/linux.txt
 %doc AUTHORS CHANGES THANKS
 %config(noreplace) %{_sysconfdir}/allegrorc
-%{_libdir}/*.so*
+%{_libdir}/liballeg*.so*
 %{_libdir}/allegro
 %{_datadir}/allegro
 
@@ -159,15 +152,14 @@
 %doc todo.txt docs/html
 %doc demo examples setup
 %{_bindir}/allegro-config
-%{_libdir}/*.a
-%{_includedir}/*
+%{_libdir}/liballeg_unsharable.a
+%{_includedir}/*alleg*
 %{_infodir}/allegro.info*
 %{_mandir}/man3/*
 
 %files tools
 %defattr(-,root,root,-)
-%doc tools/grabber.txt
-%doc docs/makedoc.c
+%doc tools/grabber.txt docs/makedoc.c
 %{_bindir}/colormap
 %{_bindir}/dat
 %{_bindir}/dat2s
@@ -180,6 +172,13 @@
 
 
 %changelog
+* Fri Nov 12 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:4.0.3-7
+- Explicitly disable svgalib for now.
+- Let rpm take care of all stripping.
+- Build with whatever the compiler supports, MMX and friends are detected
+  at runtime.
+- Minor specfile style improvements.
+
 * Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:4.0.3-6
 - Fix build for FC3 via fixed mmap test in configure script.