[glyph-keeper] Rebuilt for new allegro-4.4

Hans de Goede jwrdegoede at fedoraproject.org
Wed Jul 13 09:04:09 UTC 2011


commit f2b3f794d64912ae163186f9d917c23782cf41ca
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Jul 13 11:05:12 2011 +0200

    Rebuilt for new allegro-4.4

 glyph-keeper.spec |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/glyph-keeper.spec b/glyph-keeper.spec
index ec495b5..2bd1206 100644
--- a/glyph-keeper.spec
+++ b/glyph-keeper.spec
@@ -1,14 +1,14 @@
 Name:           glyph-keeper
 Version:        0.32
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Library for text rendering
 Group:          System Environment/Libraries
 License:        zlib
-URL:            http://kd.lab.nig.ac.jp/glyph-keeper/
-Source0:        http://kd.lab.nig.ac.jp/%{name}/files/%{name}-%{version}.zip
+URL:            http://www.allegro.cc/resource/Libraries/Text/GlyphKeeper
+# Upstream is MIA
+Source0:        %{name}-%{version}.zip
 Patch0:         glyph-keeper-0.29.1-fixes.patch
 Patch1:         glyph-keeper-0.32-so-compat.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  freetype-devel >= 2.1.10
 BuildRequires:  SDL_gfx-devel allegro-devel
 
@@ -42,8 +42,7 @@ sed -i 's/\r//' docs/*.html *.txt
 make %{?_smp_mflags} -f Makefile.GNU.all TARGET=ALLEGRO FT_LIB=-lfreetype \
   OFLAGS="$RPM_OPT_FLAGS -fpic -I/usr/include/freetype2" lib
 gcc -shared -o libglyph-alleg.so.0 -Wl,-soname,libglyph-alleg.so.0 \
-  obj/glyph-alleg.o -lfreetype \
-  `allegro-config --libs | sed 's/-lalleg_unsharable//'`
+  obj/glyph-alleg.o -lfreetype $(allegro-config --libs)
 
 make %{?_smp_mflags} -f Makefile.GNU.all TARGET=SDL FT_LIB=-lfreetype \
   OFLAGS="$RPM_OPT_FLAGS -fpic -I/usr/include/freetype2" lib
@@ -52,7 +51,6 @@ gcc -shared -o libglyph-sdl.so.0 -Wl,-soname,libglyph-sdl.so.0 \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 mkdir -p $RPM_BUILD_ROOT%{_includedir}
 install -m 755 libglyph-*.so.0 $RPM_BUILD_ROOT%{_libdir}
@@ -61,12 +59,7 @@ ln -s libglyph-sdl.so.0 $RPM_BUILD_ROOT%{_libdir}/libglyph-sdl.so
 install -m 644 include/glyph.h $RPM_BUILD_ROOT%{_includedir}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 
@@ -82,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 13 2011 Hans de Goede <hdegoede at redhat.com> - 0.32-8
+- Rebuilt for new allegro-4.4
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list