rpms/Coin2/devel Coin2.spec,1.42,1.43

[corsepiu]

Author: corsepiu

Update of /cvs/pkgs/rpms/Coin2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24066

Modified Files:
	Coin2.spec 
Log Message:
* Mon Sep 28 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.5.0-7
- Reflect openal/openal-soft changes.
- Work-around "file" reporting bogus results (BZ 526054).



Index: Coin2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- Coin2.spec	24 Jul 2009 15:05:08 -0000	1.42
+++ Coin2.spec	28 Sep 2009 16:16:16 -0000	1.43
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005, 2006, 2007, 2008 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -7,13 +7,17 @@
 %define coin_includedir %{_includedir}/Coin2
 %define coin_htmldir %{_datadir}/Coin2
 
+%if 0%{fedora} < 12
 %define libopenal_SONAME libopenal.so.0
+%else
+%define libopenal_SONAME libopenal.so.1
+%endif
 %define libsimage_SONAME libsimage.so.20
 
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.5.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2+
 Group: System Environment/Libraries
@@ -68,7 +72,7 @@ for a in $(find . \( -name '*.h' -o -nam
 done
 
 # convert sources to utf-8
-for a in $(find . -type f -exec file {} \; | grep -i iso | sed -e 's,:.*,,'); do \
+for a in $(find . -type f -exec file -i {} \; | grep -i iso | sed -e 's,:.*,,'); do \
   /usr/bin/iconv -f ISO-8859-1 -t utf-8 $a > $a~; \
   mv $a~ $a; \
 done
@@ -108,8 +112,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
 /usr/bin/rename .3 .3sim $RPM_BUILD_ROOT%{_mandir}/man3/*
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
 
-install -d -m 755 ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/Coin2
-mv ${RPM_BUILD_ROOT}%{_datadir}/Coin/conf ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/Coin2
+install -d -m 755 ${RPM_BUILD_ROOT}%{_libdir}/Coin2
+mv ${RPM_BUILD_ROOT}%{_datadir}/Coin/conf ${RPM_BUILD_ROOT}%{_libdir}/Coin2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -138,6 +142,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/Coin.pc
 
 %changelog
+* Mon Sep 28 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.5.0-7
+- Reflect openal/openal-soft changes.
+- Work-around "file" reporting bogus results (BZ 526054).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild