[allegro] Add /usr/share/aclocal/allegro.m4 to -devel package

Hans de Goede jwrdegoede at fedoraproject.org
Mon Apr 29 21:25:57 UTC 2013


commit 2978a8f1d344cc2bd2827325c8ea2cdbdd82cfc6
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Apr 29 23:29:44 2013 +0200

    Add /usr/share/aclocal/allegro.m4 to -devel package

 allegro.spec |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/allegro.spec b/allegro.spec
index b3dec5e..6e162a6 100644
--- a/allegro.spec
+++ b/allegro.spec
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.4.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -53,7 +53,7 @@ Summary(fr):    Une librairie de programmation de jeux
 Summary(it):    Una libreria per la programmazione di videogiochi
 Summary(cs):    Knihovna pro programování her
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, xorg-x11-proto-devel
+Requires:       %{name}%{?_isa} = %{version}-%{release}, xorg-x11-proto-devel
 Requires:       libX11-devel, libXcursor-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -91,7 +91,7 @@ Summary(fr):    Outils supplémentaires pour la librairie de programmation Alleg
 Summary(it):    Programmi di utilità aggiuntivi per la libreria Allegro
 Summary(cs):    Přídavné nástroje pro programovou knihovnu Allegro
 Group:          Development/Tools
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
 %description tools
@@ -125,7 +125,7 @@ které jsou užitečné pro vývoj Allegro programů.
 %package jack-plugin
 Summary:        Allegro JACK (Jack Audio Connection Kit) plugin
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description jack-plugin
 This package contains a plugin for Allegro which enables Allegro to playback
@@ -137,7 +137,7 @@ Summary:        OpenGL support library for Allegro
 Group:          System Environment/Libraries
 License:        zlib or GPL+
 URL:            http://allegrogl.sourceforge.net/
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description -n alleggl
 AllegroGL is an Allegro add-on that allows you to use OpenGL alongside Allegro.
@@ -150,7 +150,7 @@ that things like glut do.
 Summary:        Development files for alleggl
 Group:          Development/Libraries
 License:        zlib or GPL+
-Requires:       alleggl = %{version}-%{release}
+Requires:       alleggl%{?_isa} = %{version}-%{release}
 
 %description -n alleggl-devel
 The alleggl-devel package contains libraries and header files for
@@ -162,7 +162,7 @@ Summary:        JPEG library for the Allegro game library
 Group:          System Environment/Libraries
 License:        zlib
 URL:            http://www.ecplusplus.com/index.php?page=projects&pid=1
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description -n jpgalleg
 jpgalleg is a jpeg library for use with the Allegro game library. It allows
@@ -172,7 +172,7 @@ using jpeg's as Allegro bitmaps.
 Summary:        Development files for jpgalleg
 Group:          Development/Libraries
 License:        zlib
-Requires:       jpgalleg = %{version}-%{release}
+Requires:       jpgalleg%{?_isa} = %{version}-%{release}
 
 %description -n jpgalleg-devel
 The jpgalleg-devel package contains libraries and header files for
@@ -184,7 +184,7 @@ Summary:        OGG/Vorbis library for the Allegro game library
 Group:          System Environment/Libraries
 License:        Public Domain
 URL:            http://wiki.allegro.cc/index.php?title=LoadPNG
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description loadpng
 loadpng is some glue that makes it easy to use libpng to load and
@@ -194,7 +194,7 @@ save bitmaps from Allegro programs.
 Summary:        Development files for loadpng
 Group:          Development/Libraries
 License:        Public Domain
-Requires:       %{name}-loadpng = %{version}-%{release}
+Requires:       %{name}-loadpng%{?_isa} = %{version}-%{release}
 
 %description loadpng-devel
 The loadpng-devel package contains libraries and header files for
@@ -206,7 +206,7 @@ Summary:        OGG/Vorbis library for the Allegro game library
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://trent.gamblin.ca/logg/
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description logg
 LOGG is an Allegro add-on library for playing OGG/Vorbis audio files.
@@ -215,7 +215,7 @@ LOGG is an Allegro add-on library for playing OGG/Vorbis audio files.
 Summary:        Development files for logg
 Group:          Development/Libraries
 License:        MIT
-Requires:       %{name}-logg = %{version}-%{release}
+Requires:       %{name}-logg%{?_isa} = %{version}-%{release}
 
 %description logg-devel
 The logg-devel package contains libraries and header files for
@@ -264,6 +264,7 @@ install -pm 755 tools/x11/xfixicon.sh $RPM_BUILD_ROOT%{_bindir}
 install -m 755 docs/makedoc $RPM_BUILD_ROOT%{_bindir}/allegro-makedoc
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/allegro
 install -pm 644 keyboard.dat language.dat $RPM_BUILD_ROOT%{_datadir}/allegro
+install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4
 
 
 %post -p /sbin/ldconfig
@@ -292,7 +293,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}/AUTHORS
 %doc %{_docdir}/%{name}-%{version}/CHANGES
 %doc %{_docdir}/%{name}-%{version}/THANKS
@@ -307,7 +307,6 @@ fi
 %exclude %{_libdir}/allegro/%{version}/alleg-jack.so
 
 %files devel
-%defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}/abi.txt
 %doc %{_docdir}/%{name}-%{version}/ahack.txt
 %doc %{_docdir}/%{name}-%{version}/allegro.txt
@@ -326,11 +325,11 @@ fi
 %{_includedir}/allegro
 %{_includedir}/allegro.h
 %{_includedir}/xalleg.h
+%{_datadir}/aclocal/allegro.m4
 %{_infodir}/allegro.info*
 %{_mandir}/man3/*
 
 %files tools
-%defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}/dat*.txt
 %doc %{_docdir}/%{name}-%{version}/grabber.txt
 %{_bindir}/colormap
@@ -346,7 +345,6 @@ fi
 %{_bindir}/xfixicon.sh
 
 %files jack-plugin
-%defattr(-,root,root,-)
 %{_libdir}/allegro/%{version}/alleg-jack.so
 
 %files -n alleggl
@@ -400,6 +398,9 @@ fi
 
 
 %changelog
+* Mon Apr 29 2013 Hans de Goede <hdegoede at redhat.com> - 4.4.2-6
+- Add /usr/share/aclocal/allegro.m4 to -devel package
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -554,7 +555,7 @@ fi
 - fix sound not working on PPC (bz 183112)
 - fix allegro not finding and loading plugins/modules on x86_64 (bz 183113)
 
-* Tue Feb  8 2006 Jindrich Novy <jnovy at redhat.com> 4.2.0-7
+* Wed Feb  8 2006 Jindrich Novy <jnovy at redhat.com> 4.2.0-7
 - set timidity++ as Requires instead of BuildRequires
 
 * Tue Feb  7 2006 Jindrich Novy <jnovy at redhat.com> 4.2.0-6
@@ -595,7 +596,7 @@ fi
 - don't use %%{name} in patch names
 - add Czech translation to package description/summary
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Fri Mar  4 2005 Ville Skyttä <ville.skytta at iki.fi>
@@ -671,7 +672,7 @@ fi
 - devel split into devel and tools packages
 - makedoc added to tools package
 
-* Wed Sep 16 2001 Peter Wang <tjaden at users.sourceforge.net>
+* Sun Sep 16 2001 Peter Wang <tjaden at users.sourceforge.net>
 - merged Osvaldo's spec file with gfoot's spec and some other changes
 
 * Wed Sep 27 2000 Osvaldo Santana Neto <osvaldo at conectiva.com>


More information about the scm-commits mailing list