Update to 4.0.1

Changed files:
    allegro-info.patch -> 1.3
    allegro-makefile.patch -> 1.3
    allegro.spec -> 1.6

diff --git a/allegro-info.patch b/allegro-info.patch
index 0ba77e0a098a189e53e92ecfa25d41d8ab71618b..f9d1d391ecfa08495ecf57e9a9655a3fc0026e3e 100644 (file)
--- a/allegro-info.patch
+++ b/allegro-info.patch
@@ -1,5 +1,5 @@
---- allegro-3.9.40/docs/allegro._tx~   Fri Nov 23 07:03:08 2001
-+++ allegro-3.9.40/docs/allegro._tx    Fri Nov 23 07:03:08 2001
+--- allegro-4.0.1/docs/src/allegro._tx~        Fri Nov 23 07:03:08 2001
++++ allegro-4.0.1/docs/src/allegro._tx Fri Nov 23 07:03:08 2001
 @@ -24,7 +24,8 @@
  @$
  @$@ifinfo

diff --git a/allegro-makefile.patch b/allegro-makefile.patch
index ed4af4e9c8d05c914086b72f66f14010d929d179..a13d98a714a9bac63e82606f06b6c4d05ab4f1c2 100644 (file)
--- a/allegro-makefile.patch
+++ b/allegro-makefile.patch
@@ -1,7 +1,7 @@
---- allegro-3.9.40/makefile.in.orig    Fri Nov 16 00:11:22 2001
-+++ allegro-3.9.40/makefile.in Fri Nov 23 04:08:26 2001
-@@ -312,85 +312,85 @@
-       @echo "Compressed postscript documentation generated: allegro.ps.gz"
+--- allegro-4.0.1/makefile.in.orig     Fri Mar 29 17:34:51 2002
++++ allegro-4.0.1/makefile.in  Fri Mar 29 18:02:08 2002
+@@ -300,90 +300,90 @@
+       @echo "and/or make install-gzipped-info"
  
  install-lib: lib
 -      $(mkinstalldirs) $(libdir)
@@ -45,7 +45,7 @@
 -               test $(libdir) = /lib || test $(libdir) = /usr/lib) \
 -              && ($(LDCONFIG) $(libdir) || true) || (\
 +              (grep -q $(DESTDIR)$(libdir) /etc/ld.so.conf || \
-+               test $(DESTDIR)$(libdir) = /lib || test $(DESTDIR)$(DESTDIR)$(libdir) = /usr/lib) \
++               test $(DESTDIR)$(libdir) = /lib || test $(DESTDIR)$(libdir) = /usr/lib) \
 +              && ($(LDCONFIG) $(DESTDIR)$(libdir) || true) || (\
                        echo "" ; \
 -                      echo "Warning: shared library destination $(libdir) is not in ldd search path." ; \
@@ -55,6 +55,13 @@
 +                      echo "$(DESTDIR)$(libdir) each time you want to run an Allegro program." ; \
                ) ; \
        fi
+       @for l in alleg alld allp; do \
+-        if test -f $(libdir)/lib$${l}-$(shared_version).so -a \! -L $(libdir)/lib$${l}.so.${shared_major_minor}; then \
+-          (cd $(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \
++        if test -f $(DESTDIR)$(libdir)/lib$${l}-$(shared_version).so -a \! -L $(DESTDIR)$(libdir)/lib$${l}.so.${shared_major_minor}; then \
++          (cd $(DESTDIR)$(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \
+         fi; \
+       done
  
  install-headers:
 -      $(mkinstalldirs) $(includedir)/allegro
@@ -110,12 +117,12 @@
          fi; \
        done
  
- install-info:
+ install-info: docs
        @echo Installing Allegro info documentation...
 -      $(mkinstalldirs) $(infodir)
--      @$(INSTALL_DATA) docs/allegro.info $(infodir)
+-      @$(INSTALL_DATA) docs/info/allegro.info $(infodir)
 +      $(mkinstalldirs) $(DESTDIR)$(infodir)
-+      @$(INSTALL_DATA) docs/allegro.info $(DESTDIR)$(infodir)
++      @$(INSTALL_DATA) docs/info/allegro.info $(DESTDIR)$(infodir)
        -@if $(SHELL) -c "$(INSTALL_INFO) --version" >/dev/null 2>&1; then \
          if $(INSTALL_INFO) --version 2>&1 | grep -q "Debian"; then \
 -          $(INSTALL_INFO) --section Development -- $(infodir)/allegro.info; \
@@ -126,27 +133,27 @@
          fi; \
        else \
          true; \
-@@ -398,21 +398,21 @@
+@@ -391,21 +391,21 @@
  
  install-gzipped-info: install-info
        @echo Compressing documentation...
 -      @gzip -9 -f $(infodir)/allegro.info
 +      @gzip -9 -f $(DESTDIR)$(infodir)/allegro.info
  
- install-man:
+ install-man: docs
 -      $(mkinstalldirs) $(mandir)/man3
 +      $(mkinstalldirs) $(DESTDIR)$(mandir)/man3
-       @for file in $(srcdir)/docs/*.3; do \
+       @for file in $(srcdir)/docs/man/*.3; do \
 -        echo Installing $$file to $(mandir)/man3; \
 -        $(INSTALL_DATA) $$file $(mandir)/man3/; \
 +        echo Installing $$file to $(DESTDIR)$(mandir)/man3; \
 +        $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man3/; \
        done
  
- install-gzipped-man:
+ install-gzipped-man: docs
 -      $(mkinstalldirs) $(mandir)/man3
 +      $(mkinstalldirs) $(DESTDIR)$(mandir)/man3
-       @for file in $(srcdir)/docs/*.3; do \
+       @for file in $(srcdir)/docs/man/*.3; do \
 -        echo Installing $$file.gz to $(mandir)/man3; \
 -        $(INSTALL_DATA) $$file $(mandir)/man3/; \
 -        gzip -9 -f $(mandir)/man3/`echo $$file | sed -e "s:.*/::"`; \
@@ -156,7 +163,7 @@
        done
  
  uninstall: uninstall-lib uninstall-modules uninstall-headers uninstall-programs uninstall-info uninstall-man
-@@ -421,56 +421,56 @@
+@@ -418,57 +418,57 @@
  uninstall-lib:
        @echo "Uninstalling libraries..."
        @for l in alleg alld allp; do \
@@ -166,20 +173,22 @@
 +        rm -f $(DESTDIR)$(libdir)/lib$${l}.a; \
        done
 -      rm -f $(bindir)/allegro-config
--      -$(LDCONFIG) $(libdir)
 +      rm -f $(DESTDIR)$(bindir)/allegro-config
-+      -$(LDCONFIG) $(DESTDIR)$(libdir)
  
  uninstall-shared:
        @echo "Uninstalling shared libraries..."
        @for l in alleg alld allp; do \
 -        rm -f $(libdir)/lib$${l}-${shared_version}.so; \
+-        rm -f $(libdir)/lib$${l}.so.${shared_major_minor}; \
 +        rm -f $(DESTDIR)$(libdir)/lib$${l}-${shared_version}.so; \
++        rm -f $(DESTDIR)$(libdir)/lib$${l}.so.${shared_major_minor}; \
        done
+-      -$(LDCONFIG) $(libdir)       # update cache (only works if we're root)
++      -$(LDCONFIG) $(DESTDIR)$(libdir)       # update cache (only works if we're root)
  
  uninstall-modules:
--      rm -rf $(moduledir)
-+      rm -rf $(DESTDIR)$(moduledir)
+-      rm -rf $(modulebasedir) $(moduledir)
++      rm -rf $(modulebasedir) $(DESTDIR)$(moduledir)
  
  uninstall-headers:
 -      rm -f $(includedir)/allegro.h
@@ -209,7 +218,7 @@
 -        gunzip $(infodir)/allegro.info.gz; \
 +        gunzip $(DESTDIR)$(infodir)/allegro.info.gz; \
        fi;
-       @if $(SHELL) -c "$(INSTALL_INFO) --version" >/dev/null 2>&1; then \
+       -@if $(SHELL) -c "$(INSTALL_INFO) --version" >/dev/null 2>&1; then \
          if $(INSTALL_INFO) --version 2>&1 | grep -q "Debian"; then \
 -          $(INSTALL_INFO) --remove $(infodir)/allegro.info; \
 +          $(INSTALL_INFO) --remove $(DESTDIR)$(infodir)/allegro.info; \
@@ -224,11 +233,11 @@
 +      rm -f $(DESTDIR)$(infodir)/allegro.info
  
  uninstall-man:
--      sed -n -e "s,^@[@\\].*@\([a-zA-Z0-9_]*\)[^a-zA-Z0-9_*].*,$(mandir)/man3/\1.3,p" $(srcdir)/docs/allegro._tx \
-+      sed -n -e "s,^@[@\\].*@\([a-zA-Z0-9_]*\)[^a-zA-Z0-9_*].*,$(DESTDIR)$(mandir)/man3/\1.3,p" $(srcdir)/docs/allegro._tx \
+-      sed -n -e "s,^@[@\\].*@\([a-zA-Z0-9_]*\)[^a-zA-Z0-9_*].*,$(mandir)/man3/\1.3,p" $(srcdir)/docs/src/allegro._tx \
++      sed -n -e "s,^@[@\\].*@\([a-zA-Z0-9_]*\)[^a-zA-Z0-9_*].*,$(DESTDIR)$(mandir)/man3/\1.3,p" $(srcdir)/docs/src/allegro._tx \
          | xargs -n 1 rm -f
--      sed -n -e "s,^@[@\\].*@\([a-zA-Z0-9_]*\)[^a-zA-Z0-9_*].*,$(mandir)/man3/\1.3.gz,p" $(srcdir)/docs/allegro._tx \
-+      sed -n -e "s,^@[@\\].*@\([a-zA-Z0-9_]*\)[^a-zA-Z0-9_*].*,$(DESTDIR)$(mandir)/man3/\1.3.gz,p" $(srcdir)/docs/allegro._tx \
+-      sed -n -e "s,^@[@\\].*@\([a-zA-Z0-9_]*\)[^a-zA-Z0-9_*].*,$(mandir)/man3/\1.3.gz,p" $(srcdir)/docs/src/allegro._tx \
++      sed -n -e "s,^@[@\\].*@\([a-zA-Z0-9_]*\)[^a-zA-Z0-9_*].*,$(DESTDIR)$(mandir)/man3/\1.3.gz,p" $(srcdir)/docs/src/allegro._tx \
          | xargs -n 1 rm -f
  
  depend:

diff --git a/allegro.spec b/allegro.spec
index dac6a185ea2ba8489cccbc5dd3390ecf37a8927e..35d52e6ab01f270ce33f7770769a951e401b768a 100644 (file)
--- a/allegro.spec
+++ b/allegro.spec
@@ -1,14 +1,14 @@
 Summary:       A game programming library
 Summary(pl):   Biblioteka do programowania gier
 Name:          allegro
-Version:       3.9.40
-Release:       1
+Version:       4.0.1
+Release:       %{_rel}
 License:       Giftware
 Group:         X11/Libraries
 Source0:       http://prdownloads.sourceforge.net/alleg/%{name}-%{version}.tar.gz
 Patch0:                %{name}-makefile.patch
 Patch1:                %{name}-info.patch
-URL:           http://www.talula.demon.co.uk/allegro/
+URL:           http://alleg.sourceforge.net
 BuildRequires: XFree86-devel
 BuildRequires: esound-devel
 %ifnarch sparc sparc64
@@ -151,7 +151,10 @@ ALSA.
 aclocal
 autoconf
 %configure \
-       --enable-static
+       --enable-static \
+       --enable-dbglib \
+       --enable-proflib
+       
 %{__make} MAKEINFO=makeinfo
 
 %install
@@ -163,13 +166,23 @@ rm -rf $RPM_BUILD_ROOT
 gzip -9nf AUTHORS CHANGES THANKS
 
 echo -e "# List of modules to be loaded by the Unix version of Allegro.\n" \
-       > $RPM_BUILD_ROOT%{_libdir}/allegro/modules.lst
+       > $RPM_BUILD_ROOT%{_libdir}/allegro/4.0/modules.lst
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/liballeg-%{version}.so
+%dir %{_libdir}/allegro/
+%{_libdir}/allegro/4.0/modules.lst
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/liballd-%{version}.so
+%attr(755,root,root) %{_libdir}/liballp-%{version}.so
+%{_includedir}/*
+%attr(755,root,root) %{_bindir}/allegro-config
 %attr(755,root,root) %{_bindir}/colormap
 %attr(755,root,root) %{_bindir}/exedat
 %attr(755,root,root) %{_bindir}/pack
@@ -179,14 +192,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dat2s
 %attr(755,root,root) %{_bindir}/grabber
 %attr(755,root,root) %{_bindir}/pat2dat
-%attr(755,root,root) %{_libdir}/*.so
-%dir %{_libdir}/allegro
-%{_libdir}/allegro/modules.lst
-
-%files devel
-%defattr(644,root,root,755)
-%{_includedir}/*
-%attr(755,root,root) %{_bindir}/allegro-config
 %{_mandir}/man3/*
 %{_infodir}/*
 
@@ -196,19 +201,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files svgalib
 %defattr(644,root,root,755)
-%{_libdir}/allegro/alleg-svgalib-%{version}.so
+%{_libdir}/allegro/4.0/alleg-svgalib.so
 
 %files dga2
 %defattr(644,root,root,755)
-%{_libdir}/allegro/alleg-dga2-%{version}.so
+%{_libdir}/allegro/4.0/alleg-dga2.so
 
 %files esd
 %defattr(644,root,root,755)
-%{_libdir}/allegro/alleg-esddigi-%{version}.so
+%{_libdir}/allegro/4.0/alleg-esddigi.so
 
 %ifnarch sparc sparc64
 %files alsa
 %defattr(644,root,root,755)
-%{_libdir}/allegro/alleg-alsadigi-%{version}.so
-%{_libdir}/allegro/alleg-alsamidi-%{version}.so
+%{_libdir}/allegro/4.0/alleg-alsadigi.so
+%{_libdir}/allegro/4.0/alleg-alsamidi.so
 %endif